]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/dbtable.cpp
Fix wxListCtrl background colour bug Part I
[wxWidgets.git] / src / common / dbtable.cpp
index 64f7a069e2c5db40a5ec2f6aa35ac782b2649406..cf3860dfcfb1fcf1cbea72be97ecb60f5b7c2244 100644 (file)
 // SYNOPSIS START
 // SYNOPSIS STOP
 */
 // SYNOPSIS START
 // SYNOPSIS STOP
 */
+#ifdef __GNUG__
+    #pragma implementation "dbtable.h"
+#endif
 
 
-// Use this line for wxWindows v1.x
-//#include "wx_ver.h"
-// Use this line for wxWindows v2.x
 #include  "wx/wxprec.h"
 #include  "wx/wxprec.h"
-#include "wx/version.h"
 
 
-#if wxMAJOR_VERSION == 2
-    #ifdef __GNUG__
-        #pragma implementation "dbtable.h"
-    #endif
+#ifdef __BORLANDC__
+    #pragma hdrstop
 #endif
 
 #ifdef DBDEBUG_CONSOLE
 #endif
 
 #ifdef DBDEBUG_CONSOLE
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif
     #include "wx/ioswrap.h"
 #endif
 
     #include "wx/ioswrap.h"
 #endif
 
-
-#ifdef    __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#if wxMAJOR_VERSION == 2
-    #ifndef WX_PRECOMP
-        #include "wx/string.h"
-        #include "wx/object.h"
-        #include "wx/list.h"
-        #include "wx/utils.h"
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/object.h"
+    #include "wx/list.h"
+    #include "wx/utils.h"
+    #if wxUSE_GUI
         #include "wx/msgdlg.h"
         #include "wx/msgdlg.h"
-        #include "wx/log.h"
     #endif
     #endif
-    #include "wx/filefn.h"
+    #include "wx/log.h"
 #endif
 #endif
-
-#if wxMAJOR_VERSION == 1
-#   if defined(wx_msw) || defined(wx_x)
-#       ifdef WX_PRECOMP
-#           include "wx_prec.h"
-#       else
-#           include "wx.h"
-#       endif
-#   endif
-#   define wxUSE_ODBC 1
-#endif
-
+#include "wx/filefn.h"
 
 #if wxUSE_ODBC
 
 
 #if wxUSE_ODBC
 
 #include <string.h>
 //#include <assert.h>
 
 #include <string.h>
 //#include <assert.h>
 
-#if   wxMAJOR_VERSION == 1
-    #include "table.h"
-#elif wxMAJOR_VERSION == 2
-    #include "wx/dbtable.h"
-#endif
+#include "wx/dbtable.h"
 
 #ifdef __UNIX__
 // The HPUX preprocessor lines below were commented out on 8/20/97
 
 #ifdef __UNIX__
 // The HPUX preprocessor lines below were commented out on 8/20/97
@@ -162,6 +143,7 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     henv                = 0;
     hdbc                = 0;
     hstmt               = 0;
     henv                = 0;
     hdbc                = 0;
     hstmt               = 0;
+    m_hstmtGridQuery               = 0;
     hstmtDefault        = 0;                        // Initialized below
     hstmtCount          = 0;                        // Initialized first time it is needed
     hstmtInsert         = 0;
     hstmtDefault        = 0;                        // Initialized below
     hstmtCount          = 0;                        // Initialized first time it is needed
     hstmtInsert         = 0;
@@ -192,14 +174,14 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
         tablePath = tblPath;                    // Table Path - used for dBase files
     else
         tablePath.Empty();
         tablePath = tblPath;                    // Table Path - used for dBase files
     else
         tablePath.Empty();
-    
+
     if (qryTblName.Length())                    // Name of the table/view to query
         queryTableName = qryTblName;
     else
         queryTableName = tblName;
     if (qryTblName.Length())                    // Name of the table/view to query
         queryTableName = qryTblName;
     else
         queryTableName = tblName;
-    
+
     pDb->incrementTableCount();
     pDb->incrementTableCount();
-    
+
     wxString s;
     tableID = ++lastTableID;
     s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"), tblName.c_str(), tableID, pDb);
     wxString s;
     tableID = ++lastTableID;
     s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"), tblName.c_str(), tableID, pDb);
@@ -212,17 +194,17 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     tableInUse->pDb       = pDb;
     TablesInUse.Append(tableInUse);
 #endif
     tableInUse->pDb       = pDb;
     TablesInUse.Append(tableInUse);
 #endif
-    
+
     pDb->WriteSqlLog(s);
     pDb->WriteSqlLog(s);
-    
+
     // Grab the HENV and HDBC from the wxDb object
     henv = pDb->GetHENV();
     hdbc = pDb->GetHDBC();
     // Grab the HENV and HDBC from the wxDb object
     henv = pDb->GetHENV();
     hdbc = pDb->GetHDBC();
-    
+
     // Allocate space for column definitions
     if (noCols)
         colDefs = new wxDbColDef[noCols];  // Points to the first column definition
     // Allocate space for column definitions
     if (noCols)
         colDefs = new wxDbColDef[noCols];  // Points to the first column definition
