wxControl and wxDialog coded and supporting module def file.

[wxWidgets.git] / src / common / dbtable.cpp
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp

index f39279fef8494904ae5d8203af0c5a57b5b86b20..a9cd88abb1d72314b1c0f2e9facfcb6c2aae6625 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -1,13 +1,10 @@
  ///////////////////////////////////////////////////////////////////////////////
  // Name:        dbtable.cpp
  ///////////////////////////////////////////////////////////////////////////////
  // Name:        dbtable.cpp
-// Purpose:     Implementation of the wxTable class.
+// Purpose:     Implementation of the wxDbTable class.
  // Author:      Doug Card
  // Modified by: George Tasker
  // Author:      Doug Card
  // Modified by: George Tasker
-// Mods:             April 1999
-//                      -Dynamic cursor support - Only one predefined cursor, as many others as
-//                          you need may be created on demand
-//                      -Reduced number of active cursors significantly 
-//                      -Query-Only wxTable objects 
+//              Bart Jourquin
+//              Mark Johnson
  // Created:     9.96
  // RCS-ID:      $Id$
  // Copyright:   (c) 1996 Remstar International, Inc.
  // Created:     9.96
  // RCS-ID:      $Id$
  // Copyright:   (c) 1996 Remstar International, Inc.
@@ -31,19 +28,20 @@
  // Use this line for wxWindows v1.x
  //#include "wx_ver.h"
  // Use this line for wxWindows v2.x
  // Use this line for wxWindows v1.x
  //#include "wx_ver.h"
  // Use this line for wxWindows v2.x
-#include "wx/version.h"
  #include  "wx/wxprec.h"
  #include  "wx/wxprec.h"
+#include "wx/version.h"
  
  #if wxMAJOR_VERSION == 2
  
  #if wxMAJOR_VERSION == 2
-#   ifdef __GNUG__
-#   pragma implementation "dbtable.h"
-#   endif
+    #ifdef __GNUG__
+        #pragma implementation "dbtable.h"
+    #endif
  #endif
  
  #ifdef DBDEBUG_CONSOLE
  #endif
  
  #ifdef DBDEBUG_CONSOLE
-    #include <iostream.h>
+    #include "wx/ioswrap.h"
  #endif
  
  #endif
  
+
  #ifdef    __BORLANDC__
      #pragma hdrstop
  #endif  //__BORLANDC__
  #ifdef    __BORLANDC__
      #pragma hdrstop
  #endif  //__BORLANDC__
@@ -55,6 +53,7 @@
          #include "wx/list.h"
          #include "wx/utils.h"
          #include "wx/msgdlg.h"
          #include "wx/list.h"
          #include "wx/utils.h"
          #include "wx/msgdlg.h"
+        #include "wx/log.h"
      #endif
      #include "wx/filefn.h"
  #endif
      #endif
      #include "wx/filefn.h"
  #endif
@@ -70,12 +69,13 @@
  #   define wxUSE_ODBC 1
  #endif
  
  #   define wxUSE_ODBC 1
  #endif
  
+
  #if wxUSE_ODBC
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #if wxUSE_ODBC
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-#include <assert.h>
+//#include <assert.h>
  
  #if   wxMAJOR_VERSION == 1
      #include "table.h"
  
  #if   wxMAJOR_VERSION == 1
      #include "table.h"
@@ -102,11 +102,63 @@ ULONG lastTableID = 0;
  #endif
  
  
  #endif
  
  
-/********** wxTable::wxTable() **********/
-wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
-                    const char *qryTblName, bool qryOnly, const char *tblPath)
+/********** wxDbColDef::wxDbColDef() Constructor **********/
+wxDbColDef::wxDbColDef()
+{
+    Initialize();
+}  // Constructor
+
+
+bool wxDbColDef::Initialize()
+{
+    ColName[0]      = 0;
+    DbDataType      = DB_DATA_TYPE_INTEGER;
+    SqlCtype        = SQL_C_LONG;
+    PtrDataObj      = NULL;
+    SzDataObj       = 0;
+    KeyField        = FALSE;
+    Updateable      = FALSE;
+    InsertAllowed   = FALSE;
+    DerivedCol      = FALSE;
+    CbValue         = 0;
+    Null = FALSE;
+
+    return TRUE;
+}  // wxDbColDef::Initialize()
+
+
+/********** wxDbTable::wxDbTable() Constructor **********/
+wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
+                    const wxString &qryTblName, bool qryOnly, const wxString &tblPath)
+{
+    if (!initialize(pwxDb, tblName, numColumns, qryTblName, qryOnly, tblPath))
+        cleanup();
+}  // wxDbTable::wxDbTable()
+
+
+/***** DEPRECATED: use wxDbTable::wxDbTable() format above *****/
+wxDbTable::wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
+                    const wxChar *qryTblName, bool qryOnly, const wxString &tblPath)
+{
+    wxString tempQryTblName;
+    tempQryTblName = qryTblName;
+    if (!initialize(pwxDb, tblName, numColumns, tempQryTblName, qryOnly, tblPath))
+        cleanup();
+}  // wxDbTable::wxDbTable()
+
+
+/********** wxDbTable::~wxDbTable() **********/
+wxDbTable::~wxDbTable()
  {
  {
-    pDb                 = pwxDB;                    // Pointer to the wxDB object
+    this->cleanup();
+}  // wxDbTable::~wxDbTable()
+
+
+bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
+                    const wxString &qryTblName, bool qryOnly, const wxString &tblPath)
+{
+    // Initializing member variables
+    pDb                 = pwxDb;                    // Pointer to the wxDb object
      henv                = 0;
      hdbc                = 0;
      hstmt               = 0;
      henv                = 0;
      hdbc                = 0;
      hstmt               = 0;
@@ -118,54 +170,59 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
      hstmtInternal       = 0;
      colDefs             = 0;
      tableID             = 0;
      hstmtInternal       = 0;
      colDefs             = 0;
      tableID             = 0;
-    noCols              = nCols;                    // No. of cols in the table
-    where               = 0;                        // Where clause
-    orderBy             = 0;                        // Order By clause
-    from                = 0;                        // From clause
+    noCols              = numColumns;               // Number of cols in the table
+    where.Empty();                                  // Where clause
+    orderBy.Empty();                                // Order By clause
+    from.Empty();                                   // From clause
      selectForUpdate     = FALSE;                    // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase
      queryOnly           = qryOnly;
      selectForUpdate     = FALSE;                    // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase
      queryOnly           = qryOnly;
+    insertable          = TRUE;
+    tablePath.Empty();
+    tableName.Empty();
+    queryTableName.Empty();
  
  
-    assert (tblName);
-
-    wxStrcpy(tableName, tblName);               // Table Name
-    if (tblPath)
-        wxStrcpy(tablePath, tblPath);           // Table Path - used for dBase files
-    else
-        tablePath[0]=0;
-
-    if (qryTblName)                             // Name of the table/view to query
-        wxStrcpy(queryTableName, qryTblName);
-    else
-        wxStrcpy(queryTableName, tblName);
+    wxASSERT(tblName.Length());
+    wxASSERT(pDb);
  
      if (!pDb)
  
      if (!pDb)
-        return;
-
-    pDb->nTables++;
+        return FALSE;
  
  
+    tableName = tblName;                        // Table Name
+    if (tblPath.Length())
+        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;
+    
+    pDb->incrementTableCount();
+    
      wxString s;
      tableID = ++lastTableID;
      wxString s;
      tableID = ++lastTableID;
-    s.sprintf("wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb);
-
+    s.Printf(wxT("wxDbTable constructor (%-20s) tableID:[%6lu] pDb:[%p]"), tblName.c_str(), tableID, pDb);
+    
  #ifdef __WXDEBUG__
  #ifdef __WXDEBUG__
-    CstructTablesInUse *tableInUse;
-    tableInUse            = new CstructTablesInUse();
+    wxTablesInUse *tableInUse;
+    tableInUse            = new wxTablesInUse();
      tableInUse->tableName = tblName;
      tableInUse->tableID   = tableID;
      tableInUse->pDb       = pDb;
      TablesInUse.Append(tableInUse);
  #endif
      tableInUse->tableName = tblName;
      tableInUse->tableID   = tableID;
      tableInUse->pDb       = pDb;
      TablesInUse.Append(tableInUse);
  #endif
-
-    pDb->WriteSqlLog(s.GetData());
-
-    // Grab the HENV and HDBC from the wxDB object
-    henv = pDb->henv;
-    hdbc = pDb->hdbc;
-
+    
+    pDb->WriteSqlLog(s);
+    
+    // Grab the HENV and HDBC from the wxDb object
+    henv = pDb->GetHENV();
+    hdbc = pDb->GetHDBC();
+    
      // Allocate space for column definitions
      if (noCols)
      // Allocate space for column definitions
      if (noCols)
-        colDefs = new wxColDef[noCols];  // Points to the first column defintion
-
+        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)
      {
@@ -182,14 +239,15 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
      // 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);
          // Check to see if cursor type is supported
          pDb->GetNextError(henv, hdbc, hstmtInternal);
-        if (! wxStrcmp(pDb->sqlState, "01S02"))  // Option Value Changed
+        if (! wxStrcmp(pDb->sqlState, wxT("01S02")))  // Option Value Changed
          {
              // Datasource does not support static cursors.  Driver
              // will substitute a cursor type.  Call SQLGetStmtOption()
          {
              // Datasource does not support static cursors.  Driver
              // will substitute a cursor type.  Call SQLGetStmtOption()
@@ -197,20 +255,36 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
              if (SQLGetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, &cursorType) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc, hstmtInternal);
  #ifdef DBDEBUG_CONSOLE
              if (SQLGetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, &cursorType) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc, hstmtInternal);
  #ifdef DBDEBUG_CONSOLE
-            cout << "Static cursor changed to: ";
+            cout << wxT("Static cursor changed to: ");
              switch(cursorType)
              {
              case SQL_CURSOR_FORWARD_ONLY:
              switch(cursorType)
              {
              case SQL_CURSOR_FORWARD_ONLY:
-                cout << "Forward Only";     break;
+                cout << wxT("Forward Only");
+                break;
              case SQL_CURSOR_STATIC:
              case SQL_CURSOR_STATIC:
-                cout << "Static";           break;
+                cout << wxT("Static");
+                break;
              case SQL_CURSOR_KEYSET_DRIVEN:
              case SQL_CURSOR_KEYSET_DRIVEN:
-                cout << "Keyset Driven";    break;
+                cout << wxT("Keyset Driven");
+                break;
              case SQL_CURSOR_DYNAMIC:
              case SQL_CURSOR_DYNAMIC:
-                cout << "Dynamic";          break;
+                cout << wxT("Dynamic");
+                break;
              }
              cout << endl << endl;
  #endif
              }
              cout << endl << endl;
  #endif
+            // BJO20000425
+            if (pDb->FwdOnlyCursors() && cursorType != SQL_CURSOR_FORWARD_ONLY)
+            {
+                // Force the use of a forward only cursor...
+                cursorType = SQL_CURSOR_FORWARD_ONLY;
+                if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
+                {
+                    // Should never happen
+                    pDb->GetNextError(henv, hdbc, hstmtInternal);
+                    return FALSE;
+                }
+            }
          }
          else
          {
          }
          else
          {
@@ -220,9 +294,9 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
      }
  #ifdef DBDEBUG_CONSOLE
      else
      }
  #ifdef DBDEBUG_CONSOLE
      else
-        cout << "Cursor Type set to STATIC" << endl << endl;
+        cout << wxT("Cursor Type set to STATIC") << endl << endl;
  #endif
  #endif
-
+    
      if (!queryOnly)
      {
          // Set the cursor type for the INSERT statement handle
      if (!queryOnly)
      {
          // Set the cursor type for the INSERT statement handle
@@ -235,23 +309,24 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
          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
      // Make the default cursor the active cursor
-    hstmtDefault = NewCursor(FALSE,FALSE);
-    assert(hstmtDefault);
+    hstmtDefault = GetNewCursor(FALSE,FALSE);
+    wxASSERT(hstmtDefault);
      hstmt = *hstmtDefault;
  
      hstmt = *hstmtDefault;
  
-}  // wxTable::wxTable()
+    return TRUE;
+
+}  // wxDbTable::initialize()
  
  
  
  
-/********** wxTable::~wxTable() **********/
-wxTable::~wxTable()
+void wxDbTable::cleanup()
  {
      wxString s;
      if (pDb)
      {
  {
      wxString s;
      if (pDb)
      {
-        s.sprintf("wxTable destructor (%-20s) tableID:[%6lu] pDb:[%p]", tableName,tableID,pDb);
-        pDb->WriteSqlLog(s.GetData());
+        s.Printf(wxT("wxDbTable destructor (%-20s) tableID:[%6lu] pDb:[%p]"), tableName.c_str(), tableID, pDb);
+        pDb->WriteSqlLog(s);
      }
  
  #ifdef __WXDEBUG__
      }
  
  #ifdef __WXDEBUG__
@@ -264,11 +339,11 @@ wxTable::~wxTable()
          pNode = TablesInUse.First();
          while (pNode && !found)
          {
          pNode = TablesInUse.First();
          while (pNode && !found)
          {
-            if (((CstructTablesInUse *)pNode->Data())->tableID == tableID)
+            if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
              {
                  found = TRUE;
                  if (!TablesInUse.DeleteNode(pNode))
              {
                  found = TRUE;
                  if (!TablesInUse.DeleteNode(pNode))
-                    wxMessageBox (s.GetData(),"Unable to delete node!");
+                    wxLogDebug (s,wxT("Unable to delete node!"));
              }
              else
                  pNode = pNode->Next();
              }
              else
                  pNode = pNode->Next();
@@ -276,15 +351,15 @@ wxTable::~wxTable()
          if (!found)
          {
              wxString msg;
          if (!found)
          {
              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...");
+            msg.Printf(wxT("Unable to find the tableID in the linked\nlist of tables in use.\n\n%s"),s);
+            wxLogDebug (msg,wxT("NOTICE..."));
          }
      }
  #endif
  
          }
      }
  #endif
  
-    // Decrement the wxDB table count
+    // Decrement the wxDb table count
      if (pDb)
      if (pDb)
-        pDb->nTables--;
+        pDb->decrementTableCount();
  
      // Delete memory allocated for column definitions
      if (colDefs)
  
      // Delete memory allocated for column definitions
      if (colDefs)
@@ -294,183 +369,199 @@ wxTable::~wxTable()
      if (!queryOnly)
      {
          if (hstmtInsert)
      if (!queryOnly)
      {
          if (hstmtInsert)
+        {
+/*
+ODBC 3.0 says to use this form
+            if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
+*/
              if (SQLFreeStmt(hstmtInsert, SQL_DROP) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc);
              if (SQLFreeStmt(hstmtInsert, SQL_DROP) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc);
+        }
+
          if (hstmtDelete)
          if (hstmtDelete)
+        {
+/*
+ODBC 3.0 says to use this form
+            if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
+*/
              if (SQLFreeStmt(hstmtDelete, SQL_DROP) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc);
              if (SQLFreeStmt(hstmtDelete, SQL_DROP) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc);
+        }
+
          if (hstmtUpdate)
          if (hstmtUpdate)
+        {
+/*
+ODBC 3.0 says to use this form
+            if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
+*/
              if (SQLFreeStmt(hstmtUpdate, SQL_DROP) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc);
              if (SQLFreeStmt(hstmtUpdate, SQL_DROP) != SQL_SUCCESS)
                  pDb->DispAllErrors(henv, hdbc);
+        }
      }
      }
+
      if (hstmtInternal)
      if (hstmtInternal)
+    {
          if (SQLFreeStmt(hstmtInternal, SQL_DROP) != SQL_SUCCESS)
              pDb->DispAllErrors(henv, hdbc);
          if (SQLFreeStmt(hstmtInternal, SQL_DROP) != SQL_SUCCESS)
              pDb->DispAllErrors(henv, hdbc);
+    }
  
      // Delete dynamically allocated cursors
      if (hstmtDefault)
          DeleteCursor(hstmtDefault);
  
      // Delete dynamically allocated cursors
      if (hstmtDefault)
          DeleteCursor(hstmtDefault);
+
      if (hstmtCount)
          DeleteCursor(hstmtCount);
      if (hstmtCount)
          DeleteCursor(hstmtCount);
-
-}  // wxTable::~wxTable()
-
+}  // wxDbTable::cleanup()
  
  
  /***************************** PRIVATE FUNCTIONS *****************************/
  
  
  
  
  /***************************** PRIVATE FUNCTIONS *****************************/
  
  
