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

Replaced <iostream.h> reference with "wx/ioswrap.h"

Browse Source 
Replaced wxMessageBox() with wxLogDebug() calls
When calling GetColumns(), some drivers/datasources would not return a proper value for columnSize.  If columnSize is less than 1, columnSize gets set to bufferLength
Some cout statements in DBDEBUG_CONSOLE were treating char* variables as if they were wxString variables.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2000-02-25 20:36:32 +00:00
parent 52a17fe534
commit 0b8410f3ca
1 changed files with 13 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/common/dbtable.cpp
View File

@@ -40,9 +40,9 @@
# endif # endif
#endif #endif
//#ifdef DBDEBUG_CONSOLE #ifdef DBDEBUG_CONSOLE
#include <iostream.h> #include "wx/ioswrap.h"
//#endif #endif
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
@@ -258,7 +258,7 @@ wxTable::~wxTable()
TablesInUse.DeleteContents(TRUE); TablesInUse.DeleteContents(TRUE);
bool found = FALSE; bool found = FALSE;
wxNode *pNode; wxNode *pNode;
pNode = TablesInUse.First(); pNode = TablesInUse.First();
while (pNode && !found) while (pNode && !found)
{ {
@@ -266,7 +266,7 @@ wxTable::~wxTable()
{ {
found = TRUE; found = TRUE;
if (!TablesInUse.DeleteNode(pNode)) if (!TablesInUse.DeleteNode(pNode))
wxMessageBox (s.GetData(),"Unable to delete node!"); wxLogDebug (s.GetData(),"Unable to delete node!");
} }
else else
pNode = pNode->Next(); pNode = pNode->Next();
@@ -275,7 +275,7 @@ wxTable::~wxTable()
{ {
wxString msg; wxString msg;
msg.sprintf("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s",s.GetData()); msg.sprintf("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s",s.GetData());
wxMessageBox (msg.GetData(),"NOTICE..."); wxLogDebug (msg.GetData(),"NOTICE...");
} }
} }
#endif #endif
@@ -582,7 +582,6 @@ bool wxTable::Open(void)
return FALSE; return FALSE;
int i; int i;
// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt; wxString sqlStmt;
// Verify that the table exists in the database // Verify that the table exists in the database
@@ -1050,10 +1049,9 @@ bool wxTable::DropTable()
{ {
// NOTE: This function returns TRUE if the Table does not exist, but // NOTE: This function returns TRUE if the Table does not exist, but
// only for identified databases. Code will need to be added // only for identified databases. Code will need to be added
// below for any other databases when those databases are defined // below for any other databases when those databases are defined
// to handle this situation consistently // to handle this situation consistently
// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt; wxString sqlStmt;
sqlStmt.sprintf("DROP TABLE %s", tableName); sqlStmt.sprintf("DROP TABLE %s", tableName);
@@ -1171,7 +1169,6 @@ bool wxTable::DropIndex(const char * idxName)
// below for any other databases when those databases are defined // below for any other databases when those databases are defined
// to handle this situation consistently // to handle this situation consistently
// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt; wxString sqlStmt;
if (pDb->Dbms() == dbmsACCESS) if (pDb->Dbms() == dbmsACCESS)
@@ -1265,7 +1262,7 @@ bool wxTable::Update(void)
pDb->WriteSqlLog(sqlStmt); pDb->WriteSqlLog(sqlStmt);
#ifdef DBDEBUG_CONSOLE #ifdef DBDEBUG_CONSOLE
cout << endl << sqlStmt.GetData() << endl << endl; cout << endl << sqlStmt << endl << endl;
#endif #endif
// Execute the SQL UPDATE statement // Execute the SQL UPDATE statement
@@ -1303,7 +1300,7 @@ bool wxTable::UpdateWhere(const char *pWhereClause)
pDb->WriteSqlLog(sqlStmt); pDb->WriteSqlLog(sqlStmt);
#ifdef DBDEBUG_CONSOLE #ifdef DBDEBUG_CONSOLE
cout << endl << sqlStmt.GetData() << endl << endl; cout << endl << sqlStmt << endl << endl;
#endif #endif
// Execute the SQL UPDATE statement // Execute the SQL UPDATE statement
@@ -1742,8 +1739,6 @@ void wxTable::SetColDefs (int index, const char *fieldName, int dataType, void *
/********** wxTable::SetColDef() **********/ /********** wxTable::SetColDef() **********/
// BJO20000121 : changed prototype in order to return proper pointer on wxColDataPtr's array
//bool wxTable::SetColDefs(wxColInf *pColInfs, ULONG numCols, wxColDataPtr *pColDataPtrs)
wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols) wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
{ {
assert(pColInfs); assert(pColInfs);
@@ -1758,46 +1753,15 @@ wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
for (index = 0; index < numCols; index++) for (index = 0; index < numCols; index++)
{ {
/*
wxString title,msg;
title.sprintf("Catalog: %s, Schema: %s, Table name: %s",pColInfs[index].catalog,pColInfs[index].schema,pColInfs[index].tableName);
msg.sprintf("Column name: %s\nData type: %04d\nType name: %s\nColumn size: %d\nBuffer len: %d\nDecimals:%d\nRadix: %d\nNullable: %d\nRemarks: %s",
pColInfs[index].colName,pColInfs[index].sqlDataType,pColInfs[index].typeName,pColInfs[index].columnSize,pColInfs[index].bufferLength,pColInfs[index].decimalDigits,pColInfs[index].numPrecRadix,pColInfs[index].nullable,pColInfs[index].remarks);
msg += " \nDB_DATA_TYPE: ";
switch(pColInfs[index].dbDataType)
{
case DB_DATA_TYPE_VARCHAR:
msg += pDb->typeInfVarchar.TypeName; break;
case DB_DATA_TYPE_INTEGER:
msg += pDb->typeInfInteger.TypeName; break;
case DB_DATA_TYPE_FLOAT:
msg += pDb->typeInfFloat.TypeName; break;
case DB_DATA_TYPE_DATE:
msg += pDb->typeInfDate.TypeName; break;
}
wxMessageBox(msg.GetData(),title.GetData());
*/
// Process the fields // Process the fields
switch (pColInfs[index].dbDataType) switch (pColInfs[index].dbDataType)
{ {
case DB_DATA_TYPE_VARCHAR: case DB_DATA_TYPE_VARCHAR:
{ {
pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].bufferLength+1];
// Tentative fix for Access. Relative to UNICODE? pColDataPtrs[index].SzDataObj = pColInfs[index].columnSize;
if (pColInfs[index].bufferLength == 2*pColInfs[index].columnSize) pColDataPtrs[index].SqlCtype = SQL_C_CHAR;
{ break;
pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].columnSize+1];
pColDataPtrs[index].SzDataObj = pColInfs[index].columnSize;
}
else
{
// Still needed because iodbc (unix) returns 0 in columnSize
pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].bufferLength+1];
pColDataPtrs[index].SzDataObj = pColInfs[index].bufferLength;
}
pColDataPtrs[index].SqlCtype = SQL_C_CHAR;
break;
} }
case DB_DATA_TYPE_INTEGER: case DB_DATA_TYPE_INTEGER:
{ {
@@ -1864,7 +1828,6 @@ void wxTable::SetCursor(HSTMT *hstmtActivate)
ULONG wxTable::Count(const char *args) ULONG wxTable::Count(const char *args)
{ {
ULONG l; ULONG l;
// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt; wxString sqlStmt;
SDWORD cb; SDWORD cb;