wxAUI: Made fixed size floating panes work

[wxWidgets.git] / src / common / dbtable.cpp

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 1cef8491313b97a451a194af2e3eb2c591939b32..7824b7282065e3ed163c80f6e92329a5cdaf0d65 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -1,87 +1,48 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        dbtable.cpp
-// Purpose:     Implementation of the wxTable class.
+// Name:        src/common/dbtable.cpp
+// 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.

-// Licence:     wxWindows licence, plus:
-// Notice:      This class library and its intellectual design are free of charge for use,
-//              modification, enhancement, debugging under the following conditions:
-//              1) These classes may only be used as part of the implementation of a
-//                 wxWindows-based application
-//              2) All enhancements and bug fixes are to be submitted back to the wxWindows
-//                 user groups free of all charges for use with the wxWindows library.
-//              3) These classes may not be distributed as part of any other class library,
-//                 DLL, text (written or electronic), other than a complete distribution of
-//                 the wxWindows GUI development toolkit.
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////////
 

-/*
-// SYNOPSIS START
-// SYNOPSIS STOP
-*/
-
-// 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"
 

-#if wxMAJOR_VERSION == 2
-#   ifdef __GNUG__
-#   pragma implementation "dbtable.h"
-#   endif
+#ifdef __BORLANDC__
+    #pragma hdrstop

 #endif
 
 #endif
 

-#ifdef DBDEBUG_CONSOLE
-    #include <iostream.h>
-#endif
+#if wxUSE_ODBC

 
 

-#ifdef    __BORLANDC__
-    #pragma hdrstop
-#endif  //__BORLANDC__
-
-#if wxMAJOR_VERSION == 2
-    #ifndef WX_PRECOMP
-        #include "wx/string.h"
-        #include "wx/object.h"
-        #include "wx/list.h"
-        #include "wx/utils.h"
-        #include "wx/msgdlg.h"
-    #endif
-    #include "wx/filefn.h"
+#ifndef WX_PRECOMP
+    #include "wx/object.h"
+    #include "wx/list.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/log.h"

 #endif
 
 #endif
 

-#if wxMAJOR_VERSION == 1
-#   if defined(wx_msw) || defined(wx_x)
-#       ifdef WX_PRECOMP
-#           include "wx_prec.h"
-#       else
-#           include "wx.h"
-#       endif
-#   endif
-#   define wxUSE_ODBC 1
+#ifdef DBDEBUG_CONSOLE
+#if wxUSE_IOSTREAMH
+    #include <iostream.h>
+#else
+    #include <iostream>
+#endif
+    #include "wx/ioswrap.h"

 #endif
 
 #endif
 

-#if wxUSE_ODBC
+#include "wx/filefn.h"

 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <assert.h>

 
 

-#if   wxMAJOR_VERSION == 1
-    #include "table.h"
-#elif wxMAJOR_VERSION == 2
-    #include "wx/dbtable.h"
-#endif
+#include "wx/dbtable.h"

 
 #ifdef __UNIX__
 // The HPUX preprocessor lines below were commented out on 8/20/97
 
 #ifdef __UNIX__
 // The HPUX preprocessor lines below were commented out on 8/20/97


@@ -102,14 +63,79 @@ 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)
+void csstrncpyt(wxChar *target, const wxChar *source, int n)
+{
+    while ( (*target++ = *source++) != '\0' && --n )
+        ;
+
+    *target = '\0';
+}
+
+
+
+/********** 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 *****/
+#if WXWIN_COMPATIBILITY_2_4
+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()
+#endif // WXWIN_COMPATIBILITY_2_4
+
+
+/********** wxDbTable::~wxDbTable() **********/
+wxDbTable::~wxDbTable()
+{
+    this->cleanup();
+}  // wxDbTable::~wxDbTable()
+
+
+bool wxDbTable::initialize(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns,
+                    const wxString &qryTblName, bool qryOnly, const wxString &tblPath)

 {
 {

-    pDb                 = pwxDB;                    // Pointer to the wxDB object
+    // Initializing member variables
+    pDb                 = pwxDb;                    // Pointer to the wxDb object

     henv                = 0;
     hdbc                = 0;
     hstmt               = 0;
     henv                = 0;
     hdbc                = 0;
     hstmt               = 0;

+    m_hstmtGridQuery               = 0;

     hstmtDefault        = 0;                        // Initialized below
     hstmtCount          = 0;                        // Initialized first time it is needed
     hstmtInsert         = 0;
     hstmtDefault        = 0;                        // Initialized below
     hstmtCount          = 0;                        // Initialized first time it is needed
     hstmtInsert         = 0;


@@ -118,51 +144,69 @@ 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
-    selectForUpdate     = FALSE;                    // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase
+    m_numCols           = numColumns;               // Number of columns 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;
     queryOnly           = qryOnly;

+    insertable          = true;
+    tablePath.Empty();
+    tableName.Empty();
+    queryTableName.Empty();
+
+    wxASSERT(tblName.length());
+    wxASSERT(pDb);

 
 

-    assert (tblName);
+    if (!pDb)
+        return false;

 
 

-    wxStrcpy(tableName, tblName);               // Table Name
-    if (tblPath)
-        wxStrcpy(tablePath, tblPath);           // Table Path - used for dBase files
+    tableName = tblName;                        // Table Name
+    if ((pDb->Dbms() == dbmsORACLE) ||
+        (pDb->Dbms() == dbmsFIREBIRD) ||
+        (pDb->Dbms() == dbmsINTERBASE))
+        tableName = tableName.Upper();

 
 

-    if (qryTblName)                             // Name of the table/view to query
-        wxStrcpy(queryTableName, qryTblName);
+    if (tblPath.length())
+        tablePath = tblPath;                    // Table Path - used for dBase files

     else
     else

-        wxStrcpy(queryTableName, tblName);
+        tablePath.Empty();

 
 

-    if (!pDb)
-        return;
+    if (qryTblName.length())                    // Name of the table/view to query
+        queryTableName = qryTblName;
+    else
+        queryTableName = tblName;

 
 

-    pDb->nTables++;
+    if ((pDb->Dbms() == dbmsORACLE) ||
+        (pDb->Dbms() == dbmsFIREBIRD) ||
+        (pDb->Dbms() == dbmsINTERBASE))
+        queryTableName = queryTableName.Upper();
+
+    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, wx_static_cast(void*, 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());
+    pDb->WriteSqlLog(s);

 
 

-    // Grab the HENV and HDBC from the wxDB object
-    henv = pDb->henv;
-    hdbc = pDb->hdbc;
+    // Grab the HENV and HDBC from the wxDb object
+    henv = pDb->GetHENV();
+    hdbc = pDb->GetHDBC();

 
     // Allocate space for column definitions
 
     // Allocate space for column definitions

-    if (noCols)
-        colDefs = new wxColDef[noCols];  // Points to the first column defintion
+    if (m_numCols)
+        colDefs = new wxDbColDef[m_numCols];  // Points to the first column definition

 
     // Allocate statement handles for the table
     if (!queryOnly)
 
     // Allocate statement handles for the table
     if (!queryOnly)


@@ -183,11 +227,12 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
 
     // 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)
     {
         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);
     if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS)
     {
         // Check to see if cursor type is supported
         pDb->GetNextError(henv, hdbc, hstmtInternal);

-        if (! wxStrcmp(pDb->sqlState, "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()


@@ -195,20 +240,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
         {


@@ -218,7 +279,7 @@ 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
 
     if (!queryOnly)
 #endif
 
     if (!queryOnly)


@@ -235,54 +296,55 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
     }
 
     // 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, wx_static_cast(void*, pDb));
+        pDb->WriteSqlLog(s);

     }
 
 #ifdef __WXDEBUG__
     if (tableID)
     {
     }
 
 #ifdef __WXDEBUG__
     if (tableID)
     {

-        TablesInUse.DeleteContents(TRUE);
-        bool found = FALSE;
+        bool found = false;

 
 

-        wxNode *pNode;
-        pNode = TablesInUse.First();
+        wxList::compatibility_iterator pNode;
+        pNode = TablesInUse.GetFirst();

         while (pNode && !found)
         {
         while (pNode && !found)
         {

-            if (((CstructTablesInUse *)pNode->Data())->tableID == tableID)
+            if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)

             {
             {

-                found = TRUE;
-                if (!TablesInUse.DeleteNode(pNode))
-                    wxMessageBox (s.GetData(),"Unable to delete node!");
+                found = true;
+                delete (wxTablesInUse *)pNode->GetData();
+                TablesInUse.Erase(pNode);

             }
             else
             }
             else

-                pNode = pNode->Next();
+                pNode = pNode->GetNext();

         }
         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.c_str());
+            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)


@@ -292,198 +354,257 @@ 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()
+    if (m_hstmtGridQuery)
+        DeleteCursor(m_hstmtGridQuery);

 
 

+}  // wxDbTable::cleanup()

 
 
 /***************************** PRIVATE FUNCTIONS *****************************/
 
 
 
 
 /***************************** PRIVATE FUNCTIONS *****************************/
 
 

-
-/********** wxTable::bindInsertParams() **********/
-bool wxTable::bindInsertParams(void)
+void wxDbTable::setCbValueForColumn(int columnIndex)

 {
 {

-    assert(!queryOnly);
-    if (queryOnly)
-        return(FALSE);
-
-    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;
-    for (i = 0, colNo = 1; i < noCols; i++)
+    switch(colDefs[columnIndex].DbDataType)

     {
     {

-        if (! colDefs[i].InsertAllowed)
-            continue;
-        switch(colDefs[i].DbDataType)
-        {

         case DB_DATA_TYPE_VARCHAR:
         case DB_DATA_TYPE_VARCHAR:

-            fSqlType = pDb->typeInfVarchar.FsqlType;
-            precision = colDefs[i].SzDataObj;
-            scale = 0;
-            colDefs[i].CbValue = SQL_NTS;
+        case DB_DATA_TYPE_MEMO:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = SQL_NTS;

             break;
         case DB_DATA_TYPE_INTEGER:
             break;
         case DB_DATA_TYPE_INTEGER:

-            fSqlType = pDb->typeInfInteger.FsqlType;
-            precision = pDb->typeInfInteger.Precision;
-            scale = 0;
-            colDefs[i].CbValue = 0;
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = 0;

             break;
         case DB_DATA_TYPE_FLOAT:
             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;
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = 0;

             break;
         case DB_DATA_TYPE_DATE:
             break;
         case DB_DATA_TYPE_DATE:

-            fSqlType = pDb->typeInfDate.FsqlType;
-            precision = pDb->typeInfDate.Precision;
-            scale = 0;
-            colDefs[i].CbValue = 0;
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                colDefs[columnIndex].CbValue = 0;
+            break;
+        case DB_DATA_TYPE_BLOB:
+            if (colDefs[columnIndex].Null)
+                colDefs[columnIndex].CbValue = SQL_NULL_DATA;
+            else
+                if (colDefs[columnIndex].SqlCtype == SQL_C_WXCHAR)
+                    colDefs[columnIndex].CbValue = SQL_NTS;
+                else
+                    colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);

             break;
             break;

-        }
-        // Null values
-        if (colDefs[i].Null)
-        {
-            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));

     }
     }

+}

 
 

