# endif
#endif
-//#ifdef DBDEBUG_CONSOLE
- #include <iostream.h>
-//#endif
+#ifdef DBDEBUG_CONSOLE
+ #include "wx/ioswrap.h"
+#endif
#ifdef __BORLANDC__
#pragma hdrstop
#include "wx/list.h"
#include "wx/utils.h"
#include "wx/msgdlg.h"
+ #include "wx/log.h"
#endif
#include "wx/filefn.h"
#endif
s.sprintf("wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb);
#ifdef __WXDEBUG__
- CstructTablesInUse *tableInUse;
- tableInUse = new CstructTablesInUse();
+ wxTablesInUse *tableInUse;
+ tableInUse = new wxTablesInUse();
tableInUse->tableName = tblName;
tableInUse->tableID = tableID;
tableInUse->pDb = pDb;
TablesInUse.DeleteContents(TRUE);
bool found = FALSE;
- wxNode *pNode;
+ wxNode *pNode;
pNode = TablesInUse.First();
while (pNode && !found)
{
- if (((CstructTablesInUse *)pNode->Data())->tableID == tableID)
+ if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
{
found = TRUE;
if (!TablesInUse.DeleteNode(pNode))
- wxMessageBox (s.GetData(),"Unable to delete node!");
+ wxLogDebug (s.GetData(),"Unable to delete node!");
}
else
pNode = pNode->Next();
{
wxString msg;
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
return FALSE;
int i;
-// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt;
// Verify that the table exists in the database
{
// NOTE: This function returns TRUE if the Table does not exist, but
// 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
-// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt;
sqlStmt.sprintf("DROP TABLE %s", tableName);
/********** wxTable::CreateIndex() **********/
-bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop)
+bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, wxIdxDef *pIdxDefs, bool attemptDrop)
{
// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt;
// below for any other databases when those databases are defined
// to handle this situation consistently
-// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt;
if (pDb->Dbms() == dbmsACCESS)
pDb->WriteSqlLog(sqlStmt);
#ifdef DBDEBUG_CONSOLE
- cout << endl << sqlStmt.GetData() << endl << endl;
+ cout << endl << sqlStmt << endl << endl;
#endif
// Execute the SQL UPDATE statement
pDb->WriteSqlLog(sqlStmt);
#ifdef DBDEBUG_CONSOLE
- cout << endl << sqlStmt.GetData() << endl << endl;
+ cout << endl << sqlStmt << endl << endl;
#endif
// Execute the SQL UPDATE statement
/********** wxTable::GetWhereClause() **********/
-void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName)
+void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere,
+ const char *qualTableName, bool useLikeComparison)
/*
* Note: GetWhereClause() currently ignores timestamp columns.
* They are not included as part of the where clause.
wxStrcat(pWhereClause, ".");
}
wxStrcat(pWhereClause, colDefs[i].ColName);
- wxStrcat(pWhereClause, " = ");
+ if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
+ wxStrcat(pWhereClause, " LIKE ");
+ else
+ wxStrcat(pWhereClause, " = ");
switch(colDefs[i].SqlCtype)
{
case SQL_C_CHAR:
/********** 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)
{
assert(pColInfs);
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
switch (pColInfs[index].dbDataType)
{
case DB_DATA_TYPE_VARCHAR:
{
-
- // Tentative fix for Access. Relative to UNICODE?
- if (pColInfs[index].bufferLength == 2*pColInfs[index].columnSize)
- {
- 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;
+ pColDataPtrs[index].PtrDataObj = new char[pColInfs[index].bufferLength+1];
+ pColDataPtrs[index].SzDataObj = pColInfs[index].columnSize;
+ pColDataPtrs[index].SqlCtype = SQL_C_CHAR;
+ break;
}
case DB_DATA_TYPE_INTEGER:
{
ULONG wxTable::Count(const char *args)
{
ULONG l;
-// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt;
SDWORD cb;
projects / wxWidgets.git / blobdiff