Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

::Catalog() function was failing against several databases as the PRECISION and LENGTH values returned were larger (more bytes) than the variable that was bound for holding the returned value

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-07-12 19:22:49 +00:00
parent 2c40e41c4e
commit e262868d43
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/db.cpp
View File

@@ -2980,7 +2980,7 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
wxChar colName[DB_MAX_COLUMN_NAME_LEN+1]; wxChar colName[DB_MAX_COLUMN_NAME_LEN+1];
SWORD sqlDataType; SWORD sqlDataType;
wxChar typeName[30+1]; wxChar typeName[30+1];
SWORD precision, length; SDWORD precision, length;
FILE *fp = fopen(fileName.c_str(),wxT("wt")); FILE *fp = fopen(fileName.c_str(),wxT("wt"));
if (fp == NULL) if (fp == NULL)
@@ -3022,8 +3022,12 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
tblNameSave.Empty(); tblNameSave.Empty();
int cnt = 0; int cnt = 0;
while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS) while (true)
{ {
retcode = SQLFetch(hstmt);
if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
break;
if (wxStrcmp(tblName, tblNameSave.c_str())) if (wxStrcmp(tblName, tblNameSave.c_str()))
{ {
if (cnt) if (cnt)
@@ -3044,12 +3048,12 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
tblNameSave = tblName; tblNameSave = tblName;
} }
GetData(3,SQL_C_CHAR, (UCHAR *)tblName, DB_MAX_TABLE_NAME_LEN+1, &cb); 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(4,SQL_C_CHAR, (UCHAR *) colName, DB_MAX_COLUMN_NAME_LEN+1,&cb);
GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType,0, &cb); GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType, 0, &cb);
GetData(6,SQL_C_CHAR, (UCHAR *)typeName, sizeof(typeName), &cb); GetData(6,SQL_C_CHAR, (UCHAR *) typeName, sizeof(typeName), &cb);
GetData(7,SQL_C_SSHORT,(UCHAR *)&precision, 0, &cb); GetData(7,SQL_C_SLONG, (UCHAR *)&precision, 0, &cb);
GetData(8,SQL_C_SSHORT,(UCHAR *)&length, 0, &cb); GetData(8,SQL_C_SLONG, (UCHAR *)&length, 0, &cb);
outStr.Printf(wxT("%-32s %-32s (%04d)%-15s %9d %9d\n"), outStr.Printf(wxT("%-32s %-32s (%04d)%-15s %9d %9d\n"),
tblName, colName, sqlDataType, typeName, precision, length); tblName, colName, sqlDataType, typeName, precision, length);