X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52a17fe5345ba1cbfc0ae156a3dbafc3191a67f8..399b60a0ad232265cd74ce8bf6a53a1f2cc57ff2:/src/common/db.cpp diff --git a/src/common/db.cpp b/src/common/db.cpp index 50de73347b..12f614d4c5 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -61,6 +61,7 @@ #include "wx/list.h" #include "wx/utils.h" #include "wx/msgdlg.h" + #include "wx/log.h" #endif #include "wx/filefn.h" #include "wx/wxchar.h" @@ -897,7 +898,7 @@ void wxDB::Close(void) { s.sprintf("(%-20s) tableID:[%6lu] pDb:[%p]", tiu->tableName,tiu->tableID,tiu->pDb); s2.sprintf("Orphaned found using pDb:[%p]",this); - wxLogDebug (s,s2); + wxLogDebug (s.c_str(),s2.c_str()); } pNode = pNode->Next(); } @@ -1681,9 +1682,8 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID) { if (colInf[colNo].columnSize < 1) { - // Apparently mySQL and Postgres (or their ODBC drivers) do not - // return a columnSize, so set columnSize = bufferLength - // if no column size was returned + // IODBC does not return a correct columnSize, so we set + // columnSize = bufferLength if no column size was returned colInf[colNo].columnSize = colInf[colNo].bufferLength; } colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR; @@ -1855,9 +1855,8 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID) { if (colInf[colNo].columnSize < 1) { - // Apparently mySQL and Postgres (or their ODBC drivers) do not - // return a columnSize, so set columnSize = bufferLength - // if no column size was returned + // IODBC does not return a correct columnSize, so we set + // columnSize = bufferLength if no column size was returned colInf[colNo].columnSize = colInf[colNo].bufferLength; } colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;