-    
+
     // Allocate statement handles for the table
     if (!queryOnly)
     {
     // Allocate statement handles for the table
     if (!queryOnly)
     {
@@ -239,12 +221,12 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     // Allocate a separate statement handle for internal use
     if (SQLAllocStmt(hdbc, &hstmtInternal) != SQL_SUCCESS)
         pDb->DispAllErrors(henv, hdbc);
     // Allocate a separate statement handle for internal use
     if (SQLAllocStmt(hdbc, &hstmtInternal) != SQL_SUCCESS)
         pDb->DispAllErrors(henv, hdbc);
-    
+
     // Set the cursor type for the statement handles
     cursorType = SQL_CURSOR_STATIC;
     // Set the cursor type for the statement handles
     cursorType = SQL_CURSOR_STATIC;
-    
+
     if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
     if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
-    { 
+    {
         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);
         if (! wxStrcmp(pDb->sqlState, wxT("01S02")))  // Option Value Changed
         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);
         if (! wxStrcmp(pDb->sqlState, wxT("01S02")))  // Option Value Changed
@@ -296,7 +278,7 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
     else
         cout << wxT("Cursor Type set to STATIC") << endl << endl;
 #endif
     else
         cout << wxT("Cursor Type set to STATIC") << endl << endl;
 #endif
-    
+
     if (!queryOnly)
     {
         // Set the cursor type for the INSERT statement handle
     if (!queryOnly)
     {
         // Set the cursor type for the INSERT statement handle
@@ -309,7 +291,7 @@ bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD num
         if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
             pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
     }
         if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS)
             pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
     }
-    
+
     // Make the default cursor the active cursor
     hstmtDefault = GetNewCursor(FALSE,FALSE);
     wxASSERT(hstmtDefault);
     // Make the default cursor the active cursor
     hstmtDefault = GetNewCursor(FALSE,FALSE);
     wxASSERT(hstmtDefault);
@@ -351,7 +333,7 @@ void wxDbTable::cleanup()
         if (!found)
         {
             wxString msg;
         if (!found)
         {
             wxString msg;
-            msg.Printf(wxT("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s"),s);
+            msg.Printf(wxT("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s"),s.c_str());
             wxLogDebug (msg,wxT("NOTICE..."));
         }
     }
             wxLogDebug (msg,wxT("NOTICE..."));
         }
     }
@@ -411,6 +393,10 @@ ODBC 3.0 says to use this form
 
     if (hstmtCount)
         DeleteCursor(hstmtCount);
 
     if (hstmtCount)
         DeleteCursor(hstmtCount);
+
+    if (m_hstmtGridQuery)
+        DeleteCursor(m_hstmtGridQuery);
+
 }  // wxDbTable::cleanup()
 
 
 }  // wxDbTable::cleanup()
 
 
@@ -423,11 +409,11 @@ bool wxDbTable::bindParams(bool forUpdate)
     wxASSERT(!queryOnly);
     if (queryOnly)
         return(FALSE);
     wxASSERT(!queryOnly);
     if (queryOnly)
         return(FALSE);
-    
+
     SWORD   fSqlType    = 0;
     UDWORD  precision   = 0;
     SWORD   scale       = 0;
     SWORD   fSqlType    = 0;
     UDWORD  precision   = 0;
     SWORD   scale       = 0;
-    
+
     // Bind each column of the table that should be bound
     // to a parameter marker
     int i;
     // Bind each column of the table that should be bound
     // to a parameter marker
     int i;
@@ -469,7 +455,7 @@ bool wxDbTable::bindParams(bool forUpdate)
             case DB_DATA_TYPE_FLOAT:
                 fSqlType = pDb->GetTypeInfFloat().FsqlType;
                 precision = pDb->GetTypeInfFloat().Precision;
             case DB_DATA_TYPE_FLOAT:
                 fSqlType = pDb->GetTypeInfFloat().FsqlType;
                 precision = pDb->GetTypeInfFloat().Precision;
-                scale = pDb->GetTypeInfFloat().MaximumScale;       
+                scale = pDb->GetTypeInfFloat().MaximumScale;
                 // SQL Sybase Anywhere v5.5 returned a negative number for the
                 // MaxScale.  This caused ODBC to kick out an error on ibscale.
                 // I check for this here and set the scale = precision.
                 // SQL Sybase Anywhere v5.5 returned a negative number for the
                 // MaxScale.  This caused ODBC to kick out an error on ibscale.
                 // I check for this here and set the scale = precision.
@@ -502,7 +488,7 @@ bool wxDbTable::bindParams(bool forUpdate)
         if (forUpdate)
         {
             if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
         if (forUpdate)
         {
             if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
-                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
+                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,
                                  precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
                                  precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
@@ -511,14 +497,14 @@ bool wxDbTable::bindParams(bool forUpdate)
         else
         {
             if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
         else
         {
             if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
-                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
+                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,
                                  precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
             }
         }
     }
                                  precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
             {
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
             }
         }
     }
-    
+
     // Completed successfully
     return(TRUE);
 
     // Completed successfully
     return(TRUE);
 
@@ -681,7 +667,7 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxStri
         return(FALSE);
 
     // Execute the SQL SELECT statement
         return(FALSE);
 
     // Execute the SQL SELECT statement