-
-/********** wxTable::bindInsertParams() **********/
-bool wxTable::bindInsertParams(void)
+/********** wxDbTable::bindUpdateParams() **********/
+bool wxDbTable::bindParams(bool forUpdate)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
      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 (that can be inserted) of the table to a parameter marker
-    int i,colNo;
+    
+    // Bind each column of the table that should be bound
+    // to a parameter marker
+    int i;
+        UWORD colNo;
      for (i = 0, colNo = 1; i < noCols; i++)
      {
      for (i = 0, colNo = 1; i < noCols; i++)
      {
-        if (! colDefs[i].InsertAllowed)
-            continue;
+        if (forUpdate)
+        {
+            if (! colDefs[i].Updateable)
+                continue;
+        }
+        else
+        {
+            if (! colDefs[i].InsertAllowed)
+                continue;
+        }
+
          switch(colDefs[i].DbDataType)
          {
          switch(colDefs[i].DbDataType)
          {
-        case DB_DATA_TYPE_VARCHAR:
-            fSqlType = pDb->typeInfVarchar.FsqlType;
-            precision = colDefs[i].SzDataObj;
-            scale = 0;
-            colDefs[i].CbValue = SQL_NTS;
-            break;
-        case DB_DATA_TYPE_INTEGER:
-            fSqlType = pDb->typeInfInteger.FsqlType;
-            precision = pDb->typeInfInteger.Precision;
-            scale = 0;
-            colDefs[i].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_FLOAT:
-            fSqlType = pDb->typeInfFloat.FsqlType;
-            precision = pDb->typeInfFloat.Precision;
-            scale = pDb->typeInfFloat.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.
-            //if (scale < 0)
-            //  scale = (short) precision;
-            colDefs[i].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_DATE:
-            fSqlType = pDb->typeInfDate.FsqlType;
-            precision = pDb->typeInfDate.Precision;
-            scale = 0;
-            colDefs[i].CbValue = 0;
-            break;
+            case DB_DATA_TYPE_VARCHAR:
+                fSqlType = pDb->GetTypeInfVarchar().FsqlType;
+                precision = colDefs[i].SzDataObj;
+                scale = 0;
+                if (colDefs[i].Null)
+                    colDefs[i].CbValue = SQL_NULL_DATA;
+                else
+                    colDefs[i].CbValue = SQL_NTS;
+                break;
+            case DB_DATA_TYPE_INTEGER:
+                fSqlType = pDb->GetTypeInfInteger().FsqlType;
+                precision = pDb->GetTypeInfInteger().Precision;
+                scale = 0;
+                if (colDefs[i].Null)
+                    colDefs[i].CbValue = SQL_NULL_DATA;
+                else
+                    colDefs[i].CbValue = 0;
+                break;
+            case DB_DATA_TYPE_FLOAT:
+                fSqlType = pDb->GetTypeInfFloat().FsqlType;
+                precision = pDb->GetTypeInfFloat().Precision;
+                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.
+                //if (scale < 0)
+                // scale = (short) precision;
+                if (colDefs[i].Null)
+                    colDefs[i].CbValue = SQL_NULL_DATA;
+                else
+                    colDefs[i].CbValue = 0;
+                break;
+            case DB_DATA_TYPE_DATE:
+                fSqlType = pDb->GetTypeInfDate().FsqlType;
+                precision = pDb->GetTypeInfDate().Precision;
+                scale = 0;
+                if (colDefs[i].Null)
+                    colDefs[i].CbValue = SQL_NULL_DATA;
+                else
+                    colDefs[i].CbValue = 0;
+                break;
+            case DB_DATA_TYPE_BLOB:
+                fSqlType = pDb->GetTypeInfBlob().FsqlType;
+                precision = 50000;
+                scale = 0;
+                if (colDefs[i].Null)
+                    colDefs[i].CbValue = SQL_NULL_DATA;
+                else
+                    colDefs[i].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[i].SzDataObj);
+                break;
+        }
+        if (forUpdate)
+        {
+            if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
+                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
+                                 precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
+            {
+                return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
+            }
          }
          }
-        // Null values
-        if (colDefs[i].Null)
+        else
          {
          {
-            colDefs[i].CbValue = SQL_NULL_DATA;
-            colDefs[i].Null = FALSE;
+            if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
+                                 fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
+                                 precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
+            {
+                return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
+            }
          }
          }
-        if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
-                                    fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
-                                    precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
-            return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
      }
      }
-
+    
      // Completed successfully
      return(TRUE);
  
      // Completed successfully
      return(TRUE);
  
-}  // wxTable::bindInsertParams()
+}  // wxDbTable::bindParams()
  
  
  
  
-/********** wxTable::bindUpdateParams() **********/
-bool wxTable::bindUpdateParams(void)
+/********** wxDbTable::bindInsertParams() **********/
+bool wxDbTable::bindInsertParams(void)
  {
  {
-    assert(!queryOnly);
-    if (queryOnly)
-        return(FALSE);
-
-    SWORD   fSqlType    = 0;
-    UDWORD  precision   = 0;
-    SWORD   scale       = 0;
-    
-    // Bind each UPDATEABLE column of the table to a parameter marker
-    int i,colNo;
-    for (i = 0, colNo = 1; i < noCols; i++)
-    {
-        if (! colDefs[i].Updateable)
-            continue;
-        switch(colDefs[i].DbDataType)
-        {
-        case DB_DATA_TYPE_VARCHAR:
-            fSqlType = pDb->typeInfVarchar.FsqlType;
-            precision = colDefs[i].SzDataObj;
-            scale = 0;
-            colDefs[i].CbValue = SQL_NTS;
-            break;
-        case DB_DATA_TYPE_INTEGER:
-            fSqlType = pDb->typeInfInteger.FsqlType;
-            precision = pDb->typeInfInteger.Precision;
-            scale = 0;
-            colDefs[i].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_FLOAT:
-            fSqlType = pDb->typeInfFloat.FsqlType;
-            precision = pDb->typeInfFloat.Precision;
-            scale = pDb->typeInfFloat.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.
-            //if (scale < 0)
-            // scale = (short) precision;
-            colDefs[i].CbValue = 0;
-            break;
-        case DB_DATA_TYPE_DATE:
-            fSqlType = pDb->typeInfDate.FsqlType;
-            precision = pDb->typeInfDate.Precision;
-            scale = 0;
-            colDefs[i].CbValue = 0;
-            break;
-        }
-        if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
-                             fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, 
-                             precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
-            return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
-    }
+    return bindParams(FALSE);
+}  // wxDbTable::bindInsertParams()
  
  
-    // Completed successfully
-    return(TRUE);
  
  
-}  // wxTable::bindUpdateParams()
+/********** wxDbTable::bindUpdateParams() **********/
+bool wxDbTable::bindUpdateParams(void)
+{
+    return bindParams(TRUE);
+}  // wxDbTable::bindUpdateParams()
  
  
  
  
-/********** wxTable::bindCols() **********/
-bool wxTable::bindCols(HSTMT cursor)
+/********** wxDbTable::bindCols() **********/
+bool wxDbTable::bindCols(HSTMT cursor)
  {
  {
-    static SDWORD  cb;
+//RG-NULL    static SDWORD  cb;
      
      // Bind each column of the table to a memory address for fetching data
      
      // Bind each column of the table to a memory address for fetching data
-    int i;
+    UWORD i;
      for (i = 0; i < noCols; i++)
      {
      for (i = 0; i < noCols; i++)
      {
-        if (SQLBindCol(cursor, i+1, colDefs[i].SqlCtype, (UCHAR*) colDefs[i].PtrDataObj,
-                       colDefs[i].SzDataObj, &cb) != SQL_SUCCESS)
-            return(pDb->DispAllErrors(henv, hdbc, cursor));
+        if (SQLBindCol(cursor, (UWORD)(i+1), colDefs[i].SqlCtype, (UCHAR*) colDefs[i].PtrDataObj,
+                       colDefs[i].SzDataObj, &colDefs[i].CbValue ) != SQL_SUCCESS)
+        {
+          return (pDb->DispAllErrors(henv, hdbc, cursor));
+        }
      }
  
      // Completed successfully
      return(TRUE);
  
      }
  
      // Completed successfully
      return(TRUE);
  
-}  // wxTable::bindCols()
+}  // wxDbTable::bindCols()
  
  
  
  
-/********** wxTable::getRec() **********/
-bool wxTable::getRec(UWORD fetchType)
+/********** wxDbTable::getRec() **********/
+bool wxDbTable::getRec(UWORD fetchType)
  {
      RETCODE retcode;
  
  {
      RETCODE retcode;
  
@@ -482,10 +573,20 @@ bool wxTable::getRec(UWORD fetchType)
  
          retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus);
          if (retcode  != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
  
          retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus);
          if (retcode  != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
+        {
              if (retcode == SQL_NO_DATA_FOUND)
                  return(FALSE);
              else
                  return(pDb->DispAllErrors(henv, hdbc, hstmt));
              if (retcode == SQL_NO_DATA_FOUND)
                  return(FALSE);
              else
                  return(pDb->DispAllErrors(henv, hdbc, hstmt));
+        }
+        else
+        {
+            // Set the Null member variable to indicate the Null state
+            // of each column just read in.
+            int i;
+            for (i = 0; i < noCols; i++)
+                colDefs[i].Null = (colDefs[i].CbValue == SQL_NULL_DATA);
+        }
      }
      else
      {
      }
      else
      {
@@ -498,46 +599,53 @@ bool wxTable::getRec(UWORD fetchType)
              else
                  return(pDb->DispAllErrors(henv, hdbc, hstmt));
          }
              else
                  return(pDb->DispAllErrors(henv, hdbc, hstmt));
          }
+        else
+        {
+            // Set the Null member variable to indicate the Null state
+            // of each column just read in.
+            int i;
+            for (i = 0; i < noCols; i++)
+                colDefs[i].Null = (colDefs[i].CbValue == SQL_NULL_DATA);
+        }
      }
  
      // Completed successfully
      return(TRUE);
  
      }
  
      // Completed successfully
      return(TRUE);
  