-    // Completed successfully
-    return(TRUE);
-
-}  // wxTable::bindInsertParams()
-
-
-/********** wxTable::bindUpdateParams() **********/
-bool wxTable::bindUpdateParams(void)
+/********** wxDbTable::bindParams() **********/
+bool wxDbTable::bindParams(bool forUpdate)

 {
 {

-    assert(!queryOnly);
+    wxASSERT(!queryOnly);

     if (queryOnly)
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     SWORD   fSqlType    = 0;
 
     SWORD   fSqlType    = 0;

-    UDWORD  precision   = 0;
+    SDWORD  precision   = 0;

     SWORD   scale       = 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++)
+
+    // Bind each column of the table that should be bound
+    // to a parameter marker
+    int i;
+    UWORD colNumber;
+
+    for (i=0, colNumber=1; i < m_numCols; i++)

     {
     {

-        if (! colDefs[i].Updateable)
-            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;
+                break;
+            case DB_DATA_TYPE_MEMO:
+                fSqlType = pDb->GetTypeInfMemo().FsqlType;
+                precision = colDefs[i].SzDataObj;
+                scale = 0;
+                break;
+            case DB_DATA_TYPE_INTEGER:
+                fSqlType = pDb->GetTypeInfInteger().FsqlType;
+                precision = pDb->GetTypeInfInteger().Precision;
+                scale = 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;
+                break;
+            case DB_DATA_TYPE_DATE:
+                fSqlType = pDb->GetTypeInfDate().FsqlType;
+                precision = pDb->GetTypeInfDate().Precision;
+                scale = 0;
+                break;
+            case DB_DATA_TYPE_BLOB:
+                fSqlType = pDb->GetTypeInfBlob().FsqlType;
+                precision = colDefs[i].SzDataObj;
+                scale = 0;
+                break;
+        }
+
+        setCbValueForColumn(i);
+
+        if (forUpdate)
+        {
+            if (SQLBindParameter(hstmtUpdate, colNumber++, 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));
+            }
+        }
+        else
+        {
+            if (SQLBindParameter(hstmtInsert, colNumber++, 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(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));

     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;
+
+}  // wxDbTable::bindParams()
+

 
 

-}  // wxTable::bindUpdateParams()
+/********** wxDbTable::bindInsertParams() **********/
+bool wxDbTable::bindInsertParams(void)
+{
+    return bindParams(false);
+}  // wxDbTable::bindInsertParams()
+
+
+/********** 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;
-    
+    static SQLLEN 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;
-    for (i = 0; i < noCols; i++)
+    UWORD i;
+    for (i = 0; i < m_numCols; 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));
+        cb = colDefs[i].CbValue;
+        if (SQLBindCol(cursor, (UWORD)(i+1), colDefs[i].SqlCtype, (UCHAR*) colDefs[i].PtrDataObj,
+                       colDefs[i].SzDataObj, &cb ) != SQL_SUCCESS)
+          return (pDb->DispAllErrors(henv, hdbc, cursor));

     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 

-}  // wxTable::bindCols()
+}  // wxDbTable::bindCols()

 
 
 
 

-/********** wxTable::getRec() **********/
-bool wxTable::getRec(UWORD fetchType)
+/********** wxDbTable::getRec() **********/
+bool wxDbTable::getRec(UWORD fetchType)

 {
     RETCODE retcode;
 
     if (!pDb->FwdOnlyCursors())
     {
         // Fetch the NEXT, PREV, FIRST or LAST record, depending on fetchType
 {
     RETCODE retcode;
 
     if (!pDb->FwdOnlyCursors())
     {
         // Fetch the NEXT, PREV, FIRST or LAST record, depending on fetchType

-        UDWORD  cRowsFetched;
+        SQLULEN cRowsFetched;

         UWORD   rowStatus;
 
         retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus);
         UWORD   rowStatus;
 
         retcode = SQLExtendedFetch(hstmt, fetchType, 0, &cRowsFetched, &rowStatus);

-        if (retcode  != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
+        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
+        {

             if (retcode == SQL_NO_DATA_FOUND)
             if (retcode == SQL_NO_DATA_FOUND)

-                return(FALSE);
+                return false;

             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 < m_numCols; i++)
+                colDefs[i].Null = (colDefs[i].CbValue == SQL_NULL_DATA);
+        }

     }
     else
     {
     }
     else
     {


@@ -492,308 +613,503 @@ bool wxTable::getRec(UWORD fetchType)
         if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         {
             if (retcode == SQL_NO_DATA_FOUND)
         if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         {
             if (retcode == SQL_NO_DATA_FOUND)

-                return(FALSE);
+                return false;

             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 < m_numCols; i++)
+                colDefs[i].Null = (colDefs[i].CbValue == SQL_NULL_DATA);
+        }

     }
 
     // Completed successfully
     }
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 

-}  // wxTable::getRec()
+}  // wxDbTable::getRec()

 
 
 
 

-/********** wxTable::execDelete() **********/
-bool wxTable::execDelete(const char *pSqlStmt)
+/********** wxDbTable::execDelete() **********/
+bool wxDbTable::execDelete(const wxString &pSqlStmt)

 {
 {

+    RETCODE retcode;
+

     // Execute the DELETE statement
     // Execute the DELETE statement

-    if (SQLExecDirect(hstmtDelete, (UCHAR FAR *) pSqlStmt, SQL_NTS) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, hstmtDelete));
+    retcode = SQLExecDirect(hstmtDelete, (SQLTCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
+
+    if (retcode == SQL_SUCCESS ||
+        retcode == SQL_NO_DATA_FOUND ||
+        retcode == SQL_SUCCESS_WITH_INFO)
+    {
+        // Record deleted successfully
+        return true;
+    }

 
 

-    // Record deleted successfully
-    return(TRUE);
+    // Problem deleting record
+    return(pDb->DispAllErrors(henv, hdbc, hstmtDelete));

 
 

-}  // wxTable::execDelete()
+}  // wxDbTable::execDelete()

 
 
 
 

-/********** wxTable::execUpdate() **********/
-bool wxTable::execUpdate(const char *pSqlStmt)
+/********** wxDbTable::execUpdate() **********/
+bool wxDbTable::execUpdate(const wxString &pSqlStmt)

 {
 {

+    RETCODE retcode;
+

     // Execute the UPDATE statement
     // Execute the UPDATE statement

-    if (SQLExecDirect(hstmtUpdate, (UCHAR FAR *) pSqlStmt, SQL_NTS) != SQL_SUCCESS)
-        return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
+    retcode = SQLExecDirect(hstmtUpdate, (SQLTCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
+
+    if (retcode == SQL_SUCCESS ||
+        retcode == SQL_NO_DATA_FOUND ||
+        retcode == SQL_SUCCESS_WITH_INFO)
+    {
+        // Record updated successfully
+        return true;
+    }
+    else if (retcode == SQL_NEED_DATA)
+    {
+        PTR pParmID;
+        retcode = SQLParamData(hstmtUpdate, &pParmID);
+        while (retcode == SQL_NEED_DATA)
+        {
+            // Find the parameter
+            int i;
+            for (i=0; i < m_numCols; i++)
+            {
+                if (colDefs[i].PtrDataObj == pParmID)
+                {
+                    // We found it.  Store the parameter.
+                    retcode = SQLPutData(hstmtUpdate, pParmID, colDefs[i].SzDataObj);
+                    if (retcode != SQL_SUCCESS)
+                    {
+                        pDb->DispNextError();
+                        return pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
+                    }
+                    break;
+                }
+            }
+            retcode = SQLParamData(hstmtUpdate, &pParmID);
+        }
+        if (retcode == SQL_SUCCESS ||
+            retcode == SQL_NO_DATA_FOUND ||
+            retcode == SQL_SUCCESS_WITH_INFO)
+        {
+            // Record updated successfully
+            return true;
+        }
+    }

 
 

-    // Record deleted successfully
-    return(TRUE);
+    // Problem updating record
+    return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));

 
 

-}  // 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();
     else
     if (forUpdate)
         // The user may wish to select for update, but the DBMS may not be capable
         selectForUpdate = CanSelectForUpdate();
     else

-        selectForUpdate = FALSE;
+        selectForUpdate = false;

 
     // 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);
     }
 
     // Make sure the cursor is closed first
         pDb->WriteSqlLog(sqlStmt);
     }
 
     // Make sure the cursor is closed first

-    if (! CloseCursor(hstmt))
-        return(FALSE);
+    if (!CloseCursor(hstmt))
+        return false;

 
     // Execute the SQL SELECT statement
     int retcode;
 
     // Execute the SQL SELECT statement
     int retcode;