-    int retcode;     
+    int retcode;
     retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt.c_str() : sqlStmt.c_str()), SQL_NTS);
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
     retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt.c_str() : sqlStmt.c_str()), SQL_NTS);
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
@@ -699,11 +685,24 @@ bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxStri
 bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
 {
     if (!pDb)
 bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
 {
     if (!pDb)
-        return FALSE;   
+        return FALSE;
 
     int i;
     wxString sqlStmt;
     wxString s;
 
     int i;
     wxString sqlStmt;
     wxString s;
+//    int NumKeyCols=0;
+
+    // Calculate the maximum size of the concatenated
+    // keys for use with wxDbGrid
+    m_keysize = 0;
+    for (i=0; i < noCols; i++)
+    {
+        if (colDefs[i].KeyField)
+        {
+//            NumKeyCols++;
+            m_keysize += colDefs[i].SzDataObj;
+        }
+    }
 
     s.Empty();
     // Verify that the table exists in the database
 
     s.Empty();
     // Verify that the table exists in the database
@@ -718,12 +717,12 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
     else if (checkPrivileges)
     {
         // Verify the user has rights to access the table.
     else if (checkPrivileges)
     {
         // Verify the user has rights to access the table.
-        // Shortcut boolean evaluation to optimize out call to 
+        // Shortcut boolean evaluation to optimize out call to
         // TablePrivileges
         //
         // Unfortunately this optimization doesn't seem to be
         // reliable!
         // TablePrivileges
         //
         // Unfortunately this optimization doesn't seem to be
         // reliable!
-        if (// *(pDb->dbInf.accessibleTables) == 'N' && 
+        if (// *(pDb->dbInf.accessibleTables) == 'N' &&
             !pDb->TablePrivileges(tableName,wxT("SELECT"), pDb->GetUsername(), pDb->GetUsername(), tablePath))
             s = wxT("Current logged in user does not have sufficient privileges to access this table.\n");
     }
             !pDb->TablePrivileges(tableName,wxT("SELECT"), pDb->GetUsername(), pDb->GetUsername(), tablePath))
             s = wxT("Current logged in user does not have sufficient privileges to access this table.\n");
     }
@@ -749,14 +748,14 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
     {
         if (!bindInsertParams())                    // Inserts
             return(FALSE);
     {
         if (!bindInsertParams())                    // Inserts
             return(FALSE);
-       
+
         if (!bindUpdateParams())                    // Updates
             return(FALSE);
     }
 
     if (!bindCols(*hstmtDefault))                   // Selects
         return(FALSE);
         if (!bindUpdateParams())                    // Updates
             return(FALSE);
     }
 
     if (!bindCols(*hstmtDefault))                   // Selects
         return(FALSE);
-    
+
     if (!bindCols(hstmtInternal))                   // Internal use only
         return(FALSE);
 
     if (!bindCols(hstmtInternal))                   // Internal use only
         return(FALSE);
 
@@ -768,14 +767,16 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
     if (!queryOnly && noCols > 0)
     {
         bool needComma = FALSE;
     if (!queryOnly && noCols > 0)
     {
         bool needComma = FALSE;
-        sqlStmt.Printf(wxT("INSERT INTO %s ("), tableName.c_str());
+        sqlStmt.Printf(wxT("INSERT INTO %s ("),
+                       pDb->SQLTableName(tableName.c_str()).c_str());
         for (i = 0; i < noCols; i++)
         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)
                 sqlStmt += wxT(",");
         for (i = 0; i < noCols; i++)
         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)
                 sqlStmt += wxT(",");
-            sqlStmt += colDefs[i].ColName;
+            sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//            sqlStmt += colDefs[i].ColName;
             needComma = TRUE;
         }
         needComma = FALSE;
             needComma = TRUE;
         }
         needComma = FALSE;
@@ -794,17 +795,17 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
             insertableCount++;
         }
         sqlStmt += wxT(")");
             insertableCount++;
         }
         sqlStmt += wxT(")");
-        
+
         // Prepare the insert statement for execution
         // Prepare the insert statement for execution
-        if (insertableCount)  
+        if (insertableCount)
         {
             if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }
         {
             if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }
-        else 
+        else
             insertable= FALSE;
     }
             insertable= FALSE;
     }
-    
+
     // Completed successfully
     return(TRUE);
 
     // Completed successfully
     return(TRUE);
 
@@ -898,7 +899,7 @@ bool wxDbTable::GetLast(void)
         wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
         return FALSE;
     }
         wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
         return FALSE;
     }
-    else 
+    else
         return(getRec(SQL_FETCH_LAST));
 
 }  // wxDbTable::GetLast()
         return(getRec(SQL_FETCH_LAST));
 
 }  // wxDbTable::GetLast()
@@ -919,11 +920,13 @@ void wxDbTable::BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxStrin
     // delete all records from the database in this case.
     if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0))
     {
     // delete all records from the database in this case.
     if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0))
     {
-        pSqlStmt.Printf(wxT("DELETE FROM %s"), tableName.c_str());
+        pSqlStmt.Printf(wxT("DELETE FROM %s"),
+                        pDb->SQLTableName(tableName.c_str()).c_str());
         return;
     }
 
         return;
     }
 
-    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "), tableName.c_str());
+    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "),
+                    pDb->SQLTableName(tableName.c_str()).c_str());
 
     // Append the WHERE clause to the SQL DELETE statement
     switch(typeOfDel)
 
     // Append the WHERE clause to the SQL DELETE statement
     switch(typeOfDel)
@@ -1005,10 +1008,12 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
         // If joining tables, the base table column names must be qualified to avoid ambiguity
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
         // If joining tables, the base table column names must be qualified to avoid ambiguity
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
-            pSqlStmt += queryTableName;
+            pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
+//            pSqlStmt += queryTableName;
             pSqlStmt += wxT(".");
         }
             pSqlStmt += wxT(".");
         }
-        pSqlStmt += colDefs[i].ColName;
+        pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//        pSqlStmt += colDefs[i].ColName;
         if (i + 1 < noCols)
             pSqlStmt += wxT(",");
     }
         if (i + 1 < noCols)
             pSqlStmt += wxT(",");
     }
@@ -1021,7 +1026,8 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
             pSqlStmt += wxT(",");
         if (appendFromClause || pDb->Dbms() == dbmsACCESS)
         {
             pSqlStmt += wxT(",");
-            pSqlStmt += queryTableName;
+            pSqlStmt += pDb->SQLTableName(queryTableName);
+//            pSqlStmt += queryTableName;
             pSqlStmt += wxT(".ROWID");
         }
         else
             pSqlStmt += wxT(".ROWID");
         }
         else
@@ -1030,7 +1036,8 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
 
     // Append the FROM tablename portion
     pSqlStmt += wxT(" FROM ");
 
     // Append the FROM tablename portion
     pSqlStmt += wxT(" FROM ");