-}  // wxTable::getRec()
+}  // wxDbTable::getRec()
  
  
  
  
-/********** wxTable::execDelete() **********/
-bool wxTable::execDelete(const char *pSqlStmt)
+/********** wxDbTable::execDelete() **********/
+bool wxDbTable::execDelete(const wxString &pSqlStmt)
  {
      // Execute the DELETE statement
  {
      // Execute the DELETE statement
-    if (SQLExecDirect(hstmtDelete, (UCHAR FAR *) pSqlStmt, SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmtDelete, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
          return(pDb->DispAllErrors(henv, hdbc, hstmtDelete));
  
      // Record deleted successfully
      return(TRUE);
  
          return(pDb->DispAllErrors(henv, hdbc, hstmtDelete));
  
      // Record deleted successfully
      return(TRUE);
  
-}  // wxTable::execDelete()
+}  // wxDbTable::execDelete()
  
  
  
  
-/********** wxTable::execUpdate() **********/
-bool wxTable::execUpdate(const char *pSqlStmt)
+/********** wxDbTable::execUpdate() **********/
+bool wxDbTable::execUpdate(const wxString &pSqlStmt)
  {
      // Execute the UPDATE statement
  {
      // Execute the UPDATE statement
-    if (SQLExecDirect(hstmtUpdate, (UCHAR FAR *) pSqlStmt, SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmtUpdate, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
          return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
  
      // Record deleted successfully
      return(TRUE);
  
          return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
  
      // Record deleted successfully
      return(TRUE);
  
-}  // wxTable::execUpdate()
+}  // wxDbTable::execUpdate()
  
  
  
  
-/********** wxTable::query() **********/
-bool wxTable::query(int queryType, bool forUpdate, bool distinct, char *pSqlStmt)
+/********** wxDbTable::query() **********/
+bool wxDbTable::query(int queryType, bool forUpdate, bool distinct, const wxString &pSqlStmt)
  {
  {
-    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    wxString sqlStmt;
  
  
-    // Set the selectForUpdate member variable
      if (forUpdate)
          // The user may wish to select for update, but the DBMS may not be capable
          selectForUpdate = CanSelectForUpdate();
      if (forUpdate)
          // The user may wish to select for update, but the DBMS may not be capable
          selectForUpdate = CanSelectForUpdate();
@@ -546,94 +654,111 @@ bool wxTable::query(int queryType, bool forUpdate, bool distinct, char *pSqlStmt
  
      // Set the SQL SELECT string
      if (queryType != DB_SELECT_STATEMENT)               // A select statement was not passed in,
  
      // Set the SQL SELECT string
      if (queryType != DB_SELECT_STATEMENT)               // A select statement was not passed in,
-    {                                                               // so generate a select statement.
-        GetSelectStmt(sqlStmt, queryType, distinct);
+    {                                                   // so generate a select statement.
+        BuildSelectStmt(sqlStmt, queryType, distinct);
          pDb->WriteSqlLog(sqlStmt);
      }
          pDb->WriteSqlLog(sqlStmt);
      }
+/*
+   This is the block of code that got added during the 2.2.1 merge with 
+   the 2.2 main branch that somehow got added here when it should not have.  - gt
  
  
+    else 
+        wxStrcpy(sqlStmt, pSqlStmt);
+
+    SQLFreeStmt(hstmt, SQL_CLOSE);
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt, SQL_NTS) == SQL_SUCCESS)
+        return(TRUE);
+    else
+    {
+        pDb->DispAllErrors(henv, hdbc, hstmt);
+        return(FALSE);
+    }
+*/
      // Make sure the cursor is closed first
      // Make sure the cursor is closed first
-    if (! CloseCursor(hstmt))
+    if (!CloseCursor(hstmt))
          return(FALSE);
  
      // Execute the SQL SELECT statement
          return(FALSE);
  
      // Execute the SQL SELECT statement
-    int retcode;
-
-    retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt : sqlStmt), SQL_NTS);
+    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));
  
      // Completed successfully
      return(TRUE);
  
      if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
          return(pDb->DispAllErrors(henv, hdbc, hstmt));
  
      // Completed successfully
      return(TRUE);
  
-}  // wxTable::query()
+}  // wxDbTable::query()
  
  
  /***************************** PUBLIC FUNCTIONS *****************************/
  
  
  
  
  /***************************** PUBLIC FUNCTIONS *****************************/
  
  
-/********** wxTable::Open() **********/
-bool wxTable::Open(void)
+/********** wxDbTable::Open() **********/
+bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
  {
      if (!pDb)
  {
      if (!pDb)
-        return FALSE;
+        return FALSE;   
  
      int i;
  
      int i;
-//    char sqlStmt[DB_MAX_STATEMENT_LEN];
      wxString sqlStmt;
      wxString sqlStmt;
-    wxString *s = NULL;
+    wxString s;
  
  
+    s.Empty();
      // Verify that the table exists in the database
      // Verify that the table exists in the database
-//    if (!pDb->TableExists(tableName,pDb->GetUsername(),tablePath))
-    if (!pDb->TableExists(tableName,NULL,tablePath))
+    if (checkTableExists && !pDb->TableExists(tableName, pDb->GetUsername(), tablePath))
      {
      {
-       s =new wxString("Table/view does not exist in the database");
-       if (*(pDb->dbInf.accessibleTables) == 'Y') 
-       {
-           (*s)+=", or you have insufficient permissions.\n";
-       }
-       else 
-       {
-           (*s)+=".\n";
-       }
+        s = wxT("Table/view does not exist in the database");
+        if ( *(pDb->dbInf.accessibleTables) == wxT('Y'))
+            s += wxT(", or you have no permissions.\n");
+        else
+            s += wxT(".\n");
      }
      }
-    else
+    else if (checkPrivileges)
+    {
+        // Verify the user has rights to access the table.
+        // Shortcut boolean evaluation to optimize out call to 
+        // TablePrivileges
+        //
+        // Unfortunately this optimization doesn't seem to be
+        // reliable!
+        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");
+    }
+
+    if (!s.IsEmpty())
      {
      {
-       // Verify the user has rights to access the table.
-       // Shortcut boolean evaluation to optimize out call to TablePrivs
-       // Unfortunely this optimization doesn't seem to be reliable!
-        if (/* *(pDb->dbInf.accessibleTables) == 'N' &&  */
-            !pDb->TablePrivileges(tableName,"SELECT",NULL,tablePath))
-            s = new wxString("Current logged in user has insufficient privileges to access this table.\n");
-    }   
-    
-    if (s) 
-    {           
          wxString p;
          wxString p;
-        if (wxStrcmp(tablePath,""))
-            p.sprintf("Error opening '%s/%s'.\n",tablePath,tableName);
-        else 
-            p.sprintf("Error opening '%s'.\n", tableName);
  
  
-        p += (*s);
+        if (!tablePath.IsEmpty())
+            p.Printf(wxT("Error opening '%s/%s'.\n"),tablePath.c_str(),tableName.c_str());
+        else
+            p.Printf(wxT("Error opening '%s'.\n"), tableName.c_str());
+
+        p += s;
          pDb->LogError(p.GetData());
  
          return(FALSE);
      }
  
      // Bind the member variables for field exchange between
          pDb->LogError(p.GetData());
  
          return(FALSE);
      }
  
      // Bind the member variables for field exchange between
-    // the wxTable object and the ODBC record.
+    // the wxDbTable object and the ODBC record.
      if (!queryOnly)
      {
          if (!bindInsertParams())                    // Inserts
              return(FALSE);
      if (!queryOnly)
      {
          if (!bindInsertParams())                    // Inserts
              return(FALSE);
+       
          if (!bindUpdateParams())                    // Updates
              return(FALSE);
      }
          if (!bindUpdateParams())                    // Updates
              return(FALSE);
      }
+
      if (!bindCols(*hstmtDefault))                   // Selects
          return(FALSE);
      if (!bindCols(*hstmtDefault))                   // Selects
          return(FALSE);
+    
      if (!bindCols(hstmtInternal))                   // Internal use only
          return(FALSE);
      if (!bindCols(hstmtInternal))                   // Internal use only
          return(FALSE);
-    /*
+
+     /*
       * Do NOT bind the hstmtCount cursor!!!
       */
  
       * Do NOT bind the hstmtCount cursor!!!
       */
  
@@ -641,150 +766,235 @@ bool wxTable::Open(void)
      if (!queryOnly && noCols > 0)
      {
          bool needComma = FALSE;
      if (!queryOnly && noCols > 0)
      {
          bool needComma = FALSE;
-        sqlStmt.sprintf("INSERT INTO %s (", tableName);
+        sqlStmt.Printf(wxT("INSERT INTO %s ("), tableName.c_str());
          for (i = 0; i < noCols; i++)
          {
              if (! colDefs[i].InsertAllowed)
                  continue;
              if (needComma)
          for (i = 0; i < noCols; i++)
          {
              if (! colDefs[i].InsertAllowed)
                  continue;
              if (needComma)
-                sqlStmt += ",";
+                sqlStmt += wxT(",");
              sqlStmt += colDefs[i].ColName;
              needComma = TRUE;
          }
          needComma = FALSE;
              sqlStmt += colDefs[i].ColName;
              needComma = TRUE;
          }
          needComma = FALSE;
-        sqlStmt += ") VALUES (";
+        sqlStmt += wxT(") VALUES (");
+
+        int insertableCount = 0;
+
          for (i = 0; i < noCols; i++)
          {
              if (! colDefs[i].InsertAllowed)
                  continue;
              if (needComma)
          for (i = 0; i < noCols; i++)
          {
              if (! colDefs[i].InsertAllowed)
                  continue;
              if (needComma)
-                sqlStmt += ",";
-            sqlStmt += "?";
+                sqlStmt += wxT(",");
+            sqlStmt += wxT("?");
              needComma = TRUE;
              needComma = TRUE;
+            insertableCount++;
          }
          }
-        sqlStmt += ")";
-
-//      pDb->WriteSqlLog(sqlStmt);
-
+        sqlStmt += wxT(")");
+        
          // Prepare the insert statement for execution
          // Prepare the insert statement for execution
-        if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS) != SQL_SUCCESS)
-            return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
+        if (insertableCount)  
+        {
+            if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+                return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
+        }
+        else 
+            insertable= FALSE;
      }
      
      // Completed successfully
      return(TRUE);
  
      }
      
      // Completed successfully
      return(TRUE);
  
-}  // wxTable::Open()
+}  // wxDbTable::Open()
  
  
  
  
-/********** wxTable::Query() **********/
-bool wxTable::Query(bool forUpdate, bool distinct)
+/********** wxDbTable::Query() **********/
+bool wxDbTable::Query(bool forUpdate, bool distinct)
  {
  
      return(query(DB_SELECT_WHERE, forUpdate, distinct));
  
  {
  
      return(query(DB_SELECT_WHERE, forUpdate, distinct));
  
-}  // wxTable::Query()
+}  // wxDbTable::Query()
  
  
  
  
-/********** wxTable::QueryBySqlStmt() **********/
-bool wxTable::QueryBySqlStmt(char *pSqlStmt)
+/********** wxDbTable::QueryBySqlStmt() **********/
+bool wxDbTable::QueryBySqlStmt(const wxString &pSqlStmt)
  {
      pDb->WriteSqlLog(pSqlStmt);
  
      return(query(DB_SELECT_STATEMENT, FALSE, FALSE, pSqlStmt));
  
  {
      pDb->WriteSqlLog(pSqlStmt);
  
      return(query(DB_SELECT_STATEMENT, FALSE, FALSE, pSqlStmt));
  
-}  // wxTable::QueryBySqlStmt()
+}  // wxDbTable::QueryBySqlStmt()
  
  
  
  
-/********** wxTable::QueryMatching() **********/
-bool wxTable::QueryMatching(bool forUpdate, bool distinct)
+/********** wxDbTable::QueryMatching() **********/
+bool wxDbTable::QueryMatching(bool forUpdate, bool distinct)
  {
  
      return(query(DB_SELECT_MATCHING, forUpdate, distinct));
  
  {
  
      return(query(DB_SELECT_MATCHING, forUpdate, distinct));
  
-}  // wxTable::QueryMatching()
+}  // wxDbTable::QueryMatching()
  
  
  
  
-/********** wxTable::QueryOnKeyFields() **********/
-bool wxTable::QueryOnKeyFields(bool forUpdate, bool distinct)
+/********** wxDbTable::QueryOnKeyFields() **********/
+bool wxDbTable::QueryOnKeyFields(bool forUpdate, bool distinct)
  {
  
      return(query(DB_SELECT_KEYFIELDS, forUpdate, distinct));
  
  {
  
      return(query(DB_SELECT_KEYFIELDS, forUpdate, distinct));
  
-}  // wxTable::QueryOnKeyFields()
+}  // wxDbTable::QueryOnKeyFields()
  
  
  
  
-/********** wxTable::GetPrev() **********/
-bool wxTable::GetPrev(void)
+/********** wxDbTable::GetPrev() **********/
+bool wxDbTable::GetPrev(void)
  {
      if (pDb->FwdOnlyCursors())
      {
  {
      if (pDb->FwdOnlyCursors())
      {
-        wxFAIL_MSG(wxT("GetPrev()::Backward scrolling cursors are not enabled for this instance of wxTable"));
+        wxFAIL_MSG(wxT("GetPrev()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
          return FALSE;
      }
      else
          return(getRec(SQL_FETCH_PRIOR));
          return FALSE;
      }
      else
          return(getRec(SQL_FETCH_PRIOR));
-}  // wxTable::GetPrev()
  
  
+}  // wxDbTable::GetPrev()
  
  
-/********** wxTable::operator-- **********/
-bool wxTable::operator--(int)
+
+/********** wxDbTable::operator-- **********/
+bool wxDbTable::operator--(int)
  {
      if (pDb->FwdOnlyCursors())
      {
  {
      if (pDb->FwdOnlyCursors())
      {
-        wxFAIL_MSG(wxT("operator--:Backward scrolling cursors are not enabled for this instance of wxTable"));
+        wxFAIL_MSG(wxT("operator--:Backward scrolling cursors are not enabled for this instance of wxDbTable"));
          return FALSE;
      }
      else
          return(getRec(SQL_FETCH_PRIOR));
          return FALSE;
      }
      else
          return(getRec(SQL_FETCH_PRIOR));
-}  // wxTable::operator--
+
+}  // wxDbTable::operator--
  
  
  
  
-/********** wxTable::GetFirst() **********/
-bool wxTable::GetFirst(void)
+/********** wxDbTable::GetFirst() **********/
+bool wxDbTable::GetFirst(void)
  {
      if (pDb->FwdOnlyCursors())
      {
  {
      if (pDb->FwdOnlyCursors())
      {
-        wxFAIL_MSG(wxT("GetFirst():Backward scrolling cursors are not enabled for this instance of wxTable"));
+        wxFAIL_MSG(wxT("GetFirst():Backward scrolling cursors are not enabled for this instance of wxDbTable"));
          return FALSE;
      }
      else
          return(getRec(SQL_FETCH_FIRST));
          return FALSE;
      }
      else
          return(getRec(SQL_FETCH_FIRST));
-}  // wxTable::GetFirst()
  
  
+}  // wxDbTable::GetFirst()
  
  
-/********** wxTable::GetLast() **********/
-bool wxTable::GetLast(void)
+
+/********** wxDbTable::GetLast() **********/
+bool wxDbTable::GetLast(void)
  {
      if (pDb->FwdOnlyCursors())
      {
  {
      if (pDb->FwdOnlyCursors())
      {
-        wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxTable"));
+        wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
          return FALSE;
      }
      else 
          return(getRec(SQL_FETCH_LAST));
          return FALSE;
      }
      else 
          return(getRec(SQL_FETCH_LAST));
-}  // wxTable::GetLast()
  
  
+}  // wxDbTable::GetLast()
+
+
+/********** wxDbTable::BuildDeleteStmt() **********/
+void wxDbTable::BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause)
+{
+    wxASSERT(!queryOnly);
+    if (queryOnly)
+        return;
+
+    wxString whereClause;
+
+    whereClause.Empty();
+
+    // Handle the case of DeleteWhere() and the where clause is blank.  It should
+    // 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());
+        return;
+    }
+
+    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "), tableName.c_str());
+
+    // Append the WHERE clause to the SQL DELETE statement
+    switch(typeOfDel)
+    {
+        case DB_DEL_KEYFIELDS:
+            // If the datasource supports the ROWID column, build
+            // the where on ROWID for efficiency purposes.
+            // e.g. DELETE FROM PARTS WHERE ROWID = '111.222.333'
+            if (CanUpdByROWID())
+            {
+                SDWORD cb;
+                wxChar   rowid[wxDB_ROWID_LEN+1];
+
+                // Get the ROWID value.  If not successful retreiving the ROWID,
+                // simply fall down through the code and build the WHERE clause
+                // based on the key fields.
+                if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
+                {
+                    pSqlStmt += wxT("ROWID = '");
+                    pSqlStmt += rowid;
+                    pSqlStmt += wxT("'");
+                    break;
+                }
+            }
+            // Unable to delete by ROWID, so build a WHERE
+            // clause based on the keyfields.
+            BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS);
+            pSqlStmt += whereClause;
+            break;
+        case DB_DEL_WHERE:
+            pSqlStmt += pWhereClause;
+            break;
+        case DB_DEL_MATCHING:
+            BuildWhereClause(whereClause, DB_WHERE_MATCHING);
+            pSqlStmt += whereClause;
+            break;
+    }
+
+}  // BuildDeleteStmt()
  
  
-/********** wxTable::GetSelectStmt() **********/
-void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct)
+
+/***** DEPRECATED: use wxDbTable::BuildDeleteStmt(wxString &....) form *****/
+void wxDbTable::BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause)
  {
  {
-    char whereClause[DB_MAX_WHERE_CLAUSE_LEN];
+    wxString tempSqlStmt;
+    BuildDeleteStmt(tempSqlStmt, typeOfDel, pWhereClause);
+    wxStrcpy(pSqlStmt, tempSqlStmt);
+}  // wxDbTable::BuildDeleteStmt()
+
  
  
-    whereClause[0] = 0;
+/********** wxDbTable::BuildSelectStmt() **********/
+void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool distinct)
+{
+    wxString whereClause;
+    whereClause.Empty();
  
      // Build a select statement to query the database
  
      // Build a select statement to query the database
-    wxStrcpy(pSqlStmt, "SELECT ");
+    pSqlStmt = wxT("SELECT ");
  
      // SELECT DISTINCT values only?
      if (distinct)
  
      // SELECT DISTINCT values only?
      if (distinct)
-        wxStrcat(pSqlStmt, "DISTINCT ");
+        pSqlStmt += wxT("DISTINCT ");
  
      // Was a FROM clause specified to join tables to the base table?
      // Available for ::Query() only!!!
      bool appendFromClause = FALSE;
  
      // Was a FROM clause specified to join tables to the base table?
      // Available for ::Query() only!!!
      bool appendFromClause = FALSE;
+#if wxODBC_BACKWARD_COMPATABILITY
      if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))
          appendFromClause = TRUE;
      if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))
          appendFromClause = TRUE;
