AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SF#851487] wxDb::Catalog() function was attempting to determine if the table that was being accessed was different than the last table being accessed BEFORE the table name of the current table was read in, causing an issue when more than one table was present in the database

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27238 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker 2004-05-12 16:49:49 +00:00
parent 35ac11045c
commit b26e2b55ca
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/common/db.cpp
View File

@ -3210,6 +3210,13 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
break;
GetData(3,SQL_C_CHAR, (UCHAR *) tblName, DB_MAX_TABLE_NAME_LEN+1, &cb);
GetData(4,SQL_C_CHAR, (UCHAR *) colName, DB_MAX_COLUMN_NAME_LEN+1,&cb);
GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType, 0, &cb);
GetData(6,SQL_C_CHAR, (UCHAR *) typeName, sizeof(typeName), &cb);
GetData(7,SQL_C_SLONG, (UCHAR *)&precision, 0, &cb);
GetData(8,SQL_C_SLONG, (UCHAR *)&length, 0, &cb);
if (wxStrcmp(tblName, tblNameSave.c_str()))
{
if (cnt)
@ -3230,13 +3237,6 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
tblNameSave = tblName;
}
GetData(3,SQL_C_CHAR, (UCHAR *) tblName, DB_MAX_TABLE_NAME_LEN+1, &cb);
GetData(4,SQL_C_CHAR, (UCHAR *) colName, DB_MAX_COLUMN_NAME_LEN+1,&cb);
GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType, 0, &cb);
GetData(6,SQL_C_CHAR, (UCHAR *) typeName, sizeof(typeName), &cb);
GetData(7,SQL_C_SLONG, (UCHAR *)&precision, 0, &cb);
GetData(8,SQL_C_SLONG, (UCHAR *)&length, 0, &cb);
outStr.Printf(wxT("%-32s %-32s (%04d)%-15s %9ld %9ld\n"),
tblName, colName, sqlDataType, typeName, precision, length);
if (wxFputs(outStr.c_str(), fp) == EOF)