-    pSqlStmt += queryTableName;
+    pSqlStmt += pDb->SQLTableName(queryTableName);
+//    pSqlStmt += queryTableName;
 
     // Sybase uses the HOLDLOCK keyword to lock a record during query.
     // The HOLDLOCK keyword follows the table name in the from clause.
 
     // Sybase uses the HOLDLOCK keyword to lock a record during query.
     // The HOLDLOCK keyword follows the table name in the from clause.
@@ -1117,7 +1124,8 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
 
     bool firstColumn = TRUE;
 
 
     bool firstColumn = TRUE;
 
-    pSqlStmt.Printf(wxT("UPDATE %s SET "), tableName.Upper().c_str());
+    pSqlStmt.Printf(wxT("UPDATE %s SET "),
+                    pDb->SQLTableName(tableName.c_str()).c_str());
 
     // Append a list of columns to be updated
     int i;
 
     // Append a list of columns to be updated
     int i;
@@ -1130,7 +1138,9 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
                 pSqlStmt += wxT(",");
             else
                 firstColumn = FALSE;
                 pSqlStmt += wxT(",");
             else
                 firstColumn = FALSE;
-            pSqlStmt += colDefs[i].ColName;
+
+            pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//            pSqlStmt += colDefs[i].ColName;
             pSqlStmt += wxT(" = ?");
         }
     }
             pSqlStmt += wxT(" = ?");
         }
     }
@@ -1210,10 +1220,12 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
             // Concatenate where phrase for the column
             if (qualTableName.Length())
             {
             // Concatenate where phrase for the column
             if (qualTableName.Length())
             {
-                pWhereClause += qualTableName;
+                pWhereClause += pDb->SQLTableName(qualTableName);
+//                pWhereClause += qualTableName;
                 pWhereClause += wxT(".");
             }
                 pWhereClause += wxT(".");
             }
-            pWhereClause += colDefs[i].ColName;
+            pWhereClause += pDb->SQLColumnName(colDefs[i].ColName);
+//            pWhereClause += colDefs[i].ColName;
             if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
                 pWhereClause += wxT(" LIKE ");
             else
             if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
                 pWhereClause += wxT(" LIKE ");
             else
@@ -1315,19 +1327,19 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         switch(colDefs[i].DbDataType)
         {
             case DB_DATA_TYPE_VARCHAR:
         switch(colDefs[i].DbDataType)
         {
             case DB_DATA_TYPE_VARCHAR:
-                cout << pDb->typeInfVarchar.TypeName << wxT("(") << colDefs[i].SzDataObj << wxT(")");
+                cout << pDb->GetTypeInfVarchar().TypeName << wxT("(") << colDefs[i].SzDataObj << wxT(")");
                 break;
             case DB_DATA_TYPE_INTEGER:
                 break;
             case DB_DATA_TYPE_INTEGER:
-                cout << pDb->typeInfInteger.TypeName;
+                cout << pDb->GetTypeInfInteger().TypeName;
                 break;
             case DB_DATA_TYPE_FLOAT:
                 break;
             case DB_DATA_TYPE_FLOAT:
-                cout << pDb->typeInfFloat.TypeName;
+                cout << pDb->GetTypeInfFloat().TypeName;
                 break;
             case DB_DATA_TYPE_DATE:
                 break;
             case DB_DATA_TYPE_DATE:
-                cout << pDb->typeInfDate.TypeName;
+                cout << pDb->GetTypeInfDate().TypeName;
                 break;
             case DB_DATA_TYPE_BLOB:
                 break;
             case DB_DATA_TYPE_BLOB:
-                cout << pDb->typeInfBlob.TypeName;
+                cout << pDb->GetTypeInfBlob().TypeName;
                 break;
         }
         cout << endl;
                 break;
         }
         cout << endl;
@@ -1336,7 +1348,9 @@ bool wxDbTable::CreateTable(bool attemptDrop)
 
     // Build a CREATE TABLE string from the colDefs structure.
     bool needComma = FALSE;
 
     // Build a CREATE TABLE string from the colDefs structure.
     bool needComma = FALSE;
-    sqlStmt.Printf(wxT("CREATE TABLE %s ("), tableName.c_str());
+
+    sqlStmt.Printf(wxT("CREATE TABLE %s ("),
+                   pDb->SQLTableName(tableName.c_str()).c_str());
 
     for (i = 0; i < noCols; i++)
     {
 
     for (i = 0; i < noCols; i++)
     {
@@ -1347,7 +1361,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
         if (needComma)
             sqlStmt += wxT(",");
         // Column Name
         if (needComma)
             sqlStmt += wxT(",");
         // Column Name
-        sqlStmt += colDefs[i].ColName;
+        sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//        sqlStmt += colDefs[i].ColName;
         sqlStmt += wxT(" ");
         // Column Type
         switch(colDefs[i].DbDataType)
         sqlStmt += wxT(" ");
         // Column Type
         switch(colDefs[i].DbDataType)
@@ -1369,7 +1384,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
                 break;
         }
         // For varchars, append the size of the string
                 break;
         }
         // For varchars, append the size of the string
-        if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR)// ||
+        if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR &&
+            (pDb->Dbms() != dbmsMY_SQL || pDb->GetTypeInfVarchar().TypeName != "text"))// ||
 //            colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
         {
             wxString s;
 //            colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
         {
             wxString s;
@@ -1388,7 +1404,7 @@ bool wxDbTable::CreateTable(bool attemptDrop)
                 sqlStmt += wxT(" NOT NULL");
             }
         }
                 sqlStmt += wxT(" NOT NULL");
             }
         }
-        
+
         needComma = TRUE;
     }
     // If there is a primary key defined, include it in the create statement
         needComma = TRUE;
     }
     // If there is a primary key defined, include it in the create statement