+#else
+    if (typeOfSelect == DB_SELECT_WHERE && from.Length())
+        appendFromClause = TRUE;
+#endif
  
      // Add the column list
      int i;
  
      // Add the column list
      int i;
@@ -793,12 +1003,12 @@ void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct)
          // If joining tables, the base table column names must be qualified to avoid ambiguity
          if (appendFromClause)
          {
          // If joining tables, the base table column names must be qualified to avoid ambiguity
          if (appendFromClause)
          {
-            wxStrcat(pSqlStmt, queryTableName);
-            wxStrcat(pSqlStmt, ".");
+            pSqlStmt += queryTableName;
+            pSqlStmt += wxT(".");
          }
          }
-        wxStrcat(pSqlStmt, colDefs[i].ColName);
+        pSqlStmt += colDefs[i].ColName;
          if (i + 1 < noCols)
          if (i + 1 < noCols)
-            wxStrcat(pSqlStmt, ",");
+            pSqlStmt += wxT(",");
      }
  
      // If the datasource supports ROWID, get this column as well.  Exception: Don't retrieve
      }
  
      // If the datasource supports ROWID, get this column as well.  Exception: Don't retrieve
@@ -808,17 +1018,17 @@ void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct)
          // If joining tables, the base table column names must be qualified to avoid ambiguity
          if (appendFromClause)
          {
          // If joining tables, the base table column names must be qualified to avoid ambiguity
          if (appendFromClause)
          {
-            wxStrcat(pSqlStmt, ",");
-            wxStrcat(pSqlStmt, queryTableName);
-            wxStrcat(pSqlStmt, ".ROWID");
+            pSqlStmt += wxT(",");
+            pSqlStmt += queryTableName;
+            pSqlStmt += wxT(".ROWID");
          }
          else
          }
          else
-            wxStrcat(pSqlStmt, ",ROWID");
+            pSqlStmt += wxT(",ROWID");
      }
  
      // Append the FROM tablename portion
      }
  
      // Append the FROM tablename portion
-    wxStrcat(pSqlStmt, " FROM ");
-    wxStrcat(pSqlStmt, queryTableName);
+    pSqlStmt += wxT(" FROM ");
+    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.
@@ -826,58 +1036,228 @@ void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct)
      // NOHOLDLOCK (the default).  Note: The "FOR UPDATE" clause
      // is parsed but ignored in SYBASE Transact-SQL.
      if (selectForUpdate && (pDb->Dbms() == dbmsSYBASE_ASA || pDb->Dbms() == dbmsSYBASE_ASE))
      // NOHOLDLOCK (the default).  Note: The "FOR UPDATE" clause
      // is parsed but ignored in SYBASE Transact-SQL.
      if (selectForUpdate && (pDb->Dbms() == dbmsSYBASE_ASA || pDb->Dbms() == dbmsSYBASE_ASE))
-        wxStrcat(pSqlStmt, " HOLDLOCK");
+        pSqlStmt += wxT(" HOLDLOCK");
  
      if (appendFromClause)
  
      if (appendFromClause)
-        wxStrcat(pSqlStmt, from);
+        pSqlStmt += from;
  
      // Append the WHERE clause.  Either append the where clause for the class
      // or build a where clause.  The typeOfSelect determines this.
      switch(typeOfSelect)
      {
  
      // Append the WHERE clause.  Either append the where clause for the class
      // or build a where clause.  The typeOfSelect determines this.
      switch(typeOfSelect)
      {
-    case DB_SELECT_WHERE:
-        if (where && wxStrlen(where))   // May not want a where clause!!!
-        {
-            wxStrcat(pSqlStmt, " WHERE ");
-            wxStrcat(pSqlStmt, where);
-        }
-        break;
-    case DB_SELECT_KEYFIELDS:
-        GetWhereClause(whereClause, DB_WHERE_KEYFIELDS);
-        if (wxStrlen(whereClause))
+        case DB_SELECT_WHERE:
+#if wxODBC_BACKWARD_COMPATABILITY
+            if (where && wxStrlen(where))   // May not want a where clause!!!
+#else
+            if (where.Length())   // May not want a where clause!!!
+#endif
+            {
+                pSqlStmt += wxT(" WHERE ");
+                pSqlStmt += where;
+            }
+            break;
+        case DB_SELECT_KEYFIELDS:
+            BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS);
+            if (whereClause.Length())
+            {
+                pSqlStmt += wxT(" WHERE ");
+                pSqlStmt += whereClause;
+            }
+            break;
+        case DB_SELECT_MATCHING:
+            BuildWhereClause(whereClause, DB_WHERE_MATCHING);
+            if (whereClause.Length())
+            {
+                pSqlStmt += wxT(" WHERE ");
+                pSqlStmt += whereClause;
+            }
+            break;
+    }
+
+    // Append the ORDER BY clause
+#if wxODBC_BACKWARD_COMPATABILITY
+    if (orderBy && wxStrlen(orderBy))
+#else
+    if (orderBy.Length())
+#endif
+    {
+        pSqlStmt += wxT(" ORDER BY ");
+        pSqlStmt += orderBy;
+    }
+
+    // SELECT FOR UPDATE if told to do so and the datasource is capable.  Sybase
+    // parses the FOR UPDATE clause but ignores it.  See the comment above on the
+    // HOLDLOCK for Sybase.
+    if (selectForUpdate && CanSelectForUpdate())
+        pSqlStmt += wxT(" FOR UPDATE");
+
+}  // wxDbTable::BuildSelectStmt()
+
+
+/***** DEPRECATED: use wxDbTable::BuildSelectStmt(wxString &....) form *****/
+void wxDbTable::BuildSelectStmt(wxChar *pSqlStmt, int typeOfSelect, bool distinct)
+{
+    wxString tempSqlStmt;
+    BuildSelectStmt(tempSqlStmt, typeOfSelect, distinct);
+    wxStrcpy(pSqlStmt, tempSqlStmt);
+}  // wxDbTable::BuildSelectStmt()
+
+
+/********** wxDbTable::BuildUpdateStmt() **********/
+void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxString &pWhereClause)
+{
+    wxASSERT(!queryOnly);
+    if (queryOnly)
+        return;
+
+    wxString whereClause;
+    whereClause.Empty();
+
+    bool firstColumn = TRUE;
+
+    pSqlStmt.Printf(wxT("UPDATE %s SET "), tableName.c_str());
+
+    // Append a list of columns to be updated
+    int i;
+    for (i = 0; i < noCols; i++)
+    {
+        // Only append Updateable columns
+        if (colDefs[i].Updateable)
          {
          {
-            wxStrcat(pSqlStmt, " WHERE ");
-            wxStrcat(pSqlStmt, whereClause);
+            if (! firstColumn)
+                pSqlStmt += wxT(",");
+            else
+                firstColumn = FALSE;
+            pSqlStmt += colDefs[i].ColName;
+            pSqlStmt += wxT(" = ?");
          }
          }
-        break;
-    case DB_SELECT_MATCHING:
-        GetWhereClause(whereClause, DB_WHERE_MATCHING);
-        if (wxStrlen(whereClause))
+    }
+
+    // Append the WHERE clause to the SQL UPDATE statement
+    pSqlStmt += wxT(" WHERE ");
+    switch(typeOfUpd)
+    {
+        case DB_UPD_KEYFIELDS:
+            // If the datasource supports the ROWID column, build
+            // the where on ROWID for efficiency purposes.
+            // e.g. UPDATE PARTS SET Col1 = ?, Col2 = ? WHERE ROWID = '111.222.333'
+            if (CanUpdByROWID())
+            {
+                SDWORD cb;
+                wxChar rowid[wxDB_ROWID_LEN+1];
+
+                // Get the ROWID value.  If not successful retreiving the ROWID,
+                // simply fall down through the code and build the WHERE clause
+                // based on the key fields.
+                if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
+                {
+                    pSqlStmt += wxT("ROWID = '");
+                    pSqlStmt += rowid;
+                    pSqlStmt += wxT("'");
+                    break;
+                }
+            }
+            // Unable to delete by ROWID, so build a WHERE
+            // clause based on the keyfields.
+            BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS);
+            pSqlStmt += whereClause;
+            break;
+        case DB_UPD_WHERE:
+            pSqlStmt += pWhereClause;
+            break;
+    }
+}  // BuildUpdateStmt()
+
+
+/***** DEPRECATED: use wxDbTable::BuildUpdateStmt(wxString &....) form *****/
+void wxDbTable::BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause)
+{
+    wxString tempSqlStmt;
+    BuildUpdateStmt(tempSqlStmt, typeOfUpd, pWhereClause);
+    wxStrcpy(pSqlStmt, tempSqlStmt);
+}  // BuildUpdateStmt()
+
+
+/********** wxDbTable::BuildWhereClause() **********/
+void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
+                                 const wxString &qualTableName, bool useLikeComparison)
+/*
+ * Note: BuildWhereClause() currently ignores timestamp columns.
+ *       They are not included as part of the where clause.
+ */
+{
+    bool moreThanOneColumn = FALSE;
+    wxString colValue;
+
+    // Loop through the columns building a where clause as you go
+    int i;
+    for (i = 0; i < noCols; i++)
+    {
+        // Determine if this column should be included in the WHERE clause
+        if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[i].KeyField) ||
+             (typeOfWhere == DB_WHERE_MATCHING  && (!IsColNull(i))))
          {
          {
-            wxStrcat(pSqlStmt, " WHERE ");
-            wxStrcat(pSqlStmt, whereClause);
+            // Skip over timestamp columns
+            if (colDefs[i].SqlCtype == SQL_C_TIMESTAMP)
+                continue;
+            // If there is more than 1 column, join them with the keyword "AND"
+            if (moreThanOneColumn)
+                pWhereClause += wxT(" AND ");
+            else
+                moreThanOneColumn = TRUE;
+            // Concatenate where phrase for the column
+            if (qualTableName.Length())
+            {
+                pWhereClause += qualTableName;
+                pWhereClause += wxT(".");
+            }
+            pWhereClause += colDefs[i].ColName;
+            if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
+                pWhereClause += wxT(" LIKE ");
+            else
+                pWhereClause += wxT(" = ");
+            switch(colDefs[i].SqlCtype)
+            {
+                case SQL_C_CHAR:
+                    colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[i].PtrDataObj);
+                    break;
+                case SQL_C_SSHORT:
+                    colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[i].PtrDataObj));
+                    break;
+                case SQL_C_USHORT:
+                    colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[i].PtrDataObj));
+                    break;
+                case SQL_C_SLONG:
+                    colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[i].PtrDataObj));
+                    break;
+                case SQL_C_ULONG:
+                    colValue.Printf(wxT("%lu"), *((UDWORD *) colDefs[i].PtrDataObj));
+                    break;
+                case SQL_C_FLOAT:
+                    colValue.Printf(wxT("%.6f"), *((SFLOAT *) colDefs[i].PtrDataObj));
+                    break;
+                case SQL_C_DOUBLE:
+                    colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[i].PtrDataObj));
+                    break;
+            }
+            pWhereClause += colValue;
          }
          }
-        break;
-    }
-
-    // Append the ORDER BY clause
-    if (orderBy && wxStrlen(orderBy))
-    {
-        wxStrcat(pSqlStmt, " ORDER BY ");
-        wxStrcat(pSqlStmt, orderBy);
      }
      }
+}  // wxDbTable::BuildWhereClause()
  
  
-    // SELECT FOR UPDATE if told to do so and the datasource is capable.  Sybase
-    // parses the FOR UPDATE clause but ignores it.  See the comment above on the
-    // HOLDLOCK for Sybase.
-    if (selectForUpdate && CanSelectForUpdate())
-        wxStrcat(pSqlStmt, " FOR UPDATE");
  
  
-}  // wxTable::GetSelectStmt()
+/***** DEPRECATED: use wxDbTable::BuildWhereClause(wxString &....) form *****/
+void wxDbTable::BuildWhereClause(wxChar *pWhereClause, int typeOfWhere,
+                                 const wxString &qualTableName, bool useLikeComparison)
+{
+    wxString tempSqlStmt;
+    BuildWhereClause(tempSqlStmt, typeOfWhere, qualTableName, useLikeComparison);
+    wxStrcpy(pWhereClause, tempSqlStmt);
+}  // wxDbTable::BuildWhereClause()
  
  
  
  
-/********** wxTable::GetRowNum() **********/
-UWORD wxTable::GetRowNum(void)
+/********** wxDbTable::GetRowNum() **********/
+UWORD wxDbTable::GetRowNum(void)
  {
      UDWORD rowNum;
  
  {
      UDWORD rowNum;
  
@@ -890,11 +1270,11 @@ UWORD wxTable::GetRowNum(void)
      // Completed successfully
      return((UWORD) rowNum);
  
      // Completed successfully
      return((UWORD) rowNum);
  
-}  // wxTable::GetRowNum()
+}  // wxDbTable::GetRowNum()
  
  
  
  
-/********** wxTable::CloseCursor() **********/
-bool wxTable::CloseCursor(HSTMT cursor)
+/********** wxDbTable::CloseCursor() **********/
+bool wxDbTable::CloseCursor(HSTMT cursor)
  {
      if (SQLFreeStmt(cursor, SQL_CLOSE) != SQL_SUCCESS)
          return(pDb->DispAllErrors(henv, hdbc, cursor));
  {
      if (SQLFreeStmt(cursor, SQL_CLOSE) != SQL_SUCCESS)
          return(pDb->DispAllErrors(henv, hdbc, cursor));
@@ -902,21 +1282,20 @@ bool wxTable::CloseCursor(HSTMT cursor)
      // Completed successfully
      return(TRUE);
  
      // Completed successfully
      return(TRUE);
  
-}  // wxTable::CloseCursor()
+}  // wxDbTable::CloseCursor()
  
  
  
  
-/********** wxTable::CreateTable() **********/
-bool wxTable::CreateTable(bool attemptDrop)
+/********** wxDbTable::CreateTable() **********/
+bool wxDbTable::CreateTable(bool attemptDrop)
  {
      if (!pDb)
          return FALSE;
  
      int i, j;
  {
      if (!pDb)
          return FALSE;
  
      int i, j;
-//    char sqlStmt[DB_MAX_STATEMENT_LEN];
      wxString sqlStmt;
  
  #ifdef DBDEBUG_CONSOLE
      wxString sqlStmt;
  
  #ifdef DBDEBUG_CONSOLE
-    cout << "Creating Table " << tableName << "..." << endl;
+    cout << wxT("Creating Table ") << tableName << wxT("...") << endl;
  #endif
  
      // Drop table first
  #endif
  
      // Drop table first
@@ -930,11 +1309,11 @@ bool wxTable::CreateTable(bool attemptDrop)
          // Exclude derived columns since they are NOT part of the base table
          if (colDefs[i].DerivedCol)
              continue;
          // Exclude derived columns since they are NOT part of the base table
          if (colDefs[i].DerivedCol)
              continue;
-        cout << i + 1 << ": " << colDefs[i].ColName << "; ";
+        cout << i + 1 << wxT(": ") << colDefs[i].ColName << wxT("; ");
          switch(colDefs[i].DbDataType)
          {
              case DB_DATA_TYPE_VARCHAR:
          switch(colDefs[i].DbDataType)
          {
              case DB_DATA_TYPE_VARCHAR:
-                cout << pDb->typeInfVarchar.TypeName << "(" << colDefs[i].SzDataObj << ")";
+                cout << pDb->typeInfVarchar.TypeName << wxT("(") << colDefs[i].SzDataObj << wxT(")");
                  break;
              case DB_DATA_TYPE_INTEGER:
                  cout << pDb->typeInfInteger.TypeName;
                  break;
              case DB_DATA_TYPE_INTEGER:
                  cout << pDb->typeInfInteger.TypeName;
@@ -945,6 +1324,9 @@ bool wxTable::CreateTable(bool attemptDrop)
              case DB_DATA_TYPE_DATE:
                  cout << pDb->typeInfDate.TypeName;
                  break;
              case DB_DATA_TYPE_DATE:
                  cout << pDb->typeInfDate.TypeName;
                  break;
+            case DB_DATA_TYPE_BLOB:
+                cout << pDb->typeInfBlob.TypeName;
+                break;
          }
          cout << endl;
      }
          }
          cout << endl;
      }