-
-    retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt : sqlStmt), SQL_NTS);
+    retcode = SQLExecDirect(hstmt, (SQLTCHAR 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
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
         return(pDb->DispAllErrors(henv, hdbc, hstmt));
 
     // Completed successfully

-    return(TRUE);
+    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;
+
+    // Calculate the maximum size of the concatenated
+    // keys for use with wxDbGrid
+    m_keysize = 0;
+    for (i=0; i < m_numCols; i++)
+    {
+        if (colDefs[i].KeyField)
+        {
+            m_keysize += colDefs[i].SzDataObj;
+        }
+    }
+
+    s.Empty();
+
+    bool exists = true;
+    if (checkTableExists)
+    {
+        if (pDb->Dbms() == dbmsPOSTGRES)
+            exists = pDb->TableExists(tableName, NULL, tablePath);
+        else
+            exists = pDb->TableExists(tableName, pDb->GetUsername(), tablePath);
+    }

 
     // Verify that the table exists in the database
 
     // Verify that the table exists in the database

-    if (!pDb->TableExists(tableName,pDb->GetUsername(),tablePath))
+    if (!exists)
+    {
+        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 if (checkPrivileges)

     {
     {

-        wxString s;
-        if (wxStrcmp(tablePath,""))
-            s.sprintf("Error opening '%s/%s'.\n",tablePath,tableName);
+        // Verify the user has rights to access the table.
+        bool hasPrivs wxDUMMY_INITIALIZE(true);
+
+        if (pDb->Dbms() == dbmsPOSTGRES)
+            hasPrivs = pDb->TablePrivileges(tableName, wxT("SELECT"), pDb->GetUsername(), NULL, tablePath);

         else
         else

-            s.sprintf("Error opening '%s'.\n", tableName);
-        if (!pDb->TableExists(tableName,NULL,tablePath))
-            s += "Table/view does not exist in the database.\n";
+            hasPrivs = pDb->TablePrivileges(tableName, wxT("SELECT"), pDb->GetUsername(), pDb->GetUsername(), tablePath);
+
+        if (!hasPrivs)
+            s = wxT("Connecting user does not have sufficient privileges to access this table.\n");
+    }
+
+    if (!s.empty())
+    {
+        wxString p;
+
+        if (!tablePath.empty())
+            p.Printf(wxT("Error opening '%s/%s'.\n"),tablePath.c_str(),tableName.c_str());

         else
         else

-            s += "Current logged in user does not have sufficient privileges to access this table.\n";
-        pDb->LogError(s.GetData());
-        return(FALSE);
+            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
     }
 
     // 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
     if (!queryOnly)
     {
         if (!bindInsertParams())                    // Inserts

-            return(FALSE);
+            return false;
+

         if (!bindUpdateParams())                    // Updates
         if (!bindUpdateParams())                    // Updates

-            return(FALSE);
+            return false;

     }
     }

+

     if (!bindCols(*hstmtDefault))                   // Selects
     if (!bindCols(*hstmtDefault))                   // Selects

-        return(FALSE);
+        return false;
+

     if (!bindCols(hstmtInternal))                   // Internal use only
     if (!bindCols(hstmtInternal))                   // Internal use only

-        return(FALSE);
-    /*
+        return false;
+
+     /*

      * Do NOT bind the hstmtCount cursor!!!
      */
 
     // Build an insert statement using parameter markers
      * Do NOT bind the hstmtCount cursor!!!
      */
 
     // Build an insert statement using parameter markers

-    if (!queryOnly && noCols > 0)
+    if (!queryOnly && m_numCols > 0)

     {
     {

-        bool needComma = FALSE;
-        sqlStmt.sprintf("INSERT INTO %s (", tableName);
-        for (i = 0; i < noCols; i++)
+        bool needComma = false;
+        sqlStmt.Printf(wxT("INSERT INTO %s ("),
+                       pDb->SQLTableName(tableName.c_str()).c_str());
+        for (i = 0; i < m_numCols; i++)

         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)
         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)

-                sqlStmt += ",";
-            sqlStmt += colDefs[i].ColName;
-            needComma = TRUE;
+                sqlStmt += wxT(",");
+            sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+            needComma = true;

         }
         }

-        needComma = FALSE;
-        sqlStmt += ") VALUES (";
-        for (i = 0; i < noCols; i++)
+        needComma = false;
+        sqlStmt += wxT(") VALUES (");
+
+        int insertableCount = 0;
+
+        for (i = 0; i < m_numCols; i++)

         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)
         {
             if (! colDefs[i].InsertAllowed)
                 continue;
             if (needComma)

-                sqlStmt += ",";
-            sqlStmt += "?";
-            needComma = TRUE;
+                sqlStmt += wxT(",");
+            sqlStmt += wxT("?");
+            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, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+                return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
+        }
+        else
+            insertable = false;

     }
     }

-    
+

     // Completed successfully
     // Completed successfully

-    return(TRUE);
+    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);
 
 {
     pDb->WriteSqlLog(pSqlStmt);
 

-    return(query(DB_SELECT_STATEMENT, FALSE, FALSE, 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"));
-        return FALSE;
+        wxFAIL_MSG(wxT("GetPrev()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
+        return false;

     }
     else
         return(getRec(SQL_FETCH_PRIOR));
     }
     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"));
-        return FALSE;
+        wxFAIL_MSG(wxT("operator--:Backward scrolling cursors are not enabled for this instance of wxDbTable"));
+        return false;

     }
     else
         return(getRec(SQL_FETCH_PRIOR));
     }
     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"));
-        return FALSE;
+        wxFAIL_MSG(wxT("GetFirst():Backward scrolling cursors are not enabled for this instance of wxDbTable"));
+        return false;

     }
     else
         return(getRec(SQL_FETCH_FIRST));
     }
     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"));
-        return FALSE;
+        wxFAIL_MSG(wxT("GetLast()::Backward scrolling cursors are not enabled for this instance of wxDbTable"));
+        return false;

     }
     }

-    else 
+    else

         return(getRec(SQL_FETCH_LAST));
         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"),
+                        pDb->SQLTableName(tableName.c_str()).c_str());
+        return;
+    }
+
+    pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "),
+                    pDb->SQLTableName(tableName.c_str()).c_str());
+
+    // Append the WHERE clause to the SQL DELETE statement
+    switch(typeOfDel)
+    {
+        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 (CanUpdateByROWID())
+            {
+                SQLLEN 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)(m_numCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &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!!!
 
     // Was a FROM clause specified to join tables to the base table?
     // Available for ::Query() only!!!

-    bool appendFromClause = FALSE;
+    bool appendFromClause = false;
+#if wxODBC_BACKWARD_COMPATABILITY

     if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))
     if (typeOfSelect == DB_SELECT_WHERE && from && wxStrlen(from))

-        appendFromClause = TRUE;
+        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;

-    for (i = 0; i < noCols; i++)
+    wxString tStr;
+    for (i = 0; i < m_numCols; i++)

     {
     {

+        tStr = colDefs[i].ColName;

         // If joining tables, the base table column names must be qualified to avoid ambiguity
         // If joining tables, the base table column names must be qualified to avoid ambiguity

-        if (appendFromClause)
+        if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && tStr.Find(wxT('.')) == wxNOT_FOUND)

         {
         {

-            wxStrcat(pSqlStmt, queryTableName);
-            wxStrcat(pSqlStmt, ".");
+            pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
+            pSqlStmt += wxT(".");

         }
         }

-        wxStrcat(pSqlStmt, colDefs[i].ColName);
-        if (i + 1 < noCols)
-            wxStrcat(pSqlStmt, ",");
+        pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+        if (i + 1 < m_numCols)
+            pSqlStmt += wxT(",");

     }
 
     // If the datasource supports ROWID, get this column as well.  Exception: Don't retrieve
     // the ROWID if querying distinct records.  The rowid will always be unique.
     }
 
     // If the datasource supports ROWID, get this column as well.  Exception: Don't retrieve
     // the ROWID if querying distinct records.  The rowid will always be unique.