@@ -1404,6 +1420,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
     {
         switch (pDb->Dbms())
         {
     {
         switch (pDb->Dbms())
         {
+            case dbmsACCESS:
+            case dbmsINFORMIX:
             case dbmsSYBASE_ASA:
             case dbmsSYBASE_ASE:
             case dbmsMY_SQL:
             case dbmsSYBASE_ASA:
             case dbmsSYBASE_ASE:
             case dbmsMY_SQL:
@@ -1419,10 +1437,12 @@ bool wxDbTable::CreateTable(bool attemptDrop)
                 if (pDb->Dbms() == dbmsDB2)
                 {
                     wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
                 if (pDb->Dbms() == dbmsDB2)
                 {
                     wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
-                    sqlStmt += tableName.substr(0, 13);
+                    sqlStmt += pDb->SQLTableName(tableName.substr(0, 13).c_str());
+//                    sqlStmt += tableName.substr(0, 13);
                 }
                 else
                 }
                 else
-                    sqlStmt += tableName;
+                    sqlStmt += pDb->SQLTableName(tableName.c_str());
+//                    sqlStmt += tableName;
 
                 sqlStmt += wxT("_PIDX PRIMARY KEY (");
                 break;
 
                 sqlStmt += wxT("_PIDX PRIMARY KEY (");
                 break;
@@ -1436,16 +1456,26 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             {
                 if (j++) // Multi part key, comma separate names
                     sqlStmt += wxT(",");
             {
                 if (j++) // Multi part key, comma separate names
                     sqlStmt += wxT(",");
-                sqlStmt += colDefs[i].ColName;
+                sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+
+                if (pDb->Dbms() == dbmsMY_SQL &&
+                    colDefs[i].DbDataType ==  DB_DATA_TYPE_VARCHAR)
+                {
+                    wxString s;
+                    s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+                    sqlStmt += s;
+                }
             }
         }
         sqlStmt += wxT(")");
 
             }
         }
         sqlStmt += wxT(")");
 
-        if (pDb->Dbms() == dbmsSYBASE_ASA ||
+        if (pDb->Dbms() == dbmsINFORMIX ||
+            pDb->Dbms() == dbmsSYBASE_ASA ||
             pDb->Dbms() == dbmsSYBASE_ASE)
         {
             sqlStmt += wxT(" CONSTRAINT ");
             pDb->Dbms() == dbmsSYBASE_ASE)
         {
             sqlStmt += wxT(" CONSTRAINT ");
-            sqlStmt += tableName;
+            sqlStmt += pDb->SQLTableName(tableName);
+//            sqlStmt += tableName;
             sqlStmt += wxT("_PIDX");
         }
     }
             sqlStmt += wxT("_PIDX");
         }
     }
@@ -1490,7 +1520,8 @@ bool wxDbTable::DropTable()
 
     wxString sqlStmt;
 
 
     wxString sqlStmt;
 
-    sqlStmt.Printf(wxT("DROP TABLE %s"), tableName.c_str());
+    sqlStmt.Printf(wxT("DROP TABLE %s"),
+                   pDb->SQLTableName(tableName.c_str()).c_str());
 
     pDb->WriteSqlLog(sqlStmt);
 
 
     pDb->WriteSqlLog(sqlStmt);
 
@@ -1498,22 +1529,19 @@ bool wxDbTable::DropTable()
     cout << endl << sqlStmt.c_str() << endl;
 #endif
 
     cout << endl << sqlStmt.c_str() << endl;
 #endif
 
-
-
-
     RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
     if (retcode != SQL_SUCCESS)
     {
         // Check for "Base table not found" error and ignore
     RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
     if (retcode != SQL_SUCCESS)
     {
         // Check for "Base table not found" error and ignore
-        pDb->GetNextError(henv, hdbc, hstmt);   
+        pDb->GetNextError(henv, hdbc, hstmt);
         if (wxStrcmp(pDb->sqlState, wxT("S0002")) /*&&
         if (wxStrcmp(pDb->sqlState, wxT("S0002")) /*&&
-            wxStrcmp(pDb->sqlState, wxT("S1000"))*/)  // "Base table not found" 
+            wxStrcmp(pDb->sqlState, wxT("S1000"))*/)  // "Base table not found"
         {
             // Check for product specific error codes
             if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000")))   ||  // 5.x (and lower?)
         {
             // Check for product specific error codes
             if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000")))   ||  // 5.x (and lower?)
-                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000")))   ||   
+                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000")))   ||
                   (pDb->Dbms() == dbmsPERVASIVE_SQL && !wxStrcmp(pDb->sqlState,wxT("S1000")))   ||  // Returns an S1000 then an S0002
                   (pDb->Dbms() == dbmsPERVASIVE_SQL && !wxStrcmp(pDb->sqlState,wxT("S1000")))   ||  // Returns an S1000 then an S0002
-                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))     
+                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))
             {
                 pDb->DispNextError();
                 pDb->DispAllErrors(henv, hdbc, hstmt);
             {
                 pDb->DispNextError();
                 pDb->DispAllErrors(henv, hdbc, hstmt);
@@ -1572,7 +1600,7 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
                 if (!found)
                     j++;
             }
                 if (!found)
                     j++;
             }
-            
+
             if (found)
             {
                 ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,
             if (found)
             {
                 ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,
@@ -1599,23 +1627,26 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
             return(FALSE);
         }
     }
             return(FALSE);
         }
     }
-    
+
     // Build a CREATE INDEX statement
     sqlStmt = wxT("CREATE ");
     if (unique)
         sqlStmt += wxT("UNIQUE ");
     // Build a CREATE INDEX statement
     sqlStmt = wxT("CREATE ");
     if (unique)
         sqlStmt += wxT("UNIQUE ");