@@ -952,7 +1334,7 @@ bool wxTable::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.sprintf("CREATE TABLE %s (", tableName);
+    sqlStmt.Printf(wxT("CREATE TABLE %s ("), tableName.c_str());
  
      for (i = 0; i < noCols; i++)
      {
  
      for (i = 0; i < noCols; i++)
      {
@@ -961,38 +1343,46 @@ bool wxTable::CreateTable(bool attemptDrop)
              continue;
          // Comma Delimiter
          if (needComma)
              continue;
          // Comma Delimiter
          if (needComma)
-           sqlStmt += ",";
+            sqlStmt += wxT(",");
          // Column Name
          sqlStmt += colDefs[i].ColName;
          // Column Name
          sqlStmt += colDefs[i].ColName;
-        sqlStmt += " ";
+        sqlStmt += wxT(" ");
          // Column Type
          switch(colDefs[i].DbDataType)
          {
              case DB_DATA_TYPE_VARCHAR:
          // Column Type
          switch(colDefs[i].DbDataType)
          {
              case DB_DATA_TYPE_VARCHAR:
-                sqlStmt += pDb->typeInfVarchar.TypeName; break;
+                sqlStmt += pDb->GetTypeInfVarchar().TypeName;
+                break;
              case DB_DATA_TYPE_INTEGER:
              case DB_DATA_TYPE_INTEGER:
-                sqlStmt += pDb->typeInfInteger.TypeName; break;
+                sqlStmt += pDb->GetTypeInfInteger().TypeName;
+                break;
              case DB_DATA_TYPE_FLOAT:
              case DB_DATA_TYPE_FLOAT:
-                sqlStmt += pDb->typeInfFloat.TypeName; break;
+                sqlStmt += pDb->GetTypeInfFloat().TypeName;
+                break;
              case DB_DATA_TYPE_DATE:
              case DB_DATA_TYPE_DATE:
-                sqlStmt += pDb->typeInfDate.TypeName; break;
+                sqlStmt += pDb->GetTypeInfDate().TypeName;
+                break;
+            case DB_DATA_TYPE_BLOB:
+                sqlStmt += pDb->GetTypeInfBlob().TypeName;
+                break;
          }
          // For varchars, append the size of the string
          }
          // For varchars, append the size of the string
-        if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR)
+        if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR)// ||
+//            colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
          {
              wxString s;
          {
              wxString s;
-            // wxStrcat(sqlStmt, "(");
-            // wxStrcat(sqlStmt, itoa(colDefs[i].SzDataObj, s, 10));
-            // wxStrcat(sqlStmt, ")");
-            s.sprintf("(%d)", colDefs[i].SzDataObj);
-            sqlStmt += s.GetData();
+            s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+            sqlStmt += s;
          }
  
          }
  
-        if (pDb->Dbms() == dbmsSYBASE_ASE || pDb->Dbms() == dbmsMY_SQL)
+        if (pDb->Dbms() == dbmsDB2 ||
+            pDb->Dbms() == dbmsMY_SQL ||
+            pDb->Dbms() == dbmsSYBASE_ASE  ||
+            pDb->Dbms() == dbmsMS_SQL_SERVER)
          {
              if (colDefs[i].KeyField)
              {
          {
              if (colDefs[i].KeyField)
              {
-                sqlStmt += " NOT NULL";
+                sqlStmt += wxT(" NOT NULL");
              }
          }
          
              }
          }
          
@@ -1009,16 +1399,23 @@ bool wxTable::CreateTable(bool attemptDrop)
      }
      if (j && pDb->Dbms() != dbmsDBASE)  // Found a keyfield
      {
      }
      if (j && pDb->Dbms() != dbmsDBASE)  // Found a keyfield
      {
-        if (pDb->Dbms() != dbmsMY_SQL)
-        {
-            sqlStmt += ",CONSTRAINT ";
-            sqlStmt += tableName;
-            sqlStmt += "_PIDX PRIMARY KEY (";
-        }
-        else
+        switch (pDb->Dbms())
          {
          {
-            /* MySQL goes out on this one. We also declare the relevant key NON NULL above */
-            sqlStmt += ", PRIMARY KEY (";
+            case dbmsSYBASE_ASA:
+            case dbmsSYBASE_ASE:
+            case dbmsMY_SQL:
+            {
+                /* MySQL goes out on this one. We also declare the relevant key NON NULL above */
+                sqlStmt += wxT(",PRIMARY KEY (");
+                break;
+            }
+            default:
+            {
+                sqlStmt += wxT(",CONSTRAINT ");
+                sqlStmt += tableName;
+                sqlStmt += wxT("_PIDX PRIMARY KEY (");
+                break;
+            }
          }
  
          // List column name(s) of column(s) comprising the primary key
          }
  
          // List column name(s) of column(s) comprising the primary key
@@ -1027,23 +1424,31 @@ bool wxTable::CreateTable(bool attemptDrop)
              if (colDefs[i].KeyField)
              {
                  if (j++) // Multi part key, comma separate names
              if (colDefs[i].KeyField)
              {
                  if (j++) // Multi part key, comma separate names
-                    sqlStmt += ",";
+                    sqlStmt += wxT(",");
                  sqlStmt += colDefs[i].ColName;
              }
          }
                  sqlStmt += colDefs[i].ColName;
              }
          }
-       sqlStmt += ")";
+       sqlStmt += wxT(")");
+
+       if (pDb->Dbms() == dbmsSYBASE_ASA ||
+           pDb->Dbms() == dbmsSYBASE_ASE)
+       {
+        sqlStmt += wxT(" CONSTRAINT ");
+        sqlStmt += tableName;
+        sqlStmt += wxT("_PIDX");
+       }
      }
      // Append the closing parentheses for the create table statement
      }
      // Append the closing parentheses for the create table statement
-    sqlStmt += ")";
+    sqlStmt += wxT(")");
  
  
-    pDb->WriteSqlLog(sqlStmt.GetData());
+    pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
  
  #ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.GetData() << endl;
+    cout << endl << sqlStmt.c_str() << endl;
  #endif
  
      // Execute the CREATE TABLE statement
  #endif
  
      // Execute the CREATE TABLE statement
-    RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS);
+    RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
      if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
      {
          pDb->DispAllErrors(henv, hdbc, hstmt);
      if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
      {
          pDb->DispAllErrors(henv, hdbc, hstmt);
@@ -1053,46 +1458,46 @@ bool wxTable::CreateTable(bool attemptDrop)
      }
  
      // Commit the transaction and close the cursor
      }
  
      // Commit the transaction and close the cursor
-    if (! pDb->CommitTrans())
+    if (!pDb->CommitTrans())
          return(FALSE);
          return(FALSE);
-    if (! CloseCursor(hstmt))
+    if (!CloseCursor(hstmt))
          return(FALSE);
  
      // Database table created successfully
      return(TRUE);
  
          return(FALSE);
  
      // Database table created successfully
      return(TRUE);
  
-} // wxTable::CreateTable()
+} // wxDbTable::CreateTable()
  
  
  
  
-/********** wxTable::DropTable() **********/
-bool wxTable::DropTable()
+/********** wxDbTable::DropTable() **********/
+bool wxDbTable::DropTable()
  {
      // NOTE: This function returns TRUE if the Table does not exist, but
      //       only for identified databases.  Code will need to be added
  {
      // 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
  
      //       to handle this situation consistently
  
-//    char sqlStmt[DB_MAX_STATEMENT_LEN];
      wxString sqlStmt;
  
      wxString sqlStmt;
  
-    sqlStmt.sprintf("DROP TABLE %s", tableName);
+    sqlStmt.Printf(wxT("DROP TABLE %s"), tableName.c_str());
  
  
-    pDb->WriteSqlLog(sqlStmt.GetData());
+    pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
  
  #ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.GetData() << endl;
+    cout << endl << sqlStmt.c_str() << endl;
  #endif
  
  #endif
  
-    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
      {
          // Check for "Base table not found" error and ignore
      {
          // Check for "Base table not found" error and ignore
-        pDb->GetNextError(henv, hdbc, hstmt);
-        if (wxStrcmp(pDb->sqlState,"S0002"))  // "Base table not found"
-        {
+        pDb->GetNextError(henv, hdbc, hstmt);   
+        if (wxStrcmp(pDb->sqlState, wxT("S0002")) &&
+            wxStrcmp(pDb->sqlState, wxT("S1000")))  // "Base table not found" 
+        {    
              // Check for product specific error codes
              // Check for product specific error codes
-            if (!((pDb->Dbms() == dbmsSYBASE_ASA && !wxStrcmp(pDb->sqlState,"42000"))   ||  // 5.x (and lower?)
-                  (pDb->Dbms() == dbmsMY_SQL     && !wxStrcmp(pDb->sqlState,"S1000"))   ||  // untested
-                  (pDb->Dbms() == dbmsPOSTGRES   && !wxStrcmp(pDb->sqlState,"08S01"))))     // untested
+            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() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))     
              {
                  pDb->DispNextError();
                  pDb->DispAllErrors(henv, hdbc, hstmt);
              {
                  pDb->DispNextError();
                  pDb->DispAllErrors(henv, hdbc, hstmt);
@@ -1110,30 +1515,86 @@ bool wxTable::DropTable()
          return(FALSE);
  
      return(TRUE);
          return(FALSE);
  
      return(TRUE);
-}  // wxTable::DropTable()
+}  // wxDbTable::DropTable()
  
  
  
  
-/********** wxTable::CreateIndex() **********/
-bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop)
+/********** wxDbTable::CreateIndex() **********/
+bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCols,
+                                                                        wxDbIdxDef *pIdxDefs, bool attemptDrop)
  {
  {
-//    char sqlStmt[DB_MAX_STATEMENT_LEN];
      wxString sqlStmt;
  
      // Drop the index first
      if (attemptDrop && !DropIndex(idxName))
          return (FALSE);
  
      wxString sqlStmt;
  
      // Drop the index first
      if (attemptDrop && !DropIndex(idxName))
          return (FALSE);
  
+    // MySQL (and possibly Sybase ASE?? - gt) require that any columns which are used as portions
+    // of an index have the columns defined as "NOT NULL".  During initial table creation though,
+    // it may not be known which columns are necessarily going to be part of an index (e.g. the
+    // table was created, then months later you determine that an additional index while
+    // give better performance, so you want to add an index).
+    //
+    // The following block of code will modify the column definition to make the column be
+    // defined with the "NOT NULL" qualifier.
+    if (pDb->Dbms() == dbmsMY_SQL)
+    {
+        wxString sqlStmt;
+        int i;
+        bool ok = TRUE;
+        for (i = 0; i < noIdxCols && ok; i++)
+        {
+            int   j = 0;
+            bool  found = FALSE;
+            // Find the column definition that has the ColName that matches the
+            // index column name.  We need to do this to get the DB_DATA_TYPE of
+            // the index column, as MySQL's syntax for the ALTER column requires
+            // this information
+            while (!found && (j < this->noCols))
+            {
+                if (wxStrcmp(colDefs[j].ColName,pIdxDefs[i].ColName) == 0)
+                    found = TRUE;
+                if (!found)
+                    j++;
+            }
+            
+            if (found)
+            {
+                ok = pDb->ModifyColumn(tableName, pIdxDefs[i].ColName,
+                                        colDefs[j].DbDataType, colDefs[j].SzDataObj,
+                                        wxT("NOT NULL"));
+
+                if (!ok)
+                {
+                    wxODBC_ERRORS retcode;
+                    // Oracle returns a DB_ERR_GENERAL_ERROR if the column is already
+                    // defined to be NOT NULL, but reportedly MySQL doesn't mind.
+                    // This line is just here for debug checking of the value
+                    retcode = (wxODBC_ERRORS)pDb->DB_STATUS;
+                }
+            }
+            else
+                ok = FALSE;
+        }
+        if (ok)
+            pDb->CommitTrans();
+        else
+        {
+            pDb->RollbackTrans();
+            return(FALSE);
+        }
+    }
+    
      // Build a CREATE INDEX statement
      // Build a CREATE INDEX statement
-    sqlStmt = "CREATE ";
+    sqlStmt = wxT("CREATE ");
      if (unique)
      if (unique)
-        sqlStmt += "UNIQUE ";
-
-    sqlStmt += "INDEX ";
+        sqlStmt += wxT("UNIQUE ");
+    
+    sqlStmt += wxT("INDEX ");
      sqlStmt += idxName;
      sqlStmt += idxName;
-    sqlStmt += " ON ";
+    sqlStmt += wxT(" ON ");
      sqlStmt += tableName;
      sqlStmt += tableName;
-    sqlStmt += " (";
-
+    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++)
@@ -1143,26 +1604,26 @@ bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, Cidx
          if (pDb->Dbms() != dbmsPOSTGRES)
          {
              if (pIdxDefs[i].Ascending)
          if (pDb->Dbms() != dbmsPOSTGRES)
          {
              if (pIdxDefs[i].Ascending)
-                sqlStmt += " ASC";
+                sqlStmt += wxT(" ASC");
              else
              else
-                sqlStmt += " DESC";
+                sqlStmt += wxT(" DESC");
          }
  
          if ((i + 1) < noIdxCols)
          }
  
          if ((i + 1) < noIdxCols)
-            sqlStmt += ",";
+            sqlStmt += wxT(",");
      }
      
      // Append closing parentheses
      }
      
      // Append closing parentheses
-    sqlStmt += ")";
+    sqlStmt += wxT(")");
  
  
-    pDb->WriteSqlLog(sqlStmt.GetData());
+    pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
  
  #ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.GetData() << endl << endl;
+    cout << endl << sqlStmt.c_str() << endl << endl;
  #endif
  
      // Execute the CREATE INDEX statement
  #endif
  
      // Execute the CREATE INDEX statement
-    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
      {
          pDb->DispAllErrors(henv, hdbc, hstmt);
          pDb->RollbackTrans();
      {
          pDb->DispAllErrors(henv, hdbc, hstmt);
          pDb->RollbackTrans();
@@ -1179,44 +1640,47 @@ bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, Cidx
      // Index Created Successfully
      return(TRUE);
  
      // Index Created Successfully
      return(TRUE);
  
-}  // wxTable::CreateIndex()
+}  // wxDbTable::CreateIndex()
  
  
  
  
-/********** wxTable::DropIndex() **********/
-bool wxTable::DropIndex(const char * idxName)
+/********** wxDbTable::DropIndex() **********/
+bool wxDbTable::DropIndex(const wxString &idxName)
  {
      // NOTE: This function returns TRUE if the Index does not exist, but
      //       only for identified databases.  Code will need to be added
      //          below for any other databases when those databases are defined
      //       to handle this situation consistently
  
  {
      // NOTE: This function returns TRUE if the Index does not exist, but
      //       only for identified databases.  Code will need to be added
      //          below for any other databases when those databases are defined
      //       to handle this situation consistently
  
-//    char sqlStmt[DB_MAX_STATEMENT_LEN];
      wxString sqlStmt;
  
      wxString sqlStmt;
  
-    if (pDb->Dbms() == dbmsACCESS)
-        sqlStmt.sprintf("DROP INDEX %s ON %s",idxName,tableName);
-    else if (pDb->Dbms() == dbmsSYBASE_ASE)
-        sqlStmt.sprintf("DROP INDEX %s.%s",tableName,idxName);
+    if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL)
+        sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),idxName.c_str(), tableName.c_str());
+    else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
+             (pDb->Dbms() == dbmsSYBASE_ASE))
+        sqlStmt.Printf(wxT("DROP INDEX %s.%s"),tableName.c_str(), idxName.c_str());
      else
      else