-    if (!distinct && CanUpdByROWID())
+    if (!distinct && CanUpdateByROWID())

     {
         // If joining tables, the base table column names must be qualified to avoid ambiguity
     {
         // If joining tables, the base table column names must be qualified to avoid ambiguity

-        if (appendFromClause)
+        if (appendFromClause || pDb->Dbms() == dbmsACCESS)

         {
         {

-            wxStrcat(pSqlStmt, ",");
-            wxStrcat(pSqlStmt, queryTableName);
-            wxStrcat(pSqlStmt, ".ROWID");
+            pSqlStmt += wxT(",");
+            pSqlStmt += pDb->SQLTableName(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 += pDb->SQLTableName(queryTableName);
+//    pSqlStmt += queryTableName;

 
     // Sybase uses the HOLDLOCK keyword to lock a record during query.
     // The HOLDLOCK keyword follows the table name in the from clause.
 
     // Sybase uses the HOLDLOCK keyword to lock a record during query.
     // The HOLDLOCK keyword follows the table name in the from clause.


@@ -801,58 +1117,250 @@ 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))
-        {
-            wxStrcat(pSqlStmt, " WHERE ");
-            wxStrcat(pSqlStmt, whereClause);
-        }
-        break;
-    case DB_SELECT_MATCHING:
-        GetWhereClause(whereClause, DB_WHERE_MATCHING);
-        if (wxStrlen(whereClause))
-        {
-            wxStrcat(pSqlStmt, " WHERE ");
-            wxStrcat(pSqlStmt, whereClause);
-        }
-        break;
-    }
-
-    // Append the ORDER BY clause
-    if (orderBy && wxStrlen(orderBy))
+        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

     {
     {

-        wxStrcat(pSqlStmt, " ORDER BY ");
-        wxStrcat(pSqlStmt, orderBy);
+        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())
     }
 
     // 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");
+        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 typeOfUpdate, const wxString &pWhereClause)
+{
+    wxASSERT(!queryOnly);
+    if (queryOnly)
+        return;
+
+    wxString whereClause;
+    whereClause.Empty();
+
+    bool firstColumn = true;
+
+    pSqlStmt.Printf(wxT("UPDATE %s SET "),
+                    pDb->SQLTableName(tableName.c_str()).c_str());
+
+    // Append a list of columns to be updated
+    int i;
+    for (i = 0; i < m_numCols; i++)
+    {
+        // Only append Updateable columns
+        if (colDefs[i].Updateable)
+        {
+            if (!firstColumn)
+                pSqlStmt += wxT(",");
+            else
+                firstColumn = false;

 
 

-}  // wxTable::GetSelectStmt()
+            pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//            pSqlStmt += colDefs[i].ColName;
+            pSqlStmt += wxT(" = ?");
+        }
+    }

 
 

+    // Append the WHERE clause to the SQL UPDATE statement
+    pSqlStmt += wxT(" WHERE ");
+    switch(typeOfUpdate)
+    {
+        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 (CanUpdateByROWID())
+            {
+                SQLLEN cb;
+                wxChar rowid[wxDB_ROWID_LEN+1];

 
 

-/********** wxTable::GetRowNum() **********/
-UWORD wxTable::GetRowNum(void)
+                // 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)(m_numCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &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 typeOfUpdate, const wxString &pWhereClause)
+{
+    wxString tempSqlStmt;
+    BuildUpdateStmt(tempSqlStmt, typeOfUpdate, 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 colNumber;
+    for (colNumber = 0; colNumber < m_numCols; colNumber++)
+    {
+        // Determine if this column should be included in the WHERE clause
+        if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[colNumber].KeyField) ||
+             (typeOfWhere == DB_WHERE_MATCHING  && (!IsColNull((UWORD)colNumber))))
+        {
+            // Skip over timestamp columns
+            if (colDefs[colNumber].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
+            wxString tStr = colDefs[colNumber].ColName;
+
+            if (qualTableName.length() && tStr.Find(wxT('.')) == wxNOT_FOUND)
+            {
+                pWhereClause += pDb->SQLTableName(qualTableName);
+                pWhereClause += wxT(".");
+            }
+            pWhereClause += pDb->SQLColumnName(colDefs[colNumber].ColName);
+
+            if (useLikeComparison && (colDefs[colNumber].SqlCtype == SQL_C_WXCHAR))
+                pWhereClause += wxT(" LIKE ");
+            else
+                pWhereClause += wxT(" = ");
+
+            switch(colDefs[colNumber].SqlCtype)
+            {
+                case SQL_C_CHAR:
+#ifdef SQL_C_WCHAR
+                case SQL_C_WCHAR:
+#endif
+                //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR
+                    colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[colNumber].PtrDataObj);
+                    break;
+                case SQL_C_SHORT:
+                case SQL_C_SSHORT:
+                    colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[colNumber].PtrDataObj));
+                    break;
+                case SQL_C_USHORT:
+                    colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[colNumber].PtrDataObj));
+                    break;
+                case SQL_C_LONG:
+                case SQL_C_SLONG:
+                    colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[colNumber].PtrDataObj));
+                    break;
+                case SQL_C_ULONG:
+                    colValue.Printf(wxT("%lu"), *((UDWORD *) colDefs[colNumber].PtrDataObj));
+                    break;
+                case SQL_C_FLOAT:
+                    colValue.Printf(wxT("%.6f"), *((SFLOAT *) colDefs[colNumber].PtrDataObj));
+                    break;
+                case SQL_C_DOUBLE:
+                    colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[colNumber].PtrDataObj));
+                    break;
+                default:
+                    {
+                        wxString strMsg;
+                        strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
+                                    colNumber,colDefs[colNumber].ColName);
+                        wxFAIL_MSG(strMsg.c_str());
+                    }
+                    break;
+            }
+            pWhereClause += colValue;
+        }
+    }
+}  // wxDbTable::BuildWhereClause()
+
+
+/***** 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()
+
+
+/********** wxDbTable::GetRowNum() **********/
+UWORD wxDbTable::GetRowNum(void)

 {
     UDWORD rowNum;
 
 {
     UDWORD rowNum;
 


@@ -865,60 +1373,65 @@ 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));
 
     // Completed successfully
 {
     if (SQLFreeStmt(cursor, SQL_CLOSE) != SQL_SUCCESS)
         return(pDb->DispAllErrors(henv, hdbc, cursor));
 
     // Completed successfully

-    return(TRUE);
+    return true;

 
 

-}  // wxTable::CloseCursor()
+}  // wxDbTable::CloseCursor()

 
 
 
 

-/********** wxTable::CreateTable() **********/
-bool wxTable::CreateTable(bool attemptDrop)
+/********** wxDbTable::CreateTable() **********/
+bool wxDbTable::CreateTable(bool attemptDrop)

 {
     if (!pDb)
 {
     if (!pDb)

-        return FALSE;
+        return false;

 
     int i, j;
 
     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
     if (attemptDrop && !DropTable())
 #endif
 
     // Drop table first
     if (attemptDrop && !DropTable())

-        return FALSE;
+        return false;

 
     // Create the table
 #ifdef DBDEBUG_CONSOLE
 
     // Create the table
 #ifdef DBDEBUG_CONSOLE

-    for (i = 0; i < noCols; i++)
+    for (i = 0; i < m_numCols; i++)

     {
         // 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->GetTypeInfVarchar().TypeName << wxT("(") << (int)(colDefs[i].SzDataObj / sizeof(wxChar)) << wxT(")");
+                break;
+            case DB_DATA_TYPE_MEMO:
+                cout << pDb->GetTypeInfMemo().TypeName;

                 break;
             case DB_DATA_TYPE_INTEGER:
                 break;
             case DB_DATA_TYPE_INTEGER:

-                cout << pDb->typeInfInteger.TypeName;
+                cout << pDb->GetTypeInfInteger().TypeName;

                 break;
             case DB_DATA_TYPE_FLOAT:
                 break;
             case DB_DATA_TYPE_FLOAT:

-                cout << pDb->typeInfFloat.TypeName;
+                cout << pDb->GetTypeInfFloat().TypeName;

                 break;
             case DB_DATA_TYPE_DATE:
                 break;
             case DB_DATA_TYPE_DATE:

-                cout << pDb->typeInfDate.TypeName;
+                cout << pDb->GetTypeInfDate().TypeName;
+                break;
+            case DB_DATA_TYPE_BLOB:
+                cout << pDb->GetTypeInfBlob().TypeName;

                 break;
         }
         cout << endl;
                 break;
         }
         cout << endl;


@@ -926,55 +1439,72 @@ bool wxTable::CreateTable(bool attemptDrop)
 #endif
 
     // Build a CREATE TABLE string from the colDefs structure.
 #endif
 
     // Build a CREATE TABLE string from the colDefs structure.

-    bool needComma = FALSE;
-    sqlStmt.sprintf("CREATE TABLE %s (", tableName);
+    bool needComma = false;

 
 

-    for (i = 0; i < noCols; i++)
+    sqlStmt.Printf(wxT("CREATE TABLE %s ("),
+                   pDb->SQLTableName(tableName.c_str()).c_str());
+
+    for (i = 0; i < m_numCols; i++)

     {
         // Exclude derived columns since they are NOT part of the base table
         if (colDefs[i].DerivedCol)
             continue;
         // Comma Delimiter
         if (needComma)
     {
         // Exclude derived columns since they are NOT part of the base table
         if (colDefs[i].DerivedCol)
             continue;
         // Comma Delimiter
         if (needComma)

-           sqlStmt += ",";
+            sqlStmt += wxT(",");

         // Column Name
         // Column Name

-        sqlStmt += colDefs[i].ColName;
-        sqlStmt += " ";
+        sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+//        sqlStmt += colDefs[i].ColName;
+        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_MEMO:
+                sqlStmt += pDb->GetTypeInfMemo().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 &&
+            (pDb->Dbms() != dbmsMY_SQL || pDb->GetTypeInfVarchar().TypeName != _T("text")))// ||
+//            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)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));
+            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() == dbmsINTERBASE  ||
+            pDb->Dbms() == dbmsFIREBIRD  ||
+            pDb->Dbms() == dbmsMS_SQL_SERVER)

         {
             if (colDefs[i].KeyField)
             {
         {
             if (colDefs[i].KeyField)
             {

-                sqlStmt += " NOT NULL";
+                sqlStmt += wxT(" NOT NULL");

             }
         }
             }
         }

-        
-        needComma = TRUE;
+
+        needComma = true;

     }
     // If there is a primary key defined, include it in the create statement
     }
     // If there is a primary key defined, include it in the create statement

-    for (i = j = 0; i < noCols; i++)
+    for (i = j = 0; i < m_numCols; i++)

     {
         if (colDefs[i].KeyField)
         {
     {
         if (colDefs[i].KeyField)
         {


@@ -982,253 +1512,433 @@ bool wxTable::CreateTable(bool attemptDrop)
             break;
         }
     }
             break;
         }
     }

-    if (j && pDb->Dbms() != dbmsDBASE)  // Found a keyfield
+    if ( j && (pDb->Dbms() != dbmsDBASE)
+        && (pDb->Dbms() != dbmsXBASE_SEQUITER) )  // Found a keyfield

     {
     {

-        if (pDb->Dbms() != dbmsMY_SQL)
+        switch (pDb->Dbms())

         {
         {

-            sqlStmt += ",CONSTRAINT ";
-            sqlStmt += tableName;
-            sqlStmt += "_PIDX PRIMARY KEY (";
-        }
-        else
-        {
-            /* MySQL goes out on this one. We also declare the relevant key NON NULL above */
-            sqlStmt += ", PRIMARY KEY (";
+            case dbmsACCESS:
+            case dbmsINFORMIX:
+            case dbmsSYBASE_ASA:
+            case dbmsSYBASE_ASE:
+            case dbmsMY_SQL:
+            case dbmsFIREBIRD:
+            {
+                // MySQL goes out on this one. We also declare the relevant key NON NULL above
+                sqlStmt += wxT(",PRIMARY KEY (");
+                break;
+            }
+            default:
+            {
+                sqlStmt += wxT(",CONSTRAINT ");
+                //  DB2 is limited to 18 characters for index names
+                if (pDb->Dbms() == dbmsDB2)
+                {
+                    wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
+                    sqlStmt += pDb->SQLTableName(tableName.substr(0, 13).c_str());
+//                    sqlStmt += tableName.substr(0, 13);
+                }
+                else
+                    sqlStmt += pDb->SQLTableName(tableName.c_str());
+//                    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

-        for (i = j = 0; i < noCols; i++)
+        for (i = j = 0; i < m_numCols; i++)

         {
             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 += colDefs[i].ColName;
+                    sqlStmt += wxT(",");
+                sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+
+                if (pDb->Dbms() == dbmsMY_SQL &&
+                    colDefs[i].DbDataType ==  DB_DATA_TYPE_VARCHAR)
+                {
+                    wxString s;
+                    s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));
+                    sqlStmt += s;
+                }

             }
         }
             }
         }