-    
+
     sqlStmt += wxT("INDEX ");
     sqlStmt += wxT("INDEX ");
-    sqlStmt += idxName;
+    sqlStmt += pDb->SQLTableName(idxName);
     sqlStmt += wxT(" ON ");
     sqlStmt += wxT(" ON ");
-    sqlStmt += tableName;
+
+    sqlStmt += pDb->SQLTableName(tableName);
+//    sqlStmt += tableName;
     sqlStmt += wxT(" (");
     sqlStmt += wxT(" (");
-    
+
     // Append list of columns making up index
     int i;
     for (i = 0; i < noIdxCols; i++)
     {
     // Append list of columns making up index
     int i;
     for (i = 0; i < noIdxCols; i++)
     {
-        sqlStmt += pIdxDefs[i].ColName;
+        sqlStmt += pDb->SQLColumnName(pIdxDefs[i].ColName);
+//        sqlStmt += pIdxDefs[i].ColName;
 
         // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
         if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (strncmp(pDb->dbInf.dbmsVer,"07",2)==0)) &&
 
         // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
         if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (strncmp(pDb->dbInf.dbmsVer,"07",2)==0)) &&
@@ -1627,12 +1658,12 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
                 sqlStmt += wxT(" DESC");
         }
         else
                 sqlStmt += wxT(" DESC");
         }
         else
-            wxASSERT_MSG(!pIdxDefs[i].Ascending, "Datasource does not support DESCending index columns");
+            wxASSERT_MSG(pIdxDefs[i].Ascending, "Datasource does not support DESCending index columns");
 
         if ((i + 1) < noIdxCols)
             sqlStmt += wxT(",");
     }
 
         if ((i + 1) < noIdxCols)
             sqlStmt += wxT(",");
     }
-    
+
     // Append closing parentheses
     sqlStmt += wxT(")");
 
     // Append closing parentheses
     sqlStmt += wxT(")");
 
@@ -1675,12 +1706,17 @@ bool wxDbTable::DropIndex(const wxString &idxName)
 
     if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
         pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
 
     if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
         pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
-        sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),idxName.c_str(), tableName.c_str());
+        sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),
+                       pDb->SQLTableName(idxName.c_str()).c_str(),
+                       pDb->SQLTableName(tableName.c_str()).c_str());
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
              (pDb->Dbms() == dbmsSYBASE_ASE))
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
              (pDb->Dbms() == dbmsSYBASE_ASE))
-        sqlStmt.Printf(wxT("DROP INDEX %s.%s"),tableName.c_str(), idxName.c_str());
+        sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
+                       pDb->SQLTableName(tableName.c_str()).c_str(),
+                       pDb->SQLTableName(idxName.c_str()).c_str());
     else
     else
-        sqlStmt.Printf(wxT("DROP INDEX %s"),idxName.c_str());
+        sqlStmt.Printf(wxT("DROP INDEX %s"),
+                       pDb->SQLTableName(idxName.c_str()).c_str());
 
     pDb->WriteSqlLog(sqlStmt);
 
 
     pDb->WriteSqlLog(sqlStmt);
 
@@ -1917,7 +1953,7 @@ bool wxDbTable::DeleteMatching(void)
 
 
 /********** wxDbTable::IsColNull() **********/
 
 
 /********** wxDbTable::IsColNull() **********/
-bool wxDbTable::IsColNull(UWORD colNo)
+bool wxDbTable::IsColNull(UWORD colNo) const
 {
 /*
     This logic is just not right.  It would indicate TRUE
 {
 /*
     This logic is just not right.  It would indicate TRUE
@@ -2087,12 +2123,15 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
 
     if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
     {
 
     if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
     {
-        int assertColumnNameTooLong = 0;
         wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
         colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;
         wxStrncpy(colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN);
         colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0;
+
+#ifdef __WXDEBUG__
         wxString tmpMsg;
         wxString tmpMsg;
-        tmpMsg.sprintf("Column name '%s' is too long. Truncated to '%s'.",fieldName,colDefs[index].ColName);
-        wxASSERT_MSG(assertColumnNameTooLong,tmpMsg.c_str());
+        tmpMsg.Printf(_T("Column name '%s' is too long. Truncated to '%s'."),
+                      fieldName.c_str(),colDefs[index].ColName);
+        wxFAIL_MSG(tmpMsg);
+#endif // __WXDEBUG__
     }
     else
         wxStrcpy(colDefs[index].ColName, fieldName);
     }
     else
         wxStrcpy(colDefs[index].ColName, fieldName);
@@ -2116,7 +2155,7 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
     }
 
     colDefs[index].Null                 = FALSE;
     }
 
     colDefs[index].Null                 = FALSE;
-    
+
 }  // wxDbTable::SetColDefs()
 
 
 }  // wxDbTable::SetColDefs()
 
 
@@ -2129,7 +2168,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
     if (pColInfs)
     {
         UWORD index;
     if (pColInfs)
     {
         UWORD index;
-       
+
         pColDataPtrs = new wxDbColDataPtr[numCols+1];
 
         for (index = 0; index < numCols; index++)
         pColDataPtrs = new wxDbColDataPtr[numCols+1];
 
         for (index = 0; index < numCols; index++)
@@ -2170,7 +2209,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                         pColDataPtrs[index].PtrDataObj = new double;
                         pColDataPtrs[index].SzDataObj  = sizeof(double);
                         pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
                         pColDataPtrs[index].PtrDataObj = new double;
                         pColDataPtrs[index].SzDataObj  = sizeof(double);
                         pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
-                    }  
+                    }
                     break;
                 case DB_DATA_TYPE_DATE:
                     pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;
                     break;
                 case DB_DATA_TYPE_DATE:
                     pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;
@@ -2178,8 +2217,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                     pColDataPtrs[index].SqlCtype   = SQL_C_TIMESTAMP;
                     break;
                 case DB_DATA_TYPE_BLOB:
                     pColDataPtrs[index].SqlCtype   = SQL_C_TIMESTAMP;
                     break;
                 case DB_DATA_TYPE_BLOB:
-                    int notSupportedYet = 0;
-                    wxASSERT_MSG(notSupportedYet, wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
+                    wxFAIL_MSG(wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
                     pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
                     pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
                     pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;
                     pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
                     pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
                     pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;
@@ -2189,7 +2227,7 @@ wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
                 SetColDefs (index,pColInfs[index].colName,pColInfs[index].dbDataType, pColDataPtrs[index].PtrDataObj, pColDataPtrs[index].SqlCtype, pColDataPtrs[index].SzDataObj);
             else
             {
                 SetColDefs (index,pColInfs[index].colName,pColInfs[index].dbDataType, pColDataPtrs[index].PtrDataObj, pColDataPtrs[index].SqlCtype, pColDataPtrs[index].SzDataObj);
             else
             {
-                // Unable to build all the column definitions, as either one of 
+                // Unable to build all the column definitions, as either one of
                 // the calls to "new" failed above, or there was a BLOB field
                 // to have a column definition for.  If BLOBs are to be used,
                 // the other form of ::SetColDefs() must be used, as it is impossible
                 // the calls to "new" failed above, or there was a BLOB field
                 // to have a column definition for.  If BLOBs are to be used,
                 // the other form of ::SetColDefs() must be used, as it is impossible
@@ -2227,7 +2265,8 @@ ULONG wxDbTable::Count(const wxString &args)
     sqlStmt  = wxT("SELECT COUNT(");
     sqlStmt += args;
     sqlStmt += wxT(") FROM ");
     sqlStmt  = wxT("SELECT COUNT(");
     sqlStmt += args;
     sqlStmt += wxT(") FROM ");
-    sqlStmt += queryTableName;
+    sqlStmt += pDb->SQLTableName(queryTableName);
+//    sqlStmt += queryTableName;
 #if wxODBC_BACKWARD_COMPATABILITY
     if (from && wxStrlen(from))
 #else
 #if wxODBC_BACKWARD_COMPATABILITY
     if (from && wxStrlen(from))
 #else
@@ -2319,7 +2358,8 @@ bool wxDbTable::Refresh(void)
         // based on the key fields.
         if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
         {
         // based on the key fields.
         if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
         {
-            whereClause += queryTableName;
+            whereClause += pDb->SQLTableName(queryTableName);
+//            whereClause += queryTableName;
             whereClause += wxT(".ROWID = '");
             whereClause += rowid;
             whereClause += wxT("'");
             whereClause += wxT(".ROWID = '");
             whereClause += rowid;
             whereClause += wxT("'");
@@ -2418,7 +2458,7 @@ HSTMT *wxDbTable::GetNewCursor(bool setCursor, bool bindColumns)
 
     if (bindColumns)
     {
 
     if (bindColumns)
     {
-        if(!bindCols(*newHSTMT))
+        if (!bindCols(*newHSTMT))
         {
             delete newHSTMT;
             return(0);
         {
             delete newHSTMT;
             return(0);
@@ -2444,7 +2484,7 @@ bool wxDbTable::DeleteCursor(HSTMT *hstmtDel)
 /*
 ODBC 3.0 says to use this form
     if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
 /*
 ODBC 3.0 says to use this form
     if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
-    
+
 */
     if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
     {
 */
     if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
     {
@@ -2458,5 +2498,228 @@ ODBC 3.0 says to use this form
 
 }  // wxDbTable::DeleteCursor()
 
 
 }  // wxDbTable::DeleteCursor()
 
+//////////////////////////////////////////////////////////////
+// wxDbGrid support functions
+//////////////////////////////////////////////////////////////
+
+void wxDbTable::SetRowMode(const rowmode_t rowmode)
+{
+    if (!m_hstmtGridQuery)
+    {
+        m_hstmtGridQuery = GetNewCursor(FALSE,FALSE);
+        if (!bindCols(*m_hstmtGridQuery))
+            return;
+    }
+
+    m_rowmode = rowmode;
+    switch (m_rowmode)
+    {
+        case WX_ROW_MODE_QUERY:
+            SetCursor(m_hstmtGridQuery);
+            break;
+        case WX_ROW_MODE_INDIVIDUAL:
+            SetCursor(hstmtDefault);
+            break;
+        default:
+            assert(0);
+    }
+}  // wxDbTable::SetRowMode()
+
+
+wxVariant wxDbTable::GetCol(const int colNo) const
+{
+    wxVariant val;
+    if ((colNo < noCols) && (!IsColNull(colNo)))
+    {
+        switch (colDefs[colNo].SqlCtype)
+        {
+            case SQL_CHAR:
+            case SQL_VARCHAR:
+                val = (wxChar *)(colDefs[colNo].PtrDataObj);
+                break;
+            case SQL_C_LONG:
+            case SQL_C_SLONG:
+                val = *(long *)(colDefs[colNo].PtrDataObj);
+                break;
+            case SQL_C_SHORT:
+            case SQL_C_SSHORT:
+                val = (long int )(*(short *)(colDefs[colNo].PtrDataObj));
+                break;
+            case SQL_C_ULONG:
+                val = (long)(*(unsigned long *)(colDefs[colNo].PtrDataObj));
+                break;
+            case SQL_C_TINYINT:
+                val = (long)(*(char *)(colDefs[colNo].PtrDataObj));
+                break;
+            case SQL_C_UTINYINT:
+                val = (long)(*(unsigned char *)(colDefs[colNo].PtrDataObj));
+                break;
+            case SQL_C_USHORT:
+                val = (long)(*(UWORD *)(colDefs[colNo].PtrDataObj));
+                break;
+            case SQL_C_DATE:
+                val = (DATE_STRUCT *)(colDefs[colNo].PtrDataObj);
+                break;
+            case SQL_C_TIME:
+                val = (TIME_STRUCT *)(colDefs[colNo].PtrDataObj);
+                break;
+            case SQL_C_TIMESTAMP:
+                val = (TIMESTAMP_STRUCT *)(colDefs[colNo].PtrDataObj);
+                break;
+            case SQL_C_DOUBLE:
+                val = *(double *)(colDefs[colNo].PtrDataObj);
+                break;
+            default:
+                assert(0);
+        }
+    }
+    return val;
+}  // wxDbTable::GetCol()
+
+
+void csstrncpyt(char *s, const char *t, int n)
+{
+    while ((*s++ = *t++) && --n)
+    {};
+
+    *s = '\0';
+}
+
+void wxDbTable::SetCol(const int colNo, const wxVariant val)
+{
+    //FIXME: Add proper wxDateTime support to wxVariant..
+    wxDateTime dateval;
+
+    SetColNull(colNo, val.IsNull());
+
+    if (!val.IsNull())
+    {
+        if ((colDefs[colNo].SqlCtype == SQL_C_DATE)
+            || (colDefs[colNo].SqlCtype == SQL_C_TIME)
+            || (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP))
+        {
+            //Returns null if invalid!
+            if (!dateval.ParseDate(val.GetString()))
+                SetColNull(colNo, TRUE);
+        }
+
+        switch (colDefs[colNo].SqlCtype)
+        {
+            case SQL_CHAR:
+            case SQL_VARCHAR:
+                csstrncpyt((char *)(colDefs[colNo].PtrDataObj),
+                           val.GetString().c_str(),
+                           colDefs[colNo].SzDataObj-1);
+                break;
+            case SQL_C_LONG:
+            case SQL_C_SLONG:
+                *(long *)(colDefs[colNo].PtrDataObj) = val;
+                break;
+            case SQL_C_SHORT:
+            case SQL_C_SSHORT:
+                *(short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
+                break;
+            case SQL_C_ULONG:
+                *(unsigned long *)(colDefs[colNo].PtrDataObj) = val.GetLong();
+                break;
+            case SQL_C_TINYINT:
+                *(char *)(colDefs[colNo].PtrDataObj) = val.GetChar();
+                break;
+            case SQL_C_UTINYINT:
+                *(unsigned char *)(colDefs[colNo].PtrDataObj) = val.GetChar();
+                break;
+            case SQL_C_USHORT:
+                *(unsigned short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
+                break;
+            //FIXME: Add proper wxDateTime support to wxVariant..
+            case SQL_C_DATE:
+                {
+                    DATE_STRUCT *dataptr =
+                        (DATE_STRUCT *)colDefs[colNo].PtrDataObj;
+
+                    dataptr->year   = dateval.GetYear();
+                    dataptr->month  = dateval.GetMonth()+1;
+                    dataptr->day    = dateval.GetDay();
+                }
+                break;
+            case SQL_C_TIME:
+                {
+                    TIME_STRUCT *dataptr =
+                        (TIME_STRUCT *)colDefs[colNo].PtrDataObj;
+
+                    dataptr->hour   = dateval.GetHour();
+                    dataptr->minute = dateval.GetMinute();
+                    dataptr->second = dateval.GetSecond();
+                }
+                break;
+            case SQL_C_TIMESTAMP:
+                {
+                    TIMESTAMP_STRUCT *dataptr =
+                        (TIMESTAMP_STRUCT *)colDefs[colNo].PtrDataObj;
+                    dataptr->year   = dateval.GetYear();
+                    dataptr->month  = dateval.GetMonth()+1;
+                    dataptr->day    = dateval.GetDay();
+
+                    dataptr->hour   = dateval.GetHour();
+                    dataptr->minute = dateval.GetMinute();
+                    dataptr->second = dateval.GetSecond();
+                }
+                break;
+            case SQL_C_DOUBLE:
+                *(double *)(colDefs[colNo].PtrDataObj) = val;
+                break;
+            default:
+                assert(0);
+        }  // switch
+    }  // if (!val.IsNull())
+}  // wxDbTable::SetCol()
+
+
+GenericKey wxDbTable::GetKey()
+{
+    void *blk;
+    wxChar *blkptr;
+
+    blk = malloc(m_keysize);
+    blkptr = (wxChar *) blk;
+
+    int i;
+    for (i=0; i < noCols; i++)
+    {
+        if (colDefs[i].KeyField)
+        {
+            memcpy(blkptr,colDefs[i].PtrDataObj, colDefs[i].SzDataObj);
+            blkptr += colDefs[i].SzDataObj;
+        }
+    }
+
+    GenericKey k = GenericKey(blk, m_keysize);
+    free(blk);
+
+    return k;
+}  // wxDbTable::GetKey()
+
+
+void wxDbTable::SetKey(const GenericKey& k)
+{
+    void    *blk;
+    wxChar  *blkptr;
+
+    blk = k.GetBlk();
+    blkptr = (wxChar *)blk;
+
+    int i;
+    for (i=0; i < noCols; i++)
+    {
+        if (colDefs[i].KeyField)
+        {
+            SetColNull(i, FALSE);
+            memcpy(colDefs[i].PtrDataObj, blkptr, colDefs[i].SzDataObj);
+            blkptr += colDefs[i].SzDataObj;
+        }
+    }
+}  // wxDbTable::SetKey()
+
+
 #endif  // wxUSE_ODBC
 
 #endif  // wxUSE_ODBC