-        sqlStmt.sprintf("DROP INDEX %s",idxName);
+        sqlStmt.Printf(wxT("DROP INDEX %s"),idxName.c_str());
  
  
-    pDb->WriteSqlLog(sqlStmt.GetData());
+    pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
  
  #ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.GetData() << endl;
+    cout << endl << sqlStmt.c_str() << endl;
  #endif
  
  #endif
  
-    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
      {
          // Check for "Index not found" error and ignore
          pDb->GetNextError(henv, hdbc, hstmt);
      {
          // Check for "Index not found" error and ignore
          pDb->GetNextError(henv, hdbc, hstmt);
-        if (wxStrcmp(pDb->sqlState,"S0012"))  // "Index not found"
+        if (wxStrcmp(pDb->sqlState,wxT("S0012")))  // "Index not found"
          {
              // Check for product specific error codes
          {
              // Check for product specific error codes
-            if (!((pDb->Dbms() == dbmsSYBASE_ASA  && !wxStrcmp(pDb->sqlState,"42000")) ||  // v5.x (and lower?)
-                   (pDb->Dbms() == dbmsSYBASE_ASE && !wxStrcmp(pDb->sqlState,"S0002")) ||  // Base table not found
-                   (pDb->Dbms() == dbmsMY_SQL     && !wxStrcmp(pDb->sqlState,"42S02"))     // untested
-                    ))
+            if (!((pDb->Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(pDb->sqlState,wxT("42000"))) ||  // v5.x (and lower?)
+                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("37000"))) ||
+                  (pDb->Dbms() == dbmsMS_SQL_SERVER && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
+                  (pDb->Dbms() == dbmsSYBASE_ASE    && !wxStrcmp(pDb->sqlState,wxT("S0002"))) ||  // Base table not found
+                  (pDb->Dbms() == dbmsMY_SQL        && !wxStrcmp(pDb->sqlState,wxT("42S12"))) ||  // tested by Christopher Ludwik Marino-Cebulski using v3.23.21beta
+                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))
+               ))
              {
                  pDb->DispNextError();
                  pDb->DispAllErrors(henv, hdbc, hstmt);
              {
                  pDb->DispNextError();
                  pDb->DispAllErrors(henv, hdbc, hstmt);
@@ -1234,14 +1698,50 @@ bool wxTable::DropIndex(const char * idxName)
          return(FALSE);
  
      return(TRUE);
          return(FALSE);
  
      return(TRUE);
-}  // wxTable::DropIndex()
+}  // wxDbTable::DropIndex()
  
  
  
  
-/********** wxTable::Insert() **********/
-int wxTable::Insert(void)
+/********** wxDbTable::SetOrderByColNums() **********/
+bool wxDbTable::SetOrderByColNums(UWORD first, ... )
  {
  {
-    assert(!queryOnly);
-    if (queryOnly)
+    int               colNo = first;  // using 'int' to be able to look for wxDB_NO_MORE_COLUN_NUMBERS
+    va_list     argptr;
+
+    bool        abort = FALSE;
+    wxString    tempStr;
+
+    va_start(argptr, first);     /* Initialize variable arguments. */
+    while (!abort && (colNo != wxDB_NO_MORE_COLUMN_NUMBERS))
+    {
+        // Make sure the passed in column number
+        // is within the valid range of columns
+        //
+        // Valid columns are 0 thru noCols-1
+        if (colNo >= noCols || colNo < 0)
+        {
+            abort = TRUE;
+            continue;
+        }
+
+        if (colNo != first)
+            tempStr += wxT(",");
+
+        tempStr += colDefs[colNo].ColName;
+        colNo = va_arg (argptr, int);
+    }
+    va_end (argptr);              /* Reset variable arguments.      */
+
+    SetOrderByClause(tempStr);
+
+    return (!abort);
+}  // wxDbTable::SetOrderByColNums()
+
+
+/********** wxDbTable::Insert() **********/
+int wxDbTable::Insert(void)
+{
+    wxASSERT(!queryOnly);
+    if (queryOnly || !insertable)
          return(DB_FAILURE);
  
      bindInsertParams();
          return(DB_FAILURE);
  
      bindInsertParams();
@@ -1253,7 +1753,7 @@ int wxTable::Insert(void)
      {
          // Check to see if integrity constraint was violated
          pDb->GetNextError(henv, hdbc, hstmtInsert);
      {
          // Check to see if integrity constraint was violated
          pDb->GetNextError(henv, hdbc, hstmtInsert);
-        if (! wxStrcmp(pDb->sqlState, "23000"))  // Integrity constraint violated
+        if (! wxStrcmp(pDb->sqlState, wxT("23000")))  // Integrity constraint violated
              return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);
          else
          {
              return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);
          else
          {
@@ -1266,37 +1766,37 @@ int wxTable::Insert(void)
      // Record inserted into the datasource successfully
      return(DB_SUCCESS);
  
      // Record inserted into the datasource successfully
      return(DB_SUCCESS);
  
-}  // wxTable::Insert()
+}  // wxDbTable::Insert()
  
  
  
  
-/********** wxTable::Update() **********/
-bool wxTable::Update(void)
+/********** wxDbTable::Update() **********/
+bool wxDbTable::Update(void)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
  
      if (queryOnly)
          return(FALSE);
  
-    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    wxString sqlStmt;
  
      // Build the SQL UPDATE statement
  
      // Build the SQL UPDATE statement
-    GetUpdateStmt(sqlStmt, DB_UPD_KEYFIELDS);
+    BuildUpdateStmt(sqlStmt, DB_UPD_KEYFIELDS);
  
      pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
  
      pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.GetData() << endl << endl;
+    cout << endl << sqlStmt.c_str() << endl << endl;
  #endif
  
      // Execute the SQL UPDATE statement
      return(execUpdate(sqlStmt));
  
  #endif
  
      // Execute the SQL UPDATE statement
      return(execUpdate(sqlStmt));
  
-}  // wxTable::Update()
+}  // wxDbTable::Update()
  
  
  
  
-/********** wxTable::Update(pSqlStmt) **********/
-bool wxTable::Update(const char *pSqlStmt)
+/********** wxDbTable::Update(pSqlStmt) **********/
+bool wxDbTable::Update(const wxString &pSqlStmt)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
  
      if (queryOnly)
          return(FALSE);
  
@@ -1304,390 +1804,212 @@ bool wxTable::Update(const char *pSqlStmt)
  
      return(execUpdate(pSqlStmt));
  
  
      return(execUpdate(pSqlStmt));
  
-}  // wxTable::Update(pSqlStmt)
+}  // wxDbTable::Update(pSqlStmt)
  
  
  
  
-/********** wxTable::UpdateWhere() **********/
-bool wxTable::UpdateWhere(const char *pWhereClause)
+/********** wxDbTable::UpdateWhere() **********/
+bool wxDbTable::UpdateWhere(const wxString &pWhereClause)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
  
      if (queryOnly)
          return(FALSE);
  
-    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    wxString sqlStmt;
  
      // Build the SQL UPDATE statement
  
      // Build the SQL UPDATE statement
-    GetUpdateStmt(sqlStmt, DB_UPD_WHERE, pWhereClause);
+    BuildUpdateStmt(sqlStmt, DB_UPD_WHERE, pWhereClause);
  
      pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
  
      pDb->WriteSqlLog(sqlStmt);
  
  #ifdef DBDEBUG_CONSOLE
-    cout << endl << sqlStmt.GetData() << endl << endl;
+    cout << endl << sqlStmt.c_str() << endl << endl;
  #endif
  
      // Execute the SQL UPDATE statement
      return(execUpdate(sqlStmt));
  
  #endif
  
      // Execute the SQL UPDATE statement
      return(execUpdate(sqlStmt));
  
-}  // wxTable::UpdateWhere()
+}  // wxDbTable::UpdateWhere()
  
  
  
  
-/********** wxTable::Delete() **********/
-bool wxTable::Delete(void)
+/********** wxDbTable::Delete() **********/
+bool wxDbTable::Delete(void)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
  
      if (queryOnly)
          return(FALSE);
  
-    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    wxString sqlStmt;
+    sqlStmt.Empty();
  
      // Build the SQL DELETE statement
  
      // Build the SQL DELETE statement
-    GetDeleteStmt(sqlStmt, DB_DEL_KEYFIELDS);
+    BuildDeleteStmt(sqlStmt, DB_DEL_KEYFIELDS);
  
      pDb->WriteSqlLog(sqlStmt);
  
      // Execute the SQL DELETE statement
      return(execDelete(sqlStmt));
  
  
      pDb->WriteSqlLog(sqlStmt);
  
      // Execute the SQL DELETE statement
      return(execDelete(sqlStmt));
  
-}  // wxTable::Delete()
+}  // wxDbTable::Delete()
  
  
  
  
-/********** wxTable::DeleteWhere() **********/
-bool wxTable::DeleteWhere(const char *pWhereClause)
+/********** wxDbTable::DeleteWhere() **********/
+bool wxDbTable::DeleteWhere(const wxString &pWhereClause)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
  
      if (queryOnly)
          return(FALSE);
  
-    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    wxString sqlStmt;
+    sqlStmt.Empty();
  
      // Build the SQL DELETE statement
  
      // Build the SQL DELETE statement
-    GetDeleteStmt(sqlStmt, DB_DEL_WHERE, pWhereClause);
+    BuildDeleteStmt(sqlStmt, DB_DEL_WHERE, pWhereClause);
  
      pDb->WriteSqlLog(sqlStmt);
  
      // Execute the SQL DELETE statement
      return(execDelete(sqlStmt));
  
  
      pDb->WriteSqlLog(sqlStmt);
  
      // Execute the SQL DELETE statement
      return(execDelete(sqlStmt));
  
-}  // wxTable::DeleteWhere()
+}  // wxDbTable::DeleteWhere()
  
  
  
  
-/********** wxTable::DeleteMatching() **********/
-bool wxTable::DeleteMatching(void)
+/********** wxDbTable::DeleteMatching() **********/
+bool wxDbTable::DeleteMatching(void)
  {
  {
-    assert(!queryOnly);
+    wxASSERT(!queryOnly);
      if (queryOnly)
          return(FALSE);
  
      if (queryOnly)
          return(FALSE);
  
-    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    wxString sqlStmt;
+    sqlStmt.Empty();
  
      // Build the SQL DELETE statement
  
      // Build the SQL DELETE statement
-    GetDeleteStmt(sqlStmt, DB_DEL_MATCHING);
+    BuildDeleteStmt(sqlStmt, DB_DEL_MATCHING);
  
      pDb->WriteSqlLog(sqlStmt);
  
      // Execute the SQL DELETE statement
      return(execDelete(sqlStmt));
  
  
      pDb->WriteSqlLog(sqlStmt);
  
      // Execute the SQL DELETE statement
      return(execDelete(sqlStmt));
  
-}  // wxTable::DeleteMatching()
-
-
-/********** wxTable::GetUpdateStmt() **********/
-void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause)
-{
-    assert(!queryOnly);
-    if (queryOnly)
-        return;
-
-    char whereClause[DB_MAX_WHERE_CLAUSE_LEN];
-    bool firstColumn = TRUE;
-
-    whereClause[0] = 0;
-    sprintf(pSqlStmt, "UPDATE %s SET ", tableName);
-
-    // Append a list of columns to be updated
-    int i;
-    for (i = 0; i < noCols; i++)
-    {
-        // Only append Updateable columns
-        if (colDefs[i].Updateable)
-        {
-            if (! firstColumn)
-                wxStrcat(pSqlStmt, ",");
-            else
-                firstColumn = FALSE;
-            wxStrcat(pSqlStmt, colDefs[i].ColName);
-            wxStrcat(pSqlStmt, " = ?");
-        }
-    }
-
-    // Append the WHERE clause to the SQL UPDATE statement
-    wxStrcat(pSqlStmt, " WHERE ");
-    switch(typeOfUpd)
-    {
-    case DB_UPD_KEYFIELDS:
-        // If the datasource supports the ROWID column, build
-        // the where on ROWID for efficiency purposes.
-        // e.g. UPDATE PARTS SET Col1 = ?, Col2 = ? WHERE ROWID = '111.222.333'
-        if (CanUpdByROWID())
-        {
-            SDWORD cb;
-            char   rowid[ROWID_LEN];
-
-            // Get the ROWID value.  If not successful retreiving the ROWID,
-            // simply fall down through the code and build the WHERE clause
-            // based on the key fields.
-            if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, (UCHAR*) rowid, ROWID_LEN, &cb) == SQL_SUCCESS)
-            {
-                wxStrcat(pSqlStmt, "ROWID = '");
-                wxStrcat(pSqlStmt, rowid);
-                wxStrcat(pSqlStmt, "'");
-                break;
-            }
-        }
-        // Unable to delete by ROWID, so build a WHERE
-        // clause based on the keyfields.
-        GetWhereClause(whereClause, DB_WHERE_KEYFIELDS);
-        wxStrcat(pSqlStmt, whereClause);
-        break;
-    case DB_UPD_WHERE:
-        wxStrcat(pSqlStmt, pWhereClause);
-        break;
-    }
-}  // GetUpdateStmt()
+}  // wxDbTable::DeleteMatching()
  
  
  
  
-/********** wxTable::GetDeleteStmt() **********/
-void wxTable::GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause)
+/********** wxDbTable::IsColNull() **********/
+bool wxDbTable::IsColNull(UWORD colNo)
  {
  {
-    assert(!queryOnly);
-    if (queryOnly)
-        return;
-
-    char whereClause[DB_MAX_WHERE_CLAUSE_LEN];
-
-    whereClause[0] = 0;
-
-    // Handle the case of DeleteWhere() and the where clause is blank.  It should
-    // delete all records from the database in this case.
-    if (typeOfDel == DB_DEL_WHERE && (pWhereClause == 0 || wxStrlen(pWhereClause) == 0))
-    {
-        sprintf(pSqlStmt, "DELETE FROM %s", tableName);
-        return;
-    }
-
-    sprintf(pSqlStmt, "DELETE FROM %s WHERE ", tableName);
-
-    // Append the WHERE clause to the SQL DELETE statement
-    switch(typeOfDel)
-    {
-    case DB_DEL_KEYFIELDS:
-        // If the datasource supports the ROWID column, build
-        // the where on ROWID for efficiency purposes.
-        // e.g. DELETE FROM PARTS WHERE ROWID = '111.222.333'
-        if (CanUpdByROWID())
-        {
-            SDWORD cb;
-            char   rowid[ROWID_LEN];
-
-            // Get the ROWID value.  If not successful retreiving the ROWID,
-            // simply fall down through the code and build the WHERE clause
-            // based on the key fields.
-            if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, (UCHAR*) rowid, ROWID_LEN, &cb) == SQL_SUCCESS)
-            {
-                wxStrcat(pSqlStmt, "ROWID = '");
-                wxStrcat(pSqlStmt, rowid);
-                wxStrcat(pSqlStmt, "'");
-                break;
-            }
-        }
-        // Unable to delete by ROWID, so build a WHERE
-        // clause based on the keyfields.
-        GetWhereClause(whereClause, DB_WHERE_KEYFIELDS);
-        wxStrcat(pSqlStmt, whereClause);
-        break;
-    case DB_DEL_WHERE:
-        wxStrcat(pSqlStmt, pWhereClause);
-        break;
-    case DB_DEL_MATCHING:
-        GetWhereClause(whereClause, DB_WHERE_MATCHING);
-        wxStrcat(pSqlStmt, whereClause);
-        break;
-    }
-
-}  // GetDeleteStmt()
-
-
-/********** wxTable::GetWhereClause() **********/
-void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName)
  /*
  /*
- * Note: GetWhereClause() currently ignores timestamp columns.
- *       They are not included as part of the where clause.
- */
-{
-    bool moreThanOneColumn = FALSE;
-    char colValue[255];
-
-    // Loop through the columns building a where clause as you go
-    int i;
-    for (i = 0; i < noCols; i++)
-    {
-        // Determine if this column should be included in the WHERE clause
-        if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[i].KeyField) ||
-             (typeOfWhere == DB_WHERE_MATCHING  && (! IsColNull(i))))
-        {
-            // Skip over timestamp columns
-            if (colDefs[i].SqlCtype == SQL_C_TIMESTAMP)
-                continue;
-            // If there is more than 1 column, join them with the keyword "AND"
-            if (moreThanOneColumn)
-                wxStrcat(pWhereClause, " AND ");
-            else
-                moreThanOneColumn = TRUE;
-            // Concatenate where phrase for the column
-            if (qualTableName && wxStrlen(qualTableName))
-            {
-                wxStrcat(pWhereClause, qualTableName);
-                wxStrcat(pWhereClause, ".");
-            }
-            wxStrcat(pWhereClause, colDefs[i].ColName);
-            wxStrcat(pWhereClause, " = ");
-            switch(colDefs[i].SqlCtype)
-            {
-            case SQL_C_CHAR:
-                sprintf(colValue, "'%s'", (UCHAR FAR *) colDefs[i].PtrDataObj);
-                break;
-            case SQL_C_SSHORT:
-                sprintf(colValue, "%hi", *((SWORD *) colDefs[i].PtrDataObj));
-                break;
-            case SQL_C_USHORT:
-                sprintf(colValue, "%hu", *((UWORD *) colDefs[i].PtrDataObj));
-                break;
-            case SQL_C_SLONG:
-                sprintf(colValue, "%li", *((SDWORD *) colDefs[i].PtrDataObj));
-                break;
-            case SQL_C_ULONG:
-                sprintf(colValue, "%lu", *((UDWORD *) colDefs[i].PtrDataObj));
-                break;
-            case SQL_C_FLOAT:
-                sprintf(colValue, "%.6f", *((SFLOAT *) colDefs[i].PtrDataObj));
-                break;
-            case SQL_C_DOUBLE:
-                sprintf(colValue, "%.6f", *((SDOUBLE *) colDefs[i].PtrDataObj));
-                break;
-            }
-            wxStrcat(pWhereClause, colValue);
-        }
-    }
-}  // wxTable::GetWhereClause()
-
+    This logic is just not right.  It would indicate TRUE
+    if a numeric field were set to a value of 0.
  
  
-/********** wxTable::IsColNull() **********/
-bool wxTable::IsColNull(int colNo)
-{
      switch(colDefs[colNo].SqlCtype)
      {
      switch(colDefs[colNo].SqlCtype)
      {
-    case SQL_C_CHAR:
-        return(((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0] == 0);
-    case SQL_C_SSHORT:
-        return((  *((SWORD *) colDefs[colNo].PtrDataObj))   == 0);
-    case SQL_C_USHORT:
-        return((   *((UWORD*) colDefs[colNo].PtrDataObj))   == 0);
-    case SQL_C_SLONG:
-        return(( *((SDWORD *) colDefs[colNo].PtrDataObj))   == 0);
-    case SQL_C_ULONG:
-        return(( *((UDWORD *) colDefs[colNo].PtrDataObj))   == 0);
-    case SQL_C_FLOAT:
-        return(( *((SFLOAT *) colDefs[colNo].PtrDataObj))   == 0);
-    case SQL_C_DOUBLE:
-        return((*((SDOUBLE *) colDefs[colNo].PtrDataObj))   == 0);
-    case SQL_C_TIMESTAMP:
-        TIMESTAMP_STRUCT *pDt;
-        pDt = (TIMESTAMP_STRUCT *) colDefs[colNo].PtrDataObj;
-        if (pDt->year == 0 && pDt->month == 0 && pDt->day == 0)
+        case SQL_C_CHAR:
+            return(((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0] == 0);
+        case SQL_C_SSHORT:
+            return((  *((SWORD *) colDefs[colNo].PtrDataObj))   == 0);
+        case SQL_C_USHORT:
+            return((   *((UWORD*) colDefs[colNo].PtrDataObj))   == 0);
+        case SQL_C_SLONG:
+            return(( *((SDWORD *) colDefs[colNo].PtrDataObj))   == 0);
+        case SQL_C_ULONG:
+            return(( *((UDWORD *) colDefs[colNo].PtrDataObj))   == 0);
+        case SQL_C_FLOAT:
+            return(( *((SFLOAT *) colDefs[colNo].PtrDataObj))   == 0);
+        case SQL_C_DOUBLE:
+            return((*((SDOUBLE *) colDefs[colNo].PtrDataObj))   == 0);
+        case SQL_C_TIMESTAMP:
+            TIMESTAMP_STRUCT *pDt;
+            pDt = (TIMESTAMP_STRUCT *) colDefs[colNo].PtrDataObj;
+            if (pDt->year == 0 && pDt->month == 0 && pDt->day == 0)
+                return(TRUE);
+            else
+                return(FALSE);
+        default:
              return(TRUE);
              return(TRUE);
-        else
-            return(FALSE);
-    default:
-        return(TRUE);
      }
      }
-}  // wxTable::IsColNull()
+*/
+    return (colDefs[colNo].Null);
+}  // wxDbTable::IsColNull()
  
  
  
  
-/********** wxTable::CanSelectForUpdate() **********/
-bool wxTable::CanSelectForUpdate(void)
+/********** wxDbTable::CanSelectForUpdate() **********/
+bool wxDbTable::CanSelectForUpdate(void)
  {
  {
+    if (queryOnly)
+        return FALSE;
+
      if (pDb->Dbms() == dbmsMY_SQL)
          return FALSE;
  
      if (pDb->Dbms() == dbmsMY_SQL)
          return FALSE;
  
-    if (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE)
+    if ((pDb->Dbms() == dbmsORACLE) ||
+        (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE))
          return(TRUE);
      else
          return(FALSE);
  
          return(TRUE);
      else
          return(FALSE);
  
-}  // wxTable::CanSelectForUpdate()
+}  // wxDbTable::CanSelectForUpdate()
  
  
  
  
-/********** wxTable::CanUpdByROWID() **********/
-bool wxTable::CanUpdByROWID(void)
+/********** wxDbTable::CanUpdByROWID() **********/
+bool wxDbTable::CanUpdByROWID(void)
  {
  /*
   * NOTE: Returning FALSE for now until this can be debugged,
   *        as the ROWID is not getting updated correctly
   */
      return FALSE;
  {
  /*
   * NOTE: Returning FALSE for now until this can be debugged,
   *        as the ROWID is not getting updated correctly
   */
      return FALSE;
-
+/*
      if (pDb->Dbms() == dbmsORACLE)
          return(TRUE);
      else
          return(FALSE);
      if (pDb->Dbms() == dbmsORACLE)
          return(TRUE);
      else
          return(FALSE);
-
-}  // wxTable::CanUpdByROWID()
+*/
+}  // wxDbTable::CanUpdByROWID()
  
  
  
  
-/********** wxTable::IsCursorClosedOnCommit() **********/
-bool wxTable::IsCursorClosedOnCommit(void)
+/********** wxDbTable::IsCursorClosedOnCommit() **********/
+bool wxDbTable::IsCursorClosedOnCommit(void)
  {
      if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)
          return(FALSE);
      else
          return(TRUE);
  
  {
      if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)
          return(FALSE);
      else
          return(TRUE);
  
-}  // wxTable::IsCursorClosedOnCommit()
+}  // wxDbTable::IsCursorClosedOnCommit()
+
  
  
  
  
-/********** wxTable::ClearMemberVars() **********/
-void wxTable::ClearMemberVars(void)
+/********** wxDbTable::ClearMemberVar() **********/
+void wxDbTable::ClearMemberVar(UWORD colNo, bool setToNull)
  {
  {
-    // Loop through the columns setting each member variable to zero
-    int i;
-    for (i = 0; i < noCols; i++)
+    wxASSERT(colNo < noCols);
+
+    switch(colDefs[colNo].SqlCtype)
      {
      {
-        switch(colDefs[i].SqlCtype)
-        {
          case SQL_C_CHAR:
          case SQL_C_CHAR:
-            ((UCHAR FAR *) colDefs[i].PtrDataObj)[0]    = 0;
+            ((UCHAR FAR *) colDefs[colNo].PtrDataObj)[0]    = 0;
              break;
          case SQL_C_SSHORT:
              break;
          case SQL_C_SSHORT:
-            *((SWORD *) colDefs[i].PtrDataObj)          = 0;
+            *((SWORD *) colDefs[colNo].PtrDataObj)          = 0;
              break;
          case SQL_C_USHORT:
              break;
          case SQL_C_USHORT:
-            *((UWORD*) colDefs[i].PtrDataObj)           = 0;
+            *((UWORD*) colDefs[colNo].PtrDataObj)           = 0;
              break;
          case SQL_C_SLONG:
              break;
          case SQL_C_SLONG:
-            *((SDWORD *) colDefs[i].PtrDataObj)         = 0;
+            *((SDWORD *) colDefs[colNo].PtrDataObj)         = 0;
              break;
          case SQL_C_ULONG:
              break;
          case SQL_C_ULONG:
-            *((UDWORD *) colDefs[i].PtrDataObj)         = 0;
+            *((UDWORD *) colDefs[colNo].PtrDataObj)         = 0;
              break;
          case SQL_C_FLOAT:
              break;
          case SQL_C_FLOAT:
-            *((SFLOAT *) colDefs[i].PtrDataObj)         = 0.0f;
+            *((SFLOAT *) colDefs[colNo].PtrDataObj)         = 0.0f;
              break;
          case SQL_C_DOUBLE:
              break;
          case SQL_C_DOUBLE:
-            *((SDOUBLE *) colDefs[i].PtrDataObj)        = 0.0f;
+            *((SDOUBLE *) colDefs[colNo].PtrDataObj)        = 0.0f;
              break;
          case SQL_C_TIMESTAMP:
              TIMESTAMP_STRUCT *pDt;
              break;
          case SQL_C_TIMESTAMP:
              TIMESTAMP_STRUCT *pDt;
-            pDt = (TIMESTAMP_STRUCT *) colDefs[i].PtrDataObj;
+            pDt = (TIMESTAMP_STRUCT *) colDefs[colNo].PtrDataObj;
              pDt->year = 0;
              pDt->month = 0;
              pDt->day = 0;
              pDt->year = 0;
              pDt->month = 0;
              pDt->day = 0;
@@ -1696,14 +2018,27 @@ void wxTable::ClearMemberVars(void)
              pDt->second = 0;
              pDt->fraction = 0;
              break;
              pDt->second = 0;
              pDt->fraction = 0;
              break;
-        }
      }
  
      }
  
-}  // wxTable::ClearMemberVars()
+    if (setToNull)
+        SetColNull(colNo);
+}  // wxDbTable::ClearMemberVar()
+
  
  
+/********** wxDbTable::ClearMemberVars() **********/
+void wxDbTable::ClearMemberVars(bool setToNull)
+{
+    int i;
+
+    // Loop through the columns setting each member variable to zero
+    for (i=0; i < noCols; i++)
+        ClearMemberVar(i,setToNull);
  
  
-/********** wxTable::SetQueryTimeout() **********/
-bool wxTable::SetQueryTimeout(UDWORD nSeconds)
+}  // wxDbTable::ClearMemberVars()
+
+
+/********** wxDbTable::SetQueryTimeout() **********/
+bool wxDbTable::SetQueryTimeout(UDWORD nSeconds)
  {
      if (SQLSetStmtOption(hstmtInsert, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS)
          return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
  {
      if (SQLSetStmtOption(hstmtInsert, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS)
          return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
@@ -1717,18 +2052,18 @@ bool wxTable::SetQueryTimeout(UDWORD nSeconds)
      // Completed Successfully
      return(TRUE);
  
      // Completed Successfully
      return(TRUE);
  
-}  // wxTable::SetQueryTimeout()
+}  // wxDbTable::SetQueryTimeout()
  
  
  
  
-/********** wxTable::SetColDefs() **********/
-void wxTable::SetColDefs (int index, const char *fieldName, int dataType, void *pData,
-                                 int cType, int size, bool keyField, bool upd,
-                                 bool insAllow, bool derivedCol)
+/********** wxDbTable::SetColDefs() **********/
+void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType, void *pData,
+                           SWORD cType, int size, bool keyField, bool upd,
+                           bool insAllow, bool derivedCol)
  {
      if (!colDefs)  // May happen if the database connection fails
          return;
  
  {
      if (!colDefs)  // May happen if the database connection fails
          return;
  
-    if (wxStrlen(fieldName) > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
+    if (fieldName.Length() > (unsigned int) DB_MAX_COLUMN_NAME_LEN)
      {
          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;
@@ -1756,57 +2091,32 @@ void wxTable::SetColDefs (int index, const char *fieldName, int dataType, void *
  
      colDefs[index].Null                 = FALSE;
      
  
      colDefs[index].Null                 = FALSE;
      
-}  // wxTable::SetColDefs()
+}  // wxDbTable::SetColDefs()
  
  
  
  
-/********** 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)
+/********** wxDbTable::SetColDefs() **********/
+wxDbColDataPtr* wxDbTable::SetColDefs(wxDbColInf *pColInfs, UWORD numCols)
  {
  {
-    assert(pColInfs);
-    wxColDataPtr *pColDataPtrs = NULL;
+    wxASSERT(pColInfs);
+    wxDbColDataPtr *pColDataPtrs = NULL;
  
      if (pColInfs)
      {
  
      if (pColInfs)
      {
-        ULONG index;
-
+        UWORD index;
         
         
-        pColDataPtrs = new wxColDataPtr[numCols+1];
+        pColDataPtrs = new wxDbColDataPtr[numCols+1];
  
          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
              switch (pColInfs[index].dbDataType)
              {
                  case DB_DATA_TYPE_VARCHAR:
              // Process the fields
              switch (pColInfs[index].dbDataType)
              {
                  case DB_DATA_TYPE_VARCHAR:
-                {
-                    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 wxChar[pColInfs[index].bufferLength+1];
+                   pColDataPtrs[index].SzDataObj  = pColInfs[index].columnSize;
+                   pColDataPtrs[index].SqlCtype   = SQL_C_CHAR;
+                   break;
                  case DB_DATA_TYPE_INTEGER:
                  case DB_DATA_TYPE_INTEGER:
-                {
                      // Can be long or short
                      if (pColInfs[index].bufferLength == sizeof(long))
                      {
                      // Can be long or short
                      if (pColInfs[index].bufferLength == sizeof(long))
                      {
@@ -1821,9 +2131,7 @@ wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
                          pColDataPtrs[index].SqlCtype   = SQL_C_SSHORT;
                      }
                      break;
                          pColDataPtrs[index].SqlCtype   = SQL_C_SSHORT;
                      }
                      break;
-                }
                  case DB_DATA_TYPE_FLOAT:
                  case DB_DATA_TYPE_FLOAT:
-                {
                      // Can be float or double
                      if (pColInfs[index].bufferLength == sizeof(float))
                      {
                      // Can be float or double
                      if (pColInfs[index].bufferLength == sizeof(float))
                      {
@@ -1838,71 +2146,93 @@ wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
                          pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
                      }  
                      break;
                          pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
                      }  
                      break;
-                }
                  case DB_DATA_TYPE_DATE:
                  case DB_DATA_TYPE_DATE:
-                {
                      pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;
                      pColDataPtrs[index].SzDataObj  = sizeof(TIMESTAMP_STRUCT);
                      pColDataPtrs[index].SqlCtype   = SQL_C_TIMESTAMP;
                      break;
                      pColDataPtrs[index].PtrDataObj = new TIMESTAMP_STRUCT;
                      pColDataPtrs[index].SzDataObj  = sizeof(TIMESTAMP_STRUCT);
                      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"));
+                    pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
+                    pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
+                    pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;
+                    break;
+            }
+            if (pColDataPtrs[index].PtrDataObj != NULL)
+                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 
+                // 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
+                // to know the maximum size to create the PtrDataObj to be.
+                delete [] pColDataPtrs;
+                return NULL;
              }
              }
-
-         SetColDefs (index,pColInfs[index].colName,pColInfs[index].dbDataType, pColDataPtrs[index].PtrDataObj, pColDataPtrs[index].SqlCtype, pColDataPtrs[index].SzDataObj);
          }
      }
          }
      }
+
      return (pColDataPtrs);
      return (pColDataPtrs);
-} // wxTable::SetColDef()
  
  
+} // wxDbTable::SetColDefs()
  
  
-/********** wxTable::SetCursor() **********/
-void wxTable::SetCursor(HSTMT *hstmtActivate)
+
+/********** wxDbTable::SetCursor() **********/
+void wxDbTable::SetCursor(HSTMT *hstmtActivate)
  {
  {
-    if (hstmtActivate == DEFAULT_CURSOR)
+    if (hstmtActivate == wxDB_DEFAULT_CURSOR)
          hstmt = *hstmtDefault;
      else
          hstmt = *hstmtActivate;
  
          hstmt = *hstmtDefault;
      else
          hstmt = *hstmtActivate;
  
-}  // wxTable::SetCursor()
+}  // wxDbTable::SetCursor()
  
  
  
  
-/********** wxTable::Count(const char *) **********/
-ULONG wxTable::Count(const char *args)
+/********** wxDbTable::Count(const wxString &) **********/
+ULONG wxDbTable::Count(const wxString &args)
  {
  {
-    ULONG l;
-//    char sqlStmt[DB_MAX_STATEMENT_LEN];
+    ULONG count;
      wxString sqlStmt;
      SDWORD cb;
  
      // Build a "SELECT COUNT(*) FROM queryTableName [WHERE whereClause]" SQL Statement
      wxString sqlStmt;
      SDWORD cb;
  
      // Build a "SELECT COUNT(*) FROM queryTableName [WHERE whereClause]" SQL Statement
-    sqlStmt  = "SELECT COUNT(";
+    sqlStmt  = wxT("SELECT COUNT(");
      sqlStmt += args;
      sqlStmt += args;
-    sqlStmt += ") FROM ";
+    sqlStmt += wxT(") FROM ");
      sqlStmt += queryTableName;
      sqlStmt += queryTableName;
-
+#if wxODBC_BACKWARD_COMPATABILITY
      if (from && wxStrlen(from))
      if (from && wxStrlen(from))
+#else
+    if (from.Length())
+#endif
          sqlStmt += from;
  
      // Add the where clause if one is provided
          sqlStmt += from;
  
      // Add the where clause if one is provided
+#if wxODBC_BACKWARD_COMPATABILITY
      if (where && wxStrlen(where))
      if (where && wxStrlen(where))
+#else
+    if (where.Length())
+#endif
      {
      {
-        sqlStmt += " WHERE ";
+        sqlStmt += wxT(" WHERE ");
          sqlStmt += where;
      }
  
          sqlStmt += where;
      }
  
-    pDb->WriteSqlLog(sqlStmt.GetData());
+    pDb->WriteSqlLog(sqlStmt);
  
      // Initialize the Count cursor if it's not already initialized
      if (!hstmtCount)
      {
  
      // Initialize the Count cursor if it's not already initialized
      if (!hstmtCount)
      {
-        hstmtCount = NewCursor(FALSE,FALSE);
-        assert(hstmtCount);
+        hstmtCount = GetNewCursor(FALSE,FALSE);
+        wxASSERT(hstmtCount);
          if (!hstmtCount)
              return(0);
      }
  
      // Execute the SQL statement
          if (!hstmtCount)
              return(0);
      }
  
      // Execute the SQL statement
-    if (SQLExecDirect(*hstmtCount, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(*hstmtCount, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
      {
          pDb->DispAllErrors(henv, hdbc, *hstmtCount);
          return(0);
      {
          pDb->DispAllErrors(henv, hdbc, *hstmtCount);
          return(0);
@@ -1916,7 +2246,7 @@ ULONG wxTable::Count(const char *args)
      }
  
      // Obtain the result
      }
  
      // Obtain the result
-    if (SQLGetData(*hstmtCount, 1, SQL_C_ULONG, &l, sizeof(l), &cb) != SQL_SUCCESS)
+    if (SQLGetData(*hstmtCount, (UWORD)1, SQL_C_ULONG, &count, sizeof(count), &cb) != SQL_SUCCESS)
      {
          pDb->DispAllErrors(henv, hdbc, *hstmtCount);
          return(0);
      {
          pDb->DispAllErrors(henv, hdbc, *hstmtCount);
          return(0);
@@ -1927,52 +2257,56 @@ ULONG wxTable::Count(const char *args)
          pDb->DispAllErrors(henv, hdbc, *hstmtCount);
  
      // Return the record count
          pDb->DispAllErrors(henv, hdbc, *hstmtCount);
  
      // Return the record count
-    return(l);
+    return(count);
  
  
-}  // wxTable::Count()
+}  // wxDbTable::Count()
  
  
  
  
-/********** wxTable::Refresh() **********/
-bool wxTable::Refresh(void)
+/********** wxDbTable::Refresh() **********/
+bool wxDbTable::Refresh(void)
  {
      bool result = TRUE;
  
      // Switch to the internal cursor so any active cursors are not corrupted
      HSTMT currCursor = GetCursor();
      hstmt = hstmtInternal;
  {
      bool result = TRUE;
  
      // Switch to the internal cursor so any active cursors are not corrupted
      HSTMT currCursor = GetCursor();
      hstmt = hstmtInternal;
-
+#if wxODBC_BACKWARD_COMPATABILITY
      // Save the where and order by clauses
      char *saveWhere = where;
      char *saveOrderBy = orderBy;
      // Save the where and order by clauses
      char *saveWhere = where;
      char *saveOrderBy = orderBy;
-
+#else
+    wxString saveWhere = where;
+    wxString saveOrderBy = orderBy;
+#endif
      // Build a where clause to refetch the record with.  Try and use the
      // ROWID if it's available, ow use the key fields.
      // Build a where clause to refetch the record with.  Try and use the
      // ROWID if it's available, ow use the key fields.
-    char whereClause[DB_MAX_WHERE_CLAUSE_LEN+1];
-    wxStrcpy(whereClause, "");
+    wxString whereClause;
+    whereClause.Empty();
+
      if (CanUpdByROWID())
      {
          SDWORD cb;
      if (CanUpdByROWID())
      {
          SDWORD cb;
-        char   rowid[ROWID_LEN+1];
+        wxChar   rowid[wxDB_ROWID_LEN+1];
  
          // Get the ROWID value.  If not successful retreiving the ROWID,
          // simply fall down through the code and build the WHERE clause
          // based on the key fields.
  
          // Get the ROWID value.  If not successful retreiving the ROWID,
          // simply fall down through the code and build the WHERE clause
          // based on the key fields.
-        if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, (UCHAR*) rowid, ROWID_LEN, &cb) == SQL_SUCCESS)
+        if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
          {
          {
-            wxStrcat(whereClause, queryTableName);
-            wxStrcat(whereClause, ".ROWID = '");
-            wxStrcat(whereClause, rowid);
-            wxStrcat(whereClause, "'");
+            whereClause += queryTableName;
+            whereClause += wxT(".ROWID = '");
+            whereClause += rowid;
+            whereClause += wxT("'");
          }
      }
  
      // If unable to use the ROWID, build a where clause from the keyfields
      if (wxStrlen(whereClause) == 0)
          }
      }
  
      // If unable to use the ROWID, build a where clause from the keyfields
      if (wxStrlen(whereClause) == 0)
-        GetWhereClause(whereClause, DB_WHERE_KEYFIELDS, queryTableName);
+        BuildWhereClause(whereClause, DB_WHERE_KEYFIELDS, queryTableName);
  
      // Requery the record
      where = whereClause;
  
      // Requery the record
      where = whereClause;
-    orderBy = 0;
+    orderBy.Empty();
      if (!Query())
          result = FALSE;
  
      if (!Query())
          result = FALSE;
  
@@ -1992,22 +2326,27 @@ bool wxTable::Refresh(void)
  
      return(result);
  
  
      return(result);
  
-}  // wxTable::Refresh()
+}  // wxDbTable::Refresh()
  
  
  
  
-/********** wxTable::SetNull(int colNo) **********/
-bool wxTable::SetNull(int colNo)
+/********** wxDbTable::SetColNull() **********/
+bool wxDbTable::SetColNull(UWORD colNo, bool set)
  {
      if (colNo < noCols)
  {
      if (colNo < noCols)
-        return(colDefs[colNo].Null = TRUE);
+    {
+        colDefs[colNo].Null = set;
+        if (set)  // Blank out the values in the member variable
+            ClearMemberVar(colNo,FALSE);  // Must call with FALSE, or infinite recursion will happen
+        return(TRUE);
+    }
      else
          return(FALSE);
  
      else
          return(FALSE);
  
-}  // wxTable::SetNull(int colNo)
+}  // wxDbTable::SetColNull()
  
  
  
  
-/********** wxTable::SetNull(char *colName) **********/
-bool wxTable::SetNull(const char *colName)
+/********** wxDbTable::SetColNull() **********/
+bool wxDbTable::SetColNull(const wxString &colName, bool set)
  {
      int i;
      for (i = 0; i < noCols; i++)
  {
      int i;
      for (i = 0; i < noCols; i++)
@@ -2017,18 +2356,23 @@ bool wxTable::SetNull(const char *colName)
      }
  
      if (i < noCols)
      }
  
      if (i < noCols)
-        return(colDefs[i].Null = TRUE);
+    {
+        colDefs[i].Null = set;
+        if (set)  // Blank out the values in the member variable
+            ClearMemberVar(i,FALSE);  // Must call with FALSE, or infinite recursion will happen
+        return(TRUE);
+    }
      else
          return(FALSE);
  
      else
          return(FALSE);
  
-}  // wxTable::SetNull(char *colName)
+}  // wxDbTable::SetColNull()
  
  
  
  
-/********** wxTable::NewCursor() **********/
-HSTMT *wxTable::NewCursor(bool setCursor, bool bindColumns)
+/********** wxDbTable::GetNewCursor() **********/
+HSTMT *wxDbTable::GetNewCursor(bool setCursor, bool bindColumns)
  {
      HSTMT *newHSTMT = new HSTMT;
  {
      HSTMT *newHSTMT = new HSTMT;
-    assert(newHSTMT);
+    wxASSERT(newHSTMT);
      if (!newHSTMT)
          return(0);
  
      if (!newHSTMT)
          return(0);
  
@@ -2060,17 +2404,22 @@ HSTMT *wxTable::NewCursor(bool setCursor, bool bindColumns)
  
      return(newHSTMT);
  
  
      return(newHSTMT);
  
-}   // wxTable::NewCursor()
+}   // wxDbTable::GetNewCursor()
  
  
  
  
-/********** wxTable::DeleteCursor() **********/
-bool wxTable::DeleteCursor(HSTMT *hstmtDel)
+/********** wxDbTable::DeleteCursor() **********/
+bool wxDbTable::DeleteCursor(HSTMT *hstmtDel)
  {
      bool result = TRUE;
  
      if (!hstmtDel)  // Cursor already deleted
          return(result);
  
  {
      bool result = TRUE;
  
      if (!hstmtDel)  // Cursor already deleted
          return(result);
  
+/*
+ODBC 3.0 says to use this form
+    if (SQLFreeHandle(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
+    
+*/
      if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
      {
          pDb->DispAllErrors(henv, hdbc);
      if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS)
      {
          pDb->DispAllErrors(henv, hdbc);
@@ -2081,7 +2430,7 @@ bool wxTable::DeleteCursor(HSTMT *hstmtDel)
  
      return(result);
  
  
      return(result);
  
-}  // wxTable::DeleteCursor()
+}  // wxDbTable::DeleteCursor()
  
  #endif  // wxUSE_ODBC
  
  
  #endif  // wxUSE_ODBC