-       sqlStmt += ")";
+        sqlStmt += wxT(")");
+
+        if (pDb->Dbms() == dbmsINFORMIX ||
+            pDb->Dbms() == dbmsSYBASE_ASA ||
+            pDb->Dbms() == dbmsSYBASE_ASE)
+        {
+            sqlStmt += wxT(" CONSTRAINT ");
+            sqlStmt += pDb->SQLTableName(tableName);
+//            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, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);

     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);
     if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);

-        return(FALSE);
+        return false;

     }
 
     // Commit the transaction and close the cursor
     }
 
     // Commit the transaction and close the cursor

-    if (! pDb->CommitTrans())
-        return(FALSE);
-    if (! CloseCursor(hstmt))
-        return(FALSE);
+    if (!pDb->CommitTrans())
+        return false;
+    if (!CloseCursor(hstmt))
+        return false;

 
     // Database table created successfully
 
     // Database table created successfully

-    return(TRUE);
+    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
+    // NOTE: This function returns true if the Table does not exist, but

     //       only for identified databases.  Code will need to be added
     //       only for identified databases.  Code will need to be added

-    //          below for any other databases when those databases are defined
+    //       below for any other databases when those databases are defined

     //       to handle this situation consistently
 
     //       to handle this situation consistently
 

-//    char sqlStmt[DB_MAX_STATEMENT_LEN];

     wxString sqlStmt;
 
     wxString sqlStmt;
 

-    sqlStmt.sprintf("DROP TABLE %s", tableName);
+    sqlStmt.Printf(wxT("DROP TABLE %s"),
+                   pDb->SQLTableName(tableName.c_str()).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)
+    RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+    if (retcode != SQL_SUCCESS)

     {
         // Check for "Base table not found" error and ignore
         pDb->GetNextError(henv, hdbc, hstmt);
     {
         // Check for "Base table not found" error and ignore
         pDb->GetNextError(henv, hdbc, hstmt);

-        if (wxStrcmp(pDb->sqlState,"S0002"))  // "Base table not found"
+        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() == dbmsPERVASIVE_SQL && !wxStrcmp(pDb->sqlState,wxT("S1000")))   ||  // Returns an S1000 then an S0002
+                  (pDb->Dbms() == dbmsPOSTGRES      && !wxStrcmp(pDb->sqlState,wxT("08S01")))))

             {
                 pDb->DispNextError();
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
             {
                 pDb->DispNextError();
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();

-                CloseCursor(hstmt);
-                return(FALSE);
+//                CloseCursor(hstmt);
+                return false;

             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())
             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (! CloseCursor(hstmt))
     if (! CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
 

-    return(TRUE);
-}  // wxTable::DropTable()
+    return true;
+}  // 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 &indexName, bool unique, UWORD numIndexColumns,
+                                     wxDbIdxDef *pIndexDefs, bool attemptDrop)

 {
 {

-//    char sqlStmt[DB_MAX_STATEMENT_LEN];

     wxString sqlStmt;
 
     // Drop the index first
     wxString sqlStmt;
 
     // Drop the index first

-    if (attemptDrop && !DropIndex(idxName))
-        return (FALSE);
+    if (attemptDrop && !DropIndex(indexName))
+        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 < numIndexColumns && 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->m_numCols))
+            {
+                if (wxStrcmp(colDefs[j].ColName,pIndexDefs[i].ColName) == 0)
+                    found = true;
+                if (!found)
+                    j++;
+            }
+
+            if (found)
+            {
+                ok = pDb->ModifyColumn(tableName, pIndexDefs[i].ColName,
+                                        colDefs[j].DbDataType, (int)(colDefs[j].SzDataObj / sizeof(wxChar)),
+                                        wxT("NOT NULL"));
+
+                if (!ok)
+                {
+                    #if 0
+                    // retcode is not used
+                    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;
+                    #endif
+                }
+            }
+            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 += wxT("UNIQUE ");

 
 

-    sqlStmt += "INDEX ";
-    sqlStmt += idxName;
-    sqlStmt += " ON ";
-    sqlStmt += tableName;
-    sqlStmt += " (";
+    sqlStmt += wxT("INDEX ");
+    sqlStmt += pDb->SQLTableName(indexName);
+    sqlStmt += wxT(" ON ");
+
+    sqlStmt += pDb->SQLTableName(tableName);
+//    sqlStmt += tableName;
+    sqlStmt += wxT(" (");

 
     // Append list of columns making up index
     int i;
 
     // Append list of columns making up index
     int i;

-    for (i = 0; i < noIdxCols; i++)
+    for (i = 0; i < numIndexColumns; i++)

     {
     {

-        sqlStmt += pIdxDefs[i].ColName;
-        /* Postgres doesn't cope with ASC */
-        if (pDb->Dbms() != dbmsPOSTGRES)
+        sqlStmt += pDb->SQLColumnName(pIndexDefs[i].ColName);
+//        sqlStmt += pIndexDefs[i].ColName;
+
+        // MySQL requires a key length on VARCHAR keys
+        if ( pDb->Dbms() == dbmsMY_SQL )
+        {
+            // Find the details on this column
+            int j;
+            for ( j = 0; j < m_numCols; ++j )
+            {
+                if ( wxStrcmp( pIndexDefs[i].ColName, colDefs[j].ColName ) == 0 )
+                {
+                    break;
+                }
+            }
+            if ( colDefs[j].DbDataType ==  DB_DATA_TYPE_VARCHAR)
+            {
+                wxString s;
+                s.Printf(wxT("(%d)"), (int)(colDefs[i].SzDataObj / sizeof(wxChar)));
+                sqlStmt += s;
+            }
+        }
+
+        // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
+        if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (wxStrncmp(pDb->dbInf.dbmsVer,_T("07"),2)==0)) &&
+            !(pDb->Dbms() == dbmsFIREBIRD) &&
+            !(pDb->Dbms() == dbmsPOSTGRES))

         {
         {

-            if (pIdxDefs[i].Ascending)
-                sqlStmt += " ASC";
+            if (pIndexDefs[i].Ascending)
+                sqlStmt += wxT(" ASC");

             else
             else

-                sqlStmt += " DESC";
+                sqlStmt += wxT(" DESC");

         }
         }

+        else
+            wxASSERT_MSG(pIndexDefs[i].Ascending, _T("Datasource does not support DESCending index columns"));

 
 

-        if ((i + 1) < noIdxCols)
-            sqlStmt += ",";
+        if ((i + 1) < numIndexColumns)
+            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)
+    RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+    if (retcode != SQL_SUCCESS)

     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);
     {
         pDb->DispAllErrors(henv, hdbc, hstmt);
         pDb->RollbackTrans();
         CloseCursor(hstmt);

-        return(FALSE);
+        return false;

     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (! CloseCursor(hstmt))
     if (! CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
     // Index Created Successfully
 
     // Index Created Successfully

-    return(TRUE);
+    return true;

 
 

-}  // wxTable::CreateIndex()
+}  // wxDbTable::CreateIndex()

 
 
 
 

-/********** wxTable::DropIndex() **********/
-bool wxTable::DropIndex(const char * idxName)
+/********** wxDbTable::DropIndex() **********/
+bool wxDbTable::DropIndex(const wxString &indexName)

 {
 {

-    // NOTE: This function returns TRUE if the Index does not exist, but
+    // NOTE: This function returns true if the Index does not exist, but

     //       only for identified databases.  Code will need to be added
     //       only for identified databases.  Code will need to be added

-    //          below for any other databases when those databases are defined
+    //       below for any other databases when those databases are defined

     //       to handle this situation consistently
 
     //       to handle this situation consistently
 

-//    char sqlStmt[DB_MAX_STATEMENT_LEN];

     wxString sqlStmt;
 
     wxString sqlStmt;
 

-    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 ||
+        pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
+        sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),
+                       pDb->SQLTableName(indexName.c_str()).c_str(),
+                       pDb->SQLTableName(tableName.c_str()).c_str());
+    else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
+             (pDb->Dbms() == dbmsSYBASE_ASE) ||
+             (pDb->Dbms() == dbmsXBASE_SEQUITER))
+        sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
+                       pDb->SQLTableName(tableName.c_str()).c_str(),
+                       pDb->SQLTableName(indexName.c_str()).c_str());

     else
     else

-        sqlStmt.sprintf("DROP INDEX %s",idxName);
+        sqlStmt.Printf(wxT("DROP INDEX %s"),
+                       pDb->SQLTableName(indexName.c_str()).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)
+    RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+    if (retcode != 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() == dbmsINTERBASE     && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
+                  (pDb->Dbms() == dbmsMAXDB         && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
+                  (pDb->Dbms() == dbmsFIREBIRD      && !wxStrcmp(pDb->sqlState,wxT("HY000"))) ||
+                  (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->RollbackTrans();
                 CloseCursor(hstmt);
             {
                 pDb->DispNextError();
                 pDb->DispAllErrors(henv, hdbc, hstmt);
                 pDb->RollbackTrans();
                 CloseCursor(hstmt);

-                return(FALSE);
+                return false;

             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())
             }
         }
     }
 
     // Commit the transaction and close the cursor
     if (! pDb->CommitTrans())

-        return(FALSE);
+        return false;

     if (! CloseCursor(hstmt))
     if (! CloseCursor(hstmt))

-        return(FALSE);
+        return false;

 
 

-    return(TRUE);
-}  // wxTable::DropIndex()
+    return true;
+}  // wxDbTable::DropIndex()

 
 
 
 

-/********** wxTable::Insert() **********/
-int wxTable::Insert(void)
+/********** wxDbTable::SetOrderByColNums() **********/
+bool wxDbTable::SetOrderByColNums(UWORD first, ... )

 {
 {

-    assert(!queryOnly);
-    if (queryOnly)
+    int         colNumber = 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 && (colNumber != wxDB_NO_MORE_COLUMN_NUMBERS))
+    {
+        // Make sure the passed in column number
+        // is within the valid range of columns
+        //
+        // Valid columns are 0 thru m_numCols-1
+        if (colNumber >= m_numCols || colNumber < 0)
+        {
+            abort = true;
+            continue;
+        }
+
+        if (colNumber != first)
+            tempStr += wxT(",");
+
+        tempStr += colDefs[colNumber].ColName;
+        colNumber = 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();
 
     // Insert the record by executing the already prepared insert statement
     RETCODE retcode;
         return(DB_FAILURE);
 
     bindInsertParams();
 
     // Insert the record by executing the already prepared insert statement
     RETCODE retcode;

-    retcode=SQLExecute(hstmtInsert);
-    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
+    retcode = SQLExecute(hstmtInsert);
+    if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO &&
+        retcode != SQL_NEED_DATA)

     {
         // 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
         {


@@ -1237,432 +1947,295 @@ int wxTable::Insert(void)
             return(DB_FAILURE);
         }
     }
             return(DB_FAILURE);
         }
     }

+    if (retcode == SQL_NEED_DATA)
+    {
+        PTR pParmID;
+        retcode = SQLParamData(hstmtInsert, &pParmID);
+        while (retcode == SQL_NEED_DATA)
+        {
+            // Find the parameter
+            int i;
+            for (i=0; i < m_numCols; i++)
+            {
+                if (colDefs[i].PtrDataObj == pParmID)
+                {
+                    // We found it.  Store the parameter.
+                    retcode = SQLPutData(hstmtInsert, pParmID, colDefs[i].SzDataObj);
+                    if (retcode != SQL_SUCCESS)
+                    {
+                        pDb->DispNextError();
+                        pDb->DispAllErrors(henv, hdbc, hstmtInsert);
+                        return(DB_FAILURE);
+                    }
+                    break;
+                }
+            }
+            retcode = SQLParamData(hstmtInsert, &pParmID);
+            if (retcode != SQL_SUCCESS &&
+                retcode != SQL_SUCCESS_WITH_INFO)
+            {
+                // record was not inserted
+                pDb->DispNextError();
+                pDb->DispAllErrors(henv, hdbc, hstmtInsert);
+                return(DB_FAILURE);
+            }
+        }
+    }

 
     // 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)
     if (queryOnly)

-        return(FALSE);
+        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)
     if (queryOnly)

-        return(FALSE);
+        return false;

 
     pDb->WriteSqlLog(pSqlStmt);
 
     return(execUpdate(pSqlStmt));
 
 
     pDb->WriteSqlLog(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)
     if (queryOnly)

-        return(FALSE);
+        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)
     if (queryOnly)

-        return(FALSE);
+        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)
     if (queryOnly)

-        return(FALSE);
+        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)
     if (queryOnly)

-        return(FALSE);
+        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()
+}  // wxDbTable::DeleteMatching()

 
 
 
 

-/********** wxTable::GetUpdateStmt() **********/
-void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause)
+/********** wxDbTable::IsColNull() **********/
+bool wxDbTable::IsColNull(UWORD colNumber) const

 {
 {

-    assert(!queryOnly);
-    if (queryOnly)
-        return;
-
-    char whereClause[DB_MAX_WHERE_CLAUSE_LEN];
-    bool firstColumn = TRUE;
-
-    whereClause[0] = 0;
-    sprintf(pSqlStmt, "UPDATE %s SET ", tableName);
+/*
+    This logic is just not right.  It would indicate true
+    if a numeric field were set to a value of 0.

 
 

-    // Append a list of columns to be updated
-    int i;
-    for (i = 0; i < noCols; i++)
+    switch(colDefs[colNumber].SqlCtype)

     {
     {

-        // Only append Updateable columns
-        if (colDefs[i].Updateable)
-        {
-            if (! firstColumn)
-                wxStrcat(pSqlStmt, ",");
+        case SQL_C_CHAR:
+        case SQL_C_WCHAR:
+        //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR
+            return(((UCHAR FAR *) colDefs[colNumber].PtrDataObj)[0] == 0);
+        case SQL_C_SSHORT:
+            return((  *((SWORD *) colDefs[colNumber].PtrDataObj))   == 0);
+        case SQL_C_USHORT:
+            return((   *((UWORD*) colDefs[colNumber].PtrDataObj))   == 0);
+        case SQL_C_SLONG:
+            return(( *((SDWORD *) colDefs[colNumber].PtrDataObj))   == 0);
+        case SQL_C_ULONG:
+            return(( *((UDWORD *) colDefs[colNumber].PtrDataObj))   == 0);
+        case SQL_C_FLOAT:
+            return(( *((SFLOAT *) colDefs[colNumber].PtrDataObj))   == 0);
+        case SQL_C_DOUBLE:
+            return((*((SDOUBLE *) colDefs[colNumber].PtrDataObj))   == 0);
+        case SQL_C_TIMESTAMP:
+            TIMESTAMP_STRUCT *pDt;
+            pDt = (TIMESTAMP_STRUCT *) colDefs[colNumber].PtrDataObj;
+            if (pDt->year == 0 && pDt->month == 0 && pDt->day == 0)
+                return true;

             else
             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;
+                return false;
+        default:
+            return true;

     }
     }

-}  // GetUpdateStmt()
+*/
+    return (colDefs[colNumber].Null);
+}  // wxDbTable::IsColNull()

 
 
 
 

-/********** wxTable::GetDeleteStmt() **********/
-void wxTable::GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause)
+/********** wxDbTable::CanSelectForUpdate() **********/
+bool wxDbTable::CanSelectForUpdate(void)

 {
 {

-    assert(!queryOnly);

     if (queryOnly)
     if (queryOnly)

-        return;
-
-    char whereClause[DB_MAX_WHERE_CLAUSE_LEN];
-
-    whereClause[0] = 0;
+        return false;

 
 

-    // 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()
-
-
-/********** wxTable::IsColNull() **********/
-bool wxTable::IsColNull(int colNo)
-{
-    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)
-            return(TRUE);
-        else
-            return(FALSE);
-    default:
-        return(TRUE);
-    }
-}  // wxTable::IsColNull()
-
-
-/********** wxTable::CanSelectForUpdate() **********/
-bool wxTable::CanSelectForUpdate(void)
-{

     if (pDb->Dbms() == dbmsMY_SQL)
     if (pDb->Dbms() == dbmsMY_SQL)

-        return FALSE;
+        return false;

 
 

-    if (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE)
-        return(TRUE);
+    if ((pDb->Dbms() == dbmsORACLE) ||
+        (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE))
+        return true;

     else
     else

-        return(FALSE);
+        return false;

 
 

-}  // wxTable::CanSelectForUpdate()
+}  // wxDbTable::CanSelectForUpdate()

 
 
 
 

-/********** wxTable::CanUpdByROWID() **********/
-bool wxTable::CanUpdByROWID(void)
+/********** wxDbTable::CanUpdateByROWID() **********/
+bool wxDbTable::CanUpdateByROWID(void)

 {
 /*
 {
 /*

- * NOTE: Returning FALSE for now until this can be debugged,
+ * NOTE: Returning false for now until this can be debugged,

  *        as the ROWID is not getting updated correctly
  */
  *        as the ROWID is not getting updated correctly
  */

-    return FALSE;
-
+    return false;
+/*

     if (pDb->Dbms() == dbmsORACLE)
     if (pDb->Dbms() == dbmsORACLE)

-        return(TRUE);
+        return true;

     else
     else

-        return(FALSE);
-
-}  // wxTable::CanUpdByROWID()
+        return false;
+*/
+}  // wxDbTable::CanUpdateByROWID()

 
 
 
 

-/********** wxTable::IsCursorClosedOnCommit() **********/
-bool wxTable::IsCursorClosedOnCommit(void)
+/********** wxDbTable::IsCursorClosedOnCommit() **********/
+bool wxDbTable::IsCursorClosedOnCommit(void)

 {
     if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)
 {
     if (pDb->dbInf.cursorCommitBehavior == SQL_CB_PRESERVE)

-        return(FALSE);
+        return false;

     else
     else

-        return(TRUE);
+        return true;
+
+}  // wxDbTable::IsCursorClosedOnCommit()

 
 

-}  // wxTable::IsCursorClosedOnCommit()

 
 
 
 

-/********** wxTable::ClearMemberVars() **********/
-void wxTable::ClearMemberVars(void)
+/********** wxDbTable::ClearMemberVar() **********/
+void wxDbTable::ClearMemberVar(UWORD colNumber, bool setToNull)

 {
 {

-    // Loop through the columns setting each member variable to zero
-    int i;
-    for (i = 0; i < noCols; i++)
+    wxASSERT(colNumber < m_numCols);
+
+    switch(colDefs[colNumber].SqlCtype)

     {
     {

-        switch(colDefs[i].SqlCtype)
-        {

         case SQL_C_CHAR:
         case SQL_C_CHAR:

-            ((UCHAR FAR *) colDefs[i].PtrDataObj)[0]    = 0;
+#ifdef SQL_C_WCHAR
+        case SQL_C_WCHAR:
+#endif
+        //case SQL_C_WXCHAR:  SQL_C_WXCHAR is covered by either SQL_C_CHAR or SQL_C_WCHAR
+            ((UCHAR FAR *) colDefs[colNumber].PtrDataObj)[0]    = 0;

             break;
         case SQL_C_SSHORT:
             break;
         case SQL_C_SSHORT:

-            *((SWORD *) colDefs[i].PtrDataObj)          = 0;
+            *((SWORD *) colDefs[colNumber].PtrDataObj)          = 0;

             break;
         case SQL_C_USHORT:
             break;
         case SQL_C_USHORT:

-            *((UWORD*) colDefs[i].PtrDataObj)           = 0;
+            *((UWORD*) colDefs[colNumber].PtrDataObj)           = 0;

             break;
             break;

+        case SQL_C_LONG:

         case SQL_C_SLONG:
         case SQL_C_SLONG:

-            *((SDWORD *) colDefs[i].PtrDataObj)         = 0;
+            *((SDWORD *) colDefs[colNumber].PtrDataObj)         = 0;

             break;
         case SQL_C_ULONG:
             break;
         case SQL_C_ULONG:

-            *((UDWORD *) colDefs[i].PtrDataObj)         = 0;
+            *((UDWORD *) colDefs[colNumber].PtrDataObj)         = 0;

             break;
         case SQL_C_FLOAT:
             break;
         case SQL_C_FLOAT:

-            *((SFLOAT *) colDefs[i].PtrDataObj)         = 0.0f;
+            *((SFLOAT *) colDefs[colNumber].PtrDataObj)         = 0.0f;

             break;
         case SQL_C_DOUBLE:
             break;
         case SQL_C_DOUBLE:

-            *((SDOUBLE *) colDefs[i].PtrDataObj)        = 0.0f;
+            *((SDOUBLE *) colDefs[colNumber].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[colNumber].PtrDataObj;

             pDt->year = 0;
             pDt->month = 0;
             pDt->day = 0;
             pDt->year = 0;
             pDt->month = 0;
             pDt->day = 0;


@@ -1671,14 +2244,27 @@ void wxTable::ClearMemberVars(void)
             pDt->second = 0;
             pDt->fraction = 0;
             break;
             pDt->second = 0;
             pDt->fraction = 0;
             break;

-        }

     }
 
     }
 

-}  // wxTable::ClearMemberVars()
+    if (setToNull)
+        SetColNull(colNumber);
+}  // wxDbTable::ClearMemberVar()

 
 
 
 

-/********** wxTable::SetQueryTimeout() **********/
-bool wxTable::SetQueryTimeout(UDWORD nSeconds)
+/********** wxDbTable::ClearMemberVars() **********/
+void wxDbTable::ClearMemberVars(bool setToNull)
+{
+    int i;
+
+    // Loop through the columns setting each member variable to zero
+    for (i=0; i < m_numCols; i++)
+        ClearMemberVar((UWORD)i,setToNull);
+
+}  // 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));


@@ -1690,23 +2276,38 @@ bool wxTable::SetQueryTimeout(UDWORD nSeconds)
         return(pDb->DispAllErrors(henv, hdbc, hstmtInternal));
 
     // Completed Successfully
         return(pDb->DispAllErrors(henv, hdbc, hstmtInternal));
 
     // Completed Successfully

-    return(TRUE);
+    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() **********/
+bool wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType, void *pData,
+                           SWORD cType, int size, bool keyField, bool updateable,
+                           bool insertAllowed, bool derivedColumn)

 {
 {

+    wxString tmpStr;
+
+    if (index >= m_numCols)  // Columns numbers are zero based....
+    {
+        tmpStr.Printf(wxT("Specified column index (%d) exceeds the maximum number of columns (%d) registered for this table definition.  Column definition not added."), index, m_numCols);
+        wxFAIL_MSG(tmpStr);
+        wxLogDebug(tmpStr);
+        return false;
+    }
+

     if (!colDefs)  // May happen if the database connection fails
     if (!colDefs)  // May happen if the database connection fails

-        return;
+        return false;

 
 

-    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;  // Prevent buffer overrun
+
+        tmpStr.Printf(wxT("Column name '%s' is too long. Truncated to '%s'."),
+                      fieldName.c_str(),colDefs[index].ColName);
+        wxFAIL_MSG(tmpStr);
+        wxLogDebug(tmpStr);

     }
     else
         wxStrcpy(colDefs[index].ColName, fieldName);
     }
     else
         wxStrcpy(colDefs[index].ColName, fieldName);


@@ -1714,76 +2315,58 @@ void wxTable::SetColDefs (int index, const char *fieldName, int dataType, void *
     colDefs[index].DbDataType       = dataType;
     colDefs[index].PtrDataObj       = pData;
     colDefs[index].SqlCtype         = cType;
     colDefs[index].DbDataType       = dataType;
     colDefs[index].PtrDataObj       = pData;
     colDefs[index].SqlCtype         = cType;

-    colDefs[index].SzDataObj        = size;
+    colDefs[index].SzDataObj        = size;  //TODO: glt ??? * sizeof(wxChar) ???

     colDefs[index].KeyField         = keyField;
     colDefs[index].KeyField         = keyField;

-    colDefs[index].DerivedCol       = derivedCol;
+    colDefs[index].DerivedCol       = derivedColumn;

     // Derived columns by definition would NOT be "Insertable" or "Updateable"
     // Derived columns by definition would NOT be "Insertable" or "Updateable"

-    if (derivedCol)
+    if (derivedColumn)

     {
     {

-        colDefs[index].Updateable       = FALSE;
-        colDefs[index].InsertAllowed    = FALSE;
+        colDefs[index].Updateable       = false;
+        colDefs[index].InsertAllowed    = false;

     }
     else
     {
     }
     else
     {

-        colDefs[index].Updateable       = upd;
-        colDefs[index].InsertAllowed    = insAllow;
+        colDefs[index].Updateable       = updateable;
+        colDefs[index].InsertAllowed    = insertAllowed;

     }
 
     }
 

-    colDefs[index].Null                 = FALSE;
-    
-}  // wxTable::SetColDefs()
+    colDefs[index].Null                 = false;
+
+    return true;

 
 

+}  // 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].bufferSize+(1*sizeof(wxChar))];
+                   pColDataPtrs[index].SzDataObj  = pColInfs[index].bufferSize+(1*sizeof(wxChar));
+                   pColDataPtrs[index].SqlCtype   = SQL_C_WXCHAR;
+                   break;
+                case DB_DATA_TYPE_MEMO:
+                   pColDataPtrs[index].PtrDataObj = new wxChar[pColInfs[index].bufferSize+(1*sizeof(wxChar))];
+                   pColDataPtrs[index].SzDataObj  = pColInfs[index].bufferSize+(1*sizeof(wxChar));
+                   pColDataPtrs[index].SqlCtype   = SQL_C_WXCHAR;
+                   break;

                 case DB_DATA_TYPE_INTEGER:
                 case DB_DATA_TYPE_INTEGER:

-                {

                     // Can be long or short
                     // Can be long or short

-                    if (pColInfs[index].bufferLength == sizeof(long))
+                    if (pColInfs[index].bufferSize == sizeof(long))

                     {
                       pColDataPtrs[index].PtrDataObj = new long;
                       pColDataPtrs[index].SzDataObj  = sizeof(long);
                     {
                       pColDataPtrs[index].PtrDataObj = new long;
                       pColDataPtrs[index].SzDataObj  = sizeof(long);


@@ -1796,11 +2379,9 @@ 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
                     // Can be float or double

-                    if (pColInfs[index].bufferLength == sizeof(float))
+                    if (pColInfs[index].bufferSize == sizeof(float))

                     {
                         pColDataPtrs[index].PtrDataObj = new float;
                         pColDataPtrs[index].SzDataObj  = sizeof(float);
                     {
                         pColDataPtrs[index].PtrDataObj = new float;
                         pColDataPtrs[index].SzDataObj  = sizeof(float);


@@ -1811,73 +2392,95 @@ wxColDataPtr* wxTable::SetColDefs (wxColInf *pColInfs, ULONG numCols)
                         pColDataPtrs[index].PtrDataObj = new double;
                         pColDataPtrs[index].SzDataObj  = sizeof(double);
                         pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;
                         pColDataPtrs[index].PtrDataObj = new double;
                         pColDataPtrs[index].SzDataObj  = sizeof(double);
                         pColDataPtrs[index].SqlCtype   = SQL_C_DOUBLE;

-                    }  
+                    }

                     break;
                     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:
+                    wxFAIL_MSG(wxT("This form of ::SetColDefs() cannot be used with BLOB columns"));
+                    pColDataPtrs[index].PtrDataObj = /*BLOB ADDITION NEEDED*/NULL;
+                    pColDataPtrs[index].SzDataObj  = /*BLOB ADDITION NEEDED*/sizeof(void *);
+                    pColDataPtrs[index].SqlCtype   = SQL_VARBINARY;
+                    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;
     wxString sqlStmt;

-    SDWORD cb;
+    SQLLEN cb;

 
     // Build a "SELECT COUNT(*) FROM queryTableName [WHERE whereClause]" SQL Statement
 
     // Build a "SELECT COUNT(*) FROM queryTableName [WHERE whereClause]" SQL Statement

-    sqlStmt  = "SELECT COUNT(";
+    sqlStmt  = wxT("SELECT COUNT(");

     sqlStmt += args;
     sqlStmt += args;

-    sqlStmt += ") FROM ";
-    sqlStmt += queryTableName;
-
+    sqlStmt += wxT(") FROM ");
+    sqlStmt += pDb->SQLTableName(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, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)

     {
         pDb->DispAllErrors(henv, hdbc, *hstmtCount);
         return(0);
     {
         pDb->DispAllErrors(henv, hdbc, *hstmtCount);
         return(0);


@@ -1891,7 +2494,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);


@@ -1902,57 +2505,62 @@ 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;
+    bool result = true;

 
     // Switch to the internal cursor so any active cursors are not corrupted
     HSTMT currCursor = GetCursor();
     hstmt = hstmtInternal;
 
     // 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
     // Save the where and order by clauses

-    char *saveWhere = where;
-    char *saveOrderBy = orderBy;
-
+    wxChar *saveWhere = where;
+    wxChar *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, "");
-    if (CanUpdByROWID())
+    wxString whereClause;
+    whereClause.Empty();
+
+    if (CanUpdateByROWID())

     {
     {

-        SDWORD cb;
-        char   rowid[ROWID_LEN+1];
+        SQLLEN 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.
 
         // 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)(m_numCols+1), SQL_C_WXCHAR, (UCHAR*) rowid, sizeof(rowid), &cb) == SQL_SUCCESS)

         {
         {

-            wxStrcat(whereClause, queryTableName);
-            wxStrcat(whereClause, ".ROWID = '");
-            wxStrcat(whereClause, rowid);
-            wxStrcat(whereClause, "'");
+            whereClause += pDb->SQLTableName(queryTableName);
+//            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())
     if (!Query())

-        result = FALSE;
+        result = false;

 
     if (result && !GetNext())
 
     if (result && !GetNext())

-        result = FALSE;
+        result = false;

 
     // Switch back to original cursor
     SetCursor(&currCursor);
 
     // Switch back to original cursor
     SetCursor(&currCursor);


@@ -1967,43 +2575,59 @@ 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 colNumber, bool set)

 {
 {

-    if (colNo < noCols)
-        return(colDefs[colNo].Null = TRUE);
+    if (colNumber < m_numCols)
+    {
+        colDefs[colNumber].Null = set;
+        if (set)  // Blank out the values in the member variable
+           ClearMemberVar(colNumber, false);  // Must call with false here, or infinite recursion will happen
+
+        setCbValueForColumn(colNumber);
+
+        return true;
+    }

     else
     else

-        return(FALSE);
+        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 colNumber;
+    for (colNumber = 0; colNumber < m_numCols; colNumber++)

     {
     {

-        if (!wxStricmp(colName, colDefs[i].ColName))
+        if (!wxStricmp(colName, colDefs[colNumber].ColName))

             break;
     }
 
             break;
     }
 

-    if (i < noCols)
-        return(colDefs[i].Null = TRUE);
+    if (colNumber < m_numCols)
+    {
+        colDefs[colNumber].Null = set;
+        if (set)  // Blank out the values in the member variable
+           ClearMemberVar((UWORD)colNumber,false);  // Must call with false here, or infinite recursion will happen
+
+        setCbValueForColumn(colNumber);
+
+        return true;
+    }

     else
     else

-        return(FALSE);
+        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);
 


@@ -2023,7 +2647,7 @@ HSTMT *wxTable::NewCursor(bool setCursor, bool bindColumns)
 
     if (bindColumns)
     {
 
     if (bindColumns)
     {

-        if(!bindCols(*newHSTMT))
+        if (!bindCols(*newHSTMT))

         {
             delete newHSTMT;
             return(0);
         {
             delete newHSTMT;
             return(0);


@@ -2035,28 +2659,263 @@ 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;
+    bool result = true;

 
     if (!hstmtDel)  // Cursor already deleted
         return(result);
 
 
     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);

-        result = FALSE;
+        result = false;

     }
 
     delete hstmtDel;
 
     return(result);
 
     }
 
     delete hstmtDel;
 
     return(result);
 

-}  // wxTable::DeleteCursor()
+}  // wxDbTable::DeleteCursor()

 
 

-#endif  // wxUSE_ODBC
+//////////////////////////////////////////////////////////////
+// wxDbGrid support functions
+//////////////////////////////////////////////////////////////
+
+void wxDbTable::SetRowMode(const rowmode_t rowmode)
+{
+    if (!m_hstmtGridQuery)
+    {
+        m_hstmtGridQuery = GetNewCursor(false,false);
+        if (!bindCols(*m_hstmtGridQuery))
+            return;
+    }
+
+    m_rowmode = rowmode;
+    switch (m_rowmode)
+    {
+        case WX_ROW_MODE_QUERY:
+            SetCursor(m_hstmtGridQuery);
+            break;
+        case WX_ROW_MODE_INDIVIDUAL:
+            SetCursor(hstmtDefault);
+            break;
+        default:
+           wxASSERT(0);
+    }
+}  // wxDbTable::SetRowMode()
+
+
+wxVariant wxDbTable::GetColumn(const int colNumber) const
+{
+    wxVariant val;
+    if ((colNumber < m_numCols) && (!IsColNull((UWORD)colNumber)))
+    {
+        switch (colDefs[colNumber].SqlCtype)
+        {
+#if wxUSE_UNICODE
+    #if defined(SQL_WCHAR)
+            case SQL_WCHAR:
+    #endif
+    #if defined(SQL_WVARCHAR)
+            case SQL_WVARCHAR:
+    #endif
+#endif
+            case SQL_CHAR:
+            case SQL_VARCHAR:
+                val = (wxChar *)(colDefs[colNumber].PtrDataObj);
+                break;
+            case SQL_C_LONG:
+            case SQL_C_SLONG:
+                val = *(long *)(colDefs[colNumber].PtrDataObj);
+                break;
+            case SQL_C_SHORT:
+            case SQL_C_SSHORT:
+                val = (long int )(*(short *)(colDefs[colNumber].PtrDataObj));
+                break;
+            case SQL_C_ULONG:
+                val = (long)(*(unsigned long *)(colDefs[colNumber].PtrDataObj));
+                break;
+            case SQL_C_TINYINT:
+                val = (long)(*(wxChar *)(colDefs[colNumber].PtrDataObj));
+                break;
+            case SQL_C_UTINYINT:
+                val = (long)(*(wxChar *)(colDefs[colNumber].PtrDataObj));
+                break;
+            case SQL_C_USHORT:
+                val = (long)(*(UWORD *)(colDefs[colNumber].PtrDataObj));
+                break;
+            case SQL_C_DATE:
+                val = (DATE_STRUCT *)(colDefs[colNumber].PtrDataObj);
+                break;
+            case SQL_C_TIME:
+                val = (TIME_STRUCT *)(colDefs[colNumber].PtrDataObj);
+                break;
+            case SQL_C_TIMESTAMP:
+                val = (TIMESTAMP_STRUCT *)(colDefs[colNumber].PtrDataObj);
+                break;
+            case SQL_C_DOUBLE:
+                val = *(double *)(colDefs[colNumber].PtrDataObj);
+                break;
+            default:
+                assert(0);
+        }
+    }
+    return val;
+}  // wxDbTable::GetCol()
+
+
+void wxDbTable::SetColumn(const int colNumber, const wxVariant val)
+{
+    //FIXME: Add proper wxDateTime support to wxVariant..
+    wxDateTime dateval;
+
+    SetColNull((UWORD)colNumber, val.IsNull());
+
+    if (!val.IsNull())
+    {
+        if ((colDefs[colNumber].SqlCtype == SQL_C_DATE)
+            || (colDefs[colNumber].SqlCtype == SQL_C_TIME)
+            || (colDefs[colNumber].SqlCtype == SQL_C_TIMESTAMP))
+        {
+            //Returns null if invalid!
+            if (!dateval.ParseDate(val.GetString()))
+                SetColNull((UWORD)colNumber, true);
+        }

 
 

+        switch (colDefs[colNumber].SqlCtype)
+        {
+#if wxUSE_UNICODE
+    #if defined(SQL_WCHAR)
+            case SQL_WCHAR:
+    #endif
+    #if defined(SQL_WVARCHAR)
+            case SQL_WVARCHAR:
+    #endif
+#endif
+            case SQL_CHAR:
+            case SQL_VARCHAR:
+                csstrncpyt((wxChar *)(colDefs[colNumber].PtrDataObj),
+                           val.GetString().c_str(),
+                           colDefs[colNumber].SzDataObj-1);  //TODO: glt ??? * sizeof(wxChar) ???
+                break;
+            case SQL_C_LONG:
+            case SQL_C_SLONG:
+                *(long *)(colDefs[colNumber].PtrDataObj) = val;
+                break;
+            case SQL_C_SHORT:
+            case SQL_C_SSHORT:
+                *(short *)(colDefs[colNumber].PtrDataObj) = (short)val.GetLong();
+                break;
+            case SQL_C_ULONG:
+                *(unsigned long *)(colDefs[colNumber].PtrDataObj) = val.GetLong();
+                break;
+            case SQL_C_TINYINT:
+                *(wxChar *)(colDefs[colNumber].PtrDataObj) = val.GetChar();
+                break;
+            case SQL_C_UTINYINT:
+                *(wxChar *)(colDefs[colNumber].PtrDataObj) = val.GetChar();
+                break;
+            case SQL_C_USHORT:
+                *(unsigned short *)(colDefs[colNumber].PtrDataObj) = (unsigned short)val.GetLong();
+                break;
+            //FIXME: Add proper wxDateTime support to wxVariant..
+            case SQL_C_DATE:
+                {
+                    DATE_STRUCT *dataptr =
+                        (DATE_STRUCT *)colDefs[colNumber].PtrDataObj;
+
+                    dataptr->year   = (SWORD)dateval.GetYear();
+                    dataptr->month  = (UWORD)(dateval.GetMonth()+1);
+                    dataptr->day    = (UWORD)dateval.GetDay();
+                }
+                break;
+            case SQL_C_TIME:
+                {
+                    TIME_STRUCT *dataptr =
+                        (TIME_STRUCT *)colDefs[colNumber].PtrDataObj;
+
+                    dataptr->hour   = dateval.GetHour();
+                    dataptr->minute = dateval.GetMinute();
+                    dataptr->second = dateval.GetSecond();
+                }
+                break;
+            case SQL_C_TIMESTAMP:
+                {
+                    TIMESTAMP_STRUCT *dataptr =
+                        (TIMESTAMP_STRUCT *)colDefs[colNumber].PtrDataObj;
+                    dataptr->year   = (SWORD)dateval.GetYear();
+                    dataptr->month  = (UWORD)(dateval.GetMonth()+1);
+                    dataptr->day    = (UWORD)dateval.GetDay();
+
+                    dataptr->hour   = dateval.GetHour();
+                    dataptr->minute = dateval.GetMinute();
+                    dataptr->second = dateval.GetSecond();
+                }
+                break;
+            case SQL_C_DOUBLE:
+                *(double *)(colDefs[colNumber].PtrDataObj) = val;
+                break;
+            default:
+                assert(0);
+        }  // switch
+    }  // if (!val.IsNull())
+}  // wxDbTable::SetCol()
+
+
+GenericKey wxDbTable::GetKey()
+{
+    void *blk;
+    wxChar *blkptr;
+
+    blk = malloc(m_keysize);
+    blkptr = (wxChar *) blk;
+
+    int i;
+    for (i=0; i < m_numCols; i++)
+    {
+        if (colDefs[i].KeyField)
+        {
+            memcpy(blkptr,colDefs[i].PtrDataObj, colDefs[i].SzDataObj);
+            blkptr += colDefs[i].SzDataObj;
+        }
+    }
+
+    GenericKey k = GenericKey(blk, m_keysize);
+    free(blk);
+
+    return k;
+}  // wxDbTable::GetKey()
+
+
+void wxDbTable::SetKey(const GenericKey& k)
+{
+    void    *blk;
+    wxChar  *blkptr;
+
+    blk = k.GetBlk();
+    blkptr = (wxChar *)blk;
+
+    int i;
+    for (i=0; i < m_numCols; i++)
+    {
+        if (colDefs[i].KeyField)
+        {
+            SetColNull((UWORD)i, false);
+            memcpy(colDefs[i].PtrDataObj, blkptr, colDefs[i].SzDataObj);
+            blkptr += colDefs[i].SzDataObj;
+        }
+    }
+}  // wxDbTable::SetKey()
+
+
+#endif  // wxUSE_ODBC