Added m_destroybuf initialisation

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

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 02c1ab48f76c81c2c7ca3289ae8efe711d115868..1bf55b9171821b75fab83f57dd5bae8b836e5203 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -1,11 +1,13 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        db.cpp
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        db.cpp

-// Purpose:     Implementation of the wxDB class.  The wxDB class represents a connection
-//              to an ODBC data source.  The wxDB class allows operations on the data
+// Purpose:     Implementation of the wxDb class.  The wxDb class represents a connection
+//              to an ODBC data source.  The wxDb class allows operations on the data

 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by: George Tasker
 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by: George Tasker

-// Mods:        Dec, 1998: 
+//              Bart Jourquin
+//              Mark Johnson, wxWindows@mj10777.de
+// Mods:        Dec, 1998:

 //                -Added support for SQL statement logging and database cataloging
 // Mods:        April, 1999
 //                -Added QUERY_ONLY mode support to reduce default number of cursors
 //                -Added support for SQL statement logging and database cataloging
 // Mods:        April, 1999
 //                -Added QUERY_ONLY mode support to reduce default number of cursors


@@ -35,6 +37,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

+

 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
 // Use this line for wxWindows v2.x
 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
 // Use this line for wxWindows v2.x


@@ -42,12 +45,12 @@
 
 #if wxMAJOR_VERSION == 2
     #ifdef __GNUG__
 
 #if wxMAJOR_VERSION == 2
     #ifdef __GNUG__

-    #pragma implementation "db.h"
+        #pragma implementation "db.h"

     #endif
 #endif
 
 #ifdef DBDEBUG_CONSOLE
     #endif
 #endif
 
 #ifdef DBDEBUG_CONSOLE

-    #include <iostream.h>
+    #include "wx/ioswrap.h"

 #endif
 
 #ifdef    __BORLANDC__
 #endif
 
 #ifdef    __BORLANDC__


@@ -61,11 +64,13 @@
         #include "wx/list.h"
         #include "wx/utils.h"
         #include "wx/msgdlg.h"
         #include "wx/list.h"
         #include "wx/utils.h"
         #include "wx/msgdlg.h"

+        #include "wx/log.h"

     #endif
     #include "wx/filefn.h"
     #include "wx/wxchar.h"
 #endif
 
     #endif
     #include "wx/filefn.h"
     #include "wx/wxchar.h"
 #endif
 

+

 #if wxMAJOR_VERSION == 1
 #    if defined(wx_msw) || defined(wx_x)
 #        ifdef WX_PRECOMP
 #if wxMAJOR_VERSION == 1
 #    if defined(wx_msw) || defined(wx_x)
 #        ifdef WX_PRECOMP


@@ -91,7 +96,8 @@
     #include "wx/db.h"
 #endif
 
     #include "wx/db.h"
 #endif
 

-DbList WXDLLEXPORT *PtrBegDbList = 0;
+WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList = 0;
+

 
 char const *SQL_LOG_FILENAME         = "sqllog.txt";
 char const *SQL_CATALOG_FILENAME     = "catalog.txt";
 
 char const *SQL_LOG_FILENAME         = "sqllog.txt";
 char const *SQL_CATALOG_FILENAME     = "catalog.txt";


@@ -101,61 +107,153 @@ char const *SQL_CATALOG_FILENAME     = "catalog.txt";
 #endif
 
 // SQL Log defaults to be used by GetDbConnection
 #endif
 
 // SQL Log defaults to be used by GetDbConnection

-enum sqlLog SQLLOGstate = sqlLogOFF;
+wxDbSqlLogState SQLLOGstate = sqlLogOFF;

 
 

-//char SQLLOGfn[DB_PATH_MAX+1] = SQL_LOG_FILENAME;
-char *SQLLOGfn         = (char*) SQL_LOG_FILENAME;
+//char SQLLOGfn[wxDB_PATH_MAX+1] = SQL_LOG_FILENAME;
+//wxChar *SQLLOGfn         = (wxChar*) SQL_LOG_FILENAME;
+static wxString SQLLOGfn = SQL_LOG_FILENAME;

 
 

-// The wxDB::errorList is copied to this variable when the wxDB object
+// The wxDb::errorList is copied to this variable when the wxDb object

 // is closed.  This way, the error list is still available after the
 // database object is closed.  This is necessary if the database
 // connection fails so the calling application can show the operator
 // is closed.  This way, the error list is still available after the
 // database object is closed.  This is necessary if the database
 // connection fails so the calling application can show the operator

-// why the connection failed.  Note: as each wxDB object is closed, it
-// will overwrite the errors of the previously destroyed wxDB object in 
-// this variable.
+// why the connection failed.  Note: as each wxDb object is closed, it
+// will overwrite the errors of the previously destroyed wxDb object in
+// this variable.  NOTE: This occurs during a CLOSE, not a FREEing of the
+// connection

 char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 

-
-/********** wxColFor Constructor **********/
-wxColFor::wxColFor()
+// This type defines the return row-struct form 
+// SQLTablePrivileges, and is used by wxDB::TablePrivileges.
+typedef struct 

 {
 {

-    i_Nation = 0;                // 0=EU, 1=UK, 2=International, 3=US
-    s_Field  = "";
+   wxChar        tableQual[128+1];
+   wxChar        tableOwner[128+1];
+   wxChar        tableName[128+1];
+   wxChar        grantor[128+1];
+   wxChar        grantee[128+1];
+   wxChar        privilege[128+1];
+   wxChar        grantable[3+1];
+} wxDbTablePrivilegeInfo;
+
+
+/********** wxDbColFor Constructor **********/
+wxDbColFor::wxDbColFor()
+{
+    s_Field = "";

     int i;
     for (i=0;i<7;i++)
     {
         s_Format[i] = "";
     int i;
     for (i=0;i<7;i++)
     {
         s_Format[i] = "";

-        s_Menge[i]  = "";
-        i_Menge[i]  = 0;
+        s_Amount[i] = "";
+        i_Amount[i] = 0;

     }
     }

-    Format(1,DB_DATA_TYPE_VARCHAR,0,0,0);      // the Function that does the work
-}  // wxColFor::wxColFor()
+    i_Nation      = 0;                     // 0=EU, 1=UK, 2=International, 3=US
+    i_dbDataType  = 0;
+    i_sqlDataType = 0;
+    Format(1,DB_DATA_TYPE_VARCHAR,0,0,0);  // the Function that does the work
+}  // wxDbColFor::wxDbColFor()
+
+
+wxDbColFor::~wxDbColFor()
+{
+}  // wxDbColFor::~wxDbColFor()
+
+
+/********** wxDbColInf Con / Destructor **********/
+wxDbColInf::wxDbColInf()
+{
+    catalog[0]      = 0;
+    schema[0]       = 0;
+    tableName[0]    = 0;
+    colName[0]      = 0;
+    sqlDataType     = 0;
+    typeName[0]     = 0;
+    columnSize      = 0;
+    bufferLength    = 0;
+    decimalDigits   = 0;
+    numPrecRadix    = 0;
+    nullable        = 0;
+    remarks[0]      = 0;
+    dbDataType      = 0;
+    PkCol           = 0;
+    PkTableName[0]  = 0;
+    FkCol           = 0;
+    FkTableName[0]  = 0;
+    pColFor         = NULL;
+}  // wxDbColInf::wxDbColFor()
+
+
+wxDbColInf::~wxDbColInf()
+{
+    if (pColFor)
+        delete pColFor;
+    pColFor = NULL;
+}  // wxDbColInf::~wxDbColInf()
+
+
+/********** wxDbTableInf Constructor ********/
+wxDbTableInf::wxDbTableInf()
+{
+    tableName[0]    = 0;
+    tableType[0]    = 0;
+    tableRemarks[0] = 0;
+    numCols         = 0;
+    pColInf         = NULL;
+}  // wxDbTableInf::wxDbTableFor()
+

 
 

+/********** wxDbTableInf Constructor ********/
+wxDbTableInf::~wxDbTableInf()
+{
+    if (pColInf)
+        delete [] pColInf;
+    pColInf = NULL;
+}  // wxDbTableInf::~wxDbTableInf()
+
+
+/********** wxDbInf Constructor *************/
+wxDbInf::wxDbInf()
+{
+    catalog[0]      = 0; 
+    schema[0]       = 0;
+    numTables       = 0;
+    pTableInf       = NULL;
+}  // wxDbInf::wxDbFor()

 
 

-wxColFor::~wxColFor()
+
+/********** wxDbInf Destructor *************/
+wxDbInf::~wxDbInf()

 {
 {

-}  // wxColFor::~wxColFor()
+  if (pTableInf)
+    delete [] pTableInf;
+  pTableInf = NULL;
+}  // wxDbInf::~wxDbInf()
+

 
 

+/*************************************************/

 
 

-int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSize,short decimalDigits)
+
+int wxDbColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSize,short decimalDigits)

 {
     // ----------------------------------------------------------------------------------------
 {
     // ----------------------------------------------------------------------------------------

-    // -- 19991224 : mj10777@gmx.net : Create
+    // -- 19991224 : mj10777 : Create

     // There is still a lot of work to do here, but it is a start
     // It handles all the basic data-types that I have run into up to now
     // There is still a lot of work to do here, but it is a start
     // It handles all the basic data-types that I have run into up to now

-    // The main work will have be with Dates and float Formatting (US 1,000.00 ; EU 1.000,00)
-    // There are wxWindow plans for locale support and the new wxDateTime.
-    // - if they define some constants (wxEUROPEAN) that can be gloably used,
+    // The main work will have be with Dates and float Formatting 
+    //    (US 1,000.00 ; EU 1.000,00)
+    // There are wxWindow plans for locale support and the new wxDateTime.  If
+    //    they define some constants (wxEUROPEAN) that can be gloably used,

     //    they should be used here.
     // ----------------------------------------------------------------------------------------
     //    they should be used here.
     // ----------------------------------------------------------------------------------------

-    // There should also be a Function to scan in a string to fill the variable
+    // There should also be a function to scan in a string to fill the variable

     // ----------------------------------------------------------------------------------------
     wxString Temp0;
     // ----------------------------------------------------------------------------------------
     wxString Temp0;

-    i_Nation      = Nation;                                 // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
+    i_Nation      = Nation;                                       // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US

     i_dbDataType  = dbDataType;
     i_sqlDataType = sqlDataType;
     i_dbDataType  = dbDataType;
     i_sqlDataType = sqlDataType;

-    s_Field.Printf("%s%d",s_Menge[1].c_str(),i_Menge[1]);   // OK for VARCHAR, INTEGER and FLOAT
-    if (i_dbDataType == 0)                                  // Filter unsupported dbDataTypes
+    s_Field.Printf(wxT("%s%d"),s_Amount[1].c_str(),i_Amount[1]);  // OK for VARCHAR, INTEGER and FLOAT
+    if (i_dbDataType == 0)                                        // Filter unsupported dbDataTypes

     {
         if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR))
             i_dbDataType = DB_DATA_TYPE_VARCHAR;
     {
         if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR))
             i_dbDataType = DB_DATA_TYPE_VARCHAR;


@@ -175,17 +273,17 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
     switch(i_dbDataType)     // -A-> Still a lot of proper formatting to do
     {
         case DB_DATA_TYPE_VARCHAR:
     switch(i_dbDataType)     // -A-> Still a lot of proper formatting to do
     {
         case DB_DATA_TYPE_VARCHAR:

-            s_Field = "%s";        //
+            s_Field = "%s";

             break;
         case DB_DATA_TYPE_INTEGER:
             break;
         case DB_DATA_TYPE_INTEGER:

-            s_Field = "%d";        //
+            s_Field = "%d";

             break;
         case DB_DATA_TYPE_FLOAT:
             if (decimalDigits == 0)
                 decimalDigits = 2;
             Temp0 = "%";
             break;
         case DB_DATA_TYPE_FLOAT:
             if (decimalDigits == 0)
                 decimalDigits = 2;
             Temp0 = "%";

-            Temp0.Printf("%s%d.%d",Temp0.c_str(),columnSize,decimalDigits);
-            s_Field.Printf("%sf",Temp0.c_str());        //
+            Temp0.Printf(wxT("%s%d.%d"),Temp0.c_str(),columnSize,decimalDigits);
+            s_Field.Printf(wxT("%sf"),Temp0.c_str());

             break;
         case DB_DATA_TYPE_DATE:
             if (i_Nation == 0)      // timestamp       YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE)
             break;
         case DB_DATA_TYPE_DATE:
             if (i_Nation == 0)      // timestamp       YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE)


@@ -210,59 +308,69 @@ int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSiz
             }
             break;
         default:
             }
             break;
         default:

-            s_Field.Printf("-E-> unknown Format(%d)-sql(%d)",dbDataType,sqlDataType);        //
+            s_Field.Printf(wxT("Unknown Format(%d)-SQL(%d)"),dbDataType,sqlDataType);        //

             break;
     };
     return TRUE;
             break;
     };
     return TRUE;

-}  // wxColFor::Format()
+}  // wxDbColFor::Format()
+

 
 

+/********** wxDb Constructors **********/
+wxDb::wxDb(HENV &aHenv, bool FwdOnlyCursors)
+{
+    // Copy the HENV into the db class
+    henv = aHenv;
+    fwdOnlyCursors = FwdOnlyCursors;
+    initialize();
+} // wxDb::wxDb()

 
 

-/********** wxDB Constructor **********/
-wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)
+
+void wxDb::initialize()
+/*
+ * Private member function that sets all wxDb member variables to 
+ * known values at creation of the wxDb
+ */

 {
     int i;
 
     fpSqlLog      = 0;            // Sql Log file pointer
     sqlLogState   = sqlLogOFF;    // By default, logging is turned off
     nTables       = 0;
 {
     int i;
 
     fpSqlLog      = 0;            // Sql Log file pointer
     sqlLogState   = sqlLogOFF;    // By default, logging is turned off
     nTables       = 0;

-    
-    wxStrcpy(sqlState,"");
-    wxStrcpy(errorMsg,"");
+    dbmsType      = dbmsUNIDENTIFIED;
+
+    wxStrcpy(sqlState,wxT(""));
+    wxStrcpy(errorMsg,wxT(""));

     nativeError = cbErrorMsg = 0;
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
     nativeError = cbErrorMsg = 0;
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)

-        wxStrcpy(errorList[i], "");
+        wxStrcpy(errorList[i], wxT(""));

 
     // Init typeInf structures
 
     // Init typeInf structures

-    wxStrcpy(typeInfVarchar.TypeName,"");
+    wxStrcpy(typeInfVarchar.TypeName,wxT(""));

     typeInfVarchar.FsqlType      = 0;
     typeInfVarchar.Precision     = 0;
     typeInfVarchar.CaseSensitive = 0;
     typeInfVarchar.MaximumScale  = 0;
 
     typeInfVarchar.FsqlType      = 0;
     typeInfVarchar.Precision     = 0;
     typeInfVarchar.CaseSensitive = 0;
     typeInfVarchar.MaximumScale  = 0;
 

-    wxStrcpy(typeInfInteger.TypeName,"");
+    wxStrcpy(typeInfInteger.TypeName,wxT(""));

     typeInfInteger.FsqlType      = 0;
     typeInfInteger.Precision     = 0;
     typeInfInteger.CaseSensitive = 0;
     typeInfInteger.MaximumScale  = 0;
 
     typeInfInteger.FsqlType      = 0;
     typeInfInteger.Precision     = 0;
     typeInfInteger.CaseSensitive = 0;
     typeInfInteger.MaximumScale  = 0;
 

-    wxStrcpy(typeInfFloat.TypeName,"");
+    wxStrcpy(typeInfFloat.TypeName,wxT(""));

     typeInfFloat.FsqlType      = 0;
     typeInfFloat.Precision     = 0;
     typeInfFloat.CaseSensitive = 0;
     typeInfFloat.MaximumScale  = 0;
 
     typeInfFloat.FsqlType      = 0;
     typeInfFloat.Precision     = 0;
     typeInfFloat.CaseSensitive = 0;
     typeInfFloat.MaximumScale  = 0;
 

-    wxStrcpy(typeInfDate.TypeName,"");
+    wxStrcpy(typeInfDate.TypeName,wxT(""));

     typeInfDate.FsqlType      = 0;
     typeInfDate.Precision     = 0;
     typeInfDate.CaseSensitive = 0;
     typeInfDate.MaximumScale  = 0;
     typeInfDate.FsqlType      = 0;
     typeInfDate.Precision     = 0;
     typeInfDate.CaseSensitive = 0;
     typeInfDate.MaximumScale  = 0;

-    
+

     // Error reporting is turned OFF by default
     silent = TRUE;
     // Error reporting is turned OFF by default
     silent = TRUE;

-    
-    // Copy the HENV into the db class
-    henv = aHenv;
-    fwdOnlyCursors = FwdOnlyCursors;

 
     // Allocate a data source connection handle
     if (SQLAllocConnect(henv, &hdbc) != SQL_SUCCESS)
 
     // Allocate a data source connection handle
     if (SQLAllocConnect(henv, &hdbc) != SQL_SUCCESS)


@@ -273,12 +381,11 @@ wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)
 
     // Mark database as not open as of yet
     dbIsOpen = FALSE;
 
     // Mark database as not open as of yet
     dbIsOpen = FALSE;

-
-} // wxDB::wxDB()
+}  // wxDb::initialize()

 
 
 
 

-/********** wxDB::Open() **********/
-bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
+/********** wxDb::Open() **********/
+bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr)

 {
     assert(Dsn && wxStrlen(Dsn));
     dsn        = Dsn;
 {
     assert(Dsn && wxStrlen(Dsn));
     dsn        = Dsn;


@@ -302,14 +409,23 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
     }
 
     // Connect to the data source
     }
 
     // Connect to the data source

-    retcode = SQLConnect(hdbc, (UCHAR FAR *) Dsn, SQL_NTS,
-                         (UCHAR FAR *) Uid, SQL_NTS,
-                         (UCHAR FAR *) AuthStr,SQL_NTS);
+    retcode = SQLConnect(hdbc, (UCHAR FAR *) dsn, SQL_NTS,
+                         (UCHAR FAR *) uid, SQL_NTS,
+                         (UCHAR FAR *) authStr,SQL_NTS);
+
+/*

     if (retcode == SQL_SUCCESS_WITH_INFO)
         DispAllErrors(henv, hdbc);
     else if (retcode != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 
     if (retcode == SQL_SUCCESS_WITH_INFO)
         DispAllErrors(henv, hdbc);
     else if (retcode != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 

+       if (retcode == SQL_ERROR)
+               return(DispAllErrors(henv, hdbc));
+*/
+       if ((retcode != SQL_SUCCESS) &&
+        (retcode != SQL_SUCCESS_WITH_INFO))
+               return(DispAllErrors(henv, hdbc));
+

 /*
     If using Intersolv branded ODBC drivers, this is the place where you would substitute
     your branded driver license information
 /*
     If using Intersolv branded ODBC drivers, this is the place where you would substitute
     your branded driver license information


@@ -326,11 +442,11 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
         return(DispAllErrors(henv, hdbc));
 
     // Set Connection Options
         return(DispAllErrors(henv, hdbc));
 
     // Set Connection Options

-    if (! setConnectionOptions())
+    if (!setConnectionOptions())

         return(FALSE);
 
     // Query the data source for inf. about itself
         return(FALSE);
 
     // Query the data source for inf. about itself

-    if (! getDbInfo())
+    if (!getDbInfo())

         return(FALSE);
 
     // Query the data source regarding data type information
         return(FALSE);
 
     // Query the data source regarding data type information


@@ -375,8 +491,8 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
     // SQL_INTEGER            type name = 'LONG', Precision = 10
 
     // VARCHAR = Variable length character string
     // SQL_INTEGER            type name = 'LONG', Precision = 10
 
     // VARCHAR = Variable length character string

-    if (! getDataTypeInfo(SQL_VARCHAR, typeInfVarchar))
-        if (! getDataTypeInfo(SQL_CHAR, typeInfVarchar))
+    if (!getDataTypeInfo(SQL_VARCHAR, typeInfVarchar))
+        if (!getDataTypeInfo(SQL_CHAR, typeInfVarchar))

             return(FALSE);
         else
             typeInfVarchar.FsqlType = SQL_CHAR;
             return(FALSE);
         else
             typeInfVarchar.FsqlType = SQL_CHAR;


@@ -384,11 +500,12 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
         typeInfVarchar.FsqlType = SQL_VARCHAR;
 
     // Float
         typeInfVarchar.FsqlType = SQL_VARCHAR;
 
     // Float

-    if (! getDataTypeInfo(SQL_DOUBLE, typeInfFloat))
-        if (! getDataTypeInfo(SQL_REAL, typeInfFloat))
-            if (! getDataTypeInfo(SQL_FLOAT, typeInfFloat))
-                if (! getDataTypeInfo(SQL_DECIMAL, typeInfFloat))
-                    if (! getDataTypeInfo(SQL_NUMERIC, typeInfFloat))
+    if (!getDataTypeInfo(SQL_DOUBLE,typeInfFloat))
+
+        if (!getDataTypeInfo(SQL_REAL,typeInfFloat))
+            if (!getDataTypeInfo(SQL_FLOAT,typeInfFloat))
+                if (!getDataTypeInfo(SQL_DECIMAL,typeInfFloat))
+                    if (!getDataTypeInfo(SQL_NUMERIC,typeInfFloat))

                         return(FALSE);
                     else
                         typeInfFloat.FsqlType = SQL_NUMERIC;
                         return(FALSE);
                     else
                         typeInfFloat.FsqlType = SQL_NUMERIC;


@@ -402,27 +519,29 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
         typeInfFloat.FsqlType = SQL_DOUBLE;
 
     // Integer
         typeInfFloat.FsqlType = SQL_DOUBLE;
 
     // Integer

-    if (! getDataTypeInfo(SQL_INTEGER, typeInfInteger))
+    if (!getDataTypeInfo(SQL_INTEGER, typeInfInteger))     
+    {

         // If SQL_INTEGER is not supported, use the floating point
         // data type to store integers as well as floats
         // If SQL_INTEGER is not supported, use the floating point
         // data type to store integers as well as floats

-        if (! getDataTypeInfo(typeInfFloat.FsqlType, typeInfInteger))
+        if (!getDataTypeInfo(typeInfFloat.FsqlType, typeInfInteger))

             return(FALSE);
         else
             typeInfInteger.FsqlType = typeInfFloat.FsqlType;
             return(FALSE);
         else
             typeInfInteger.FsqlType = typeInfFloat.FsqlType;

+    }

     else
         typeInfInteger.FsqlType = SQL_INTEGER;
 
     // Date/Time
     if (Dbms() != dbmsDBASE)
     else
         typeInfInteger.FsqlType = SQL_INTEGER;
 
     // Date/Time
     if (Dbms() != dbmsDBASE)

-   {
-        if (! getDataTypeInfo(SQL_TIMESTAMP, typeInfDate))
+    {
+        if (! getDataTypeInfo(SQL_TIMESTAMP,typeInfDate))

             return(FALSE);
         else
             typeInfDate.FsqlType = SQL_TIMESTAMP;
     }
     else
     {
             return(FALSE);
         else
             typeInfDate.FsqlType = SQL_TIMESTAMP;
     }
     else
     {

-        if (! getDataTypeInfo(SQL_DATE, typeInfDate))
+        if (!getDataTypeInfo(SQL_DATE,typeInfDate))

             return(FALSE);
         else
             typeInfDate.FsqlType = SQL_DATE;
             return(FALSE);
         else
             typeInfDate.FsqlType = SQL_DATE;


@@ -439,27 +558,171 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
     // Completed Successfully
     return(TRUE);
 
     // Completed Successfully
     return(TRUE);
 

-} // wxDB::Open()
+} // wxDb::Open()
+
+
+bool wxDb::Open(wxDb *copyDb)
+{
+    dsn        = (char *)copyDb->GetDatasourceName();
+    uid        = (char *)copyDb->GetUsername();
+    authStr    = (char *)copyDb->GetPassword();
+
+    RETCODE retcode;
+
+    if (!FwdOnlyCursors())
+    {
+        // Specify that the ODBC cursor library be used, if needed.  This must be
+        // specified before the connection is made.
+        retcode = SQLSetConnectOption(hdbc, SQL_ODBC_CURSORS, SQL_CUR_USE_IF_NEEDED);
+
+#ifdef DBDEBUG_CONSOLE
+        if (retcode == SQL_SUCCESS)
+            cout << "SQLSetConnectOption(CURSOR_LIB) successful" << endl;
+        else
+            cout << "SQLSetConnectOption(CURSOR_LIB) failed" << endl;
+#endif
+    }
+
+    // Connect to the data source
+    retcode = SQLConnect(hdbc, (UCHAR FAR *) dsn, SQL_NTS,
+                         (UCHAR FAR *) uid, SQL_NTS,
+                         (UCHAR FAR *) authStr, SQL_NTS);
+
+       if (retcode == SQL_ERROR)
+               return(DispAllErrors(henv, hdbc));
+
+/*
+    If using Intersolv branded ODBC drivers, this is the place where you would substitute
+    your branded driver license information
+
+    SQLSetConnectOption(hdbc, 1041, (UDWORD) "");
+    SQLSetConnectOption(hdbc, 1042, (UDWORD) "");
+*/
+
+    // Mark database as open
+    dbIsOpen = TRUE;
+
+    // Allocate a statement handle for the database connection
+    if (SQLAllocStmt(hdbc, &hstmt) != SQL_SUCCESS)
+        return(DispAllErrors(henv, hdbc));
+
+    // Set Connection Options
+    if (!setConnectionOptions())
+        return(FALSE);
+
+    // Instead of Querying the data source for info about itself, it can just be copied
+    // from the wxDb instance that was passed in (copyDb).
+    wxStrcpy(dbInf.serverName,copyDb->dbInf.serverName);
+    wxStrcpy(dbInf.databaseName,copyDb->dbInf.databaseName);
+    wxStrcpy(dbInf.dbmsName,copyDb->dbInf.dbmsName);
+    wxStrcpy(dbInf.dbmsVer,copyDb->dbInf.dbmsVer);
+    dbInf.maxConnections = copyDb->dbInf.maxConnections;
+    dbInf.maxStmts = copyDb->dbInf.maxStmts;
+    wxStrcpy(dbInf.driverName,copyDb->dbInf.driverName);
+    wxStrcpy(dbInf.odbcVer,copyDb->dbInf.odbcVer);
+    wxStrcpy(dbInf.drvMgrOdbcVer,copyDb->dbInf.drvMgrOdbcVer);
+    wxStrcpy(dbInf.driverVer,copyDb->dbInf.driverVer);
+    dbInf.apiConfLvl = copyDb->dbInf.apiConfLvl;
+    dbInf.cliConfLvl = copyDb->dbInf.cliConfLvl;
+    dbInf.sqlConfLvl = copyDb->dbInf.sqlConfLvl;
+    wxStrcpy(dbInf.outerJoins,copyDb->dbInf.outerJoins);
+    wxStrcpy(dbInf.procedureSupport,copyDb->dbInf.procedureSupport);
+    wxStrcpy(dbInf.accessibleTables,copyDb->dbInf.accessibleTables);
+    dbInf.cursorCommitBehavior = copyDb->dbInf.cursorCommitBehavior;
+    dbInf.cursorRollbackBehavior = copyDb->dbInf.cursorRollbackBehavior;
+    dbInf.supportNotNullClause = copyDb->dbInf.supportNotNullClause;
+    wxStrcpy(dbInf.supportIEF,copyDb->dbInf.supportIEF);
+    dbInf.txnIsolation = copyDb->dbInf.txnIsolation;
+    dbInf.txnIsolationOptions = copyDb->dbInf.txnIsolationOptions;
+    dbInf.fetchDirections = copyDb->dbInf.fetchDirections;
+    dbInf.lockTypes = copyDb->dbInf.lockTypes;
+    dbInf.posOperations = copyDb->dbInf.posOperations;
+    dbInf.posStmts = copyDb->dbInf.posStmts;
+    dbInf.scrollConcurrency = copyDb->dbInf.scrollConcurrency;
+    dbInf.scrollOptions = copyDb->dbInf.scrollOptions;
+    dbInf.staticSensitivity = copyDb->dbInf.staticSensitivity;
+    dbInf.txnCapable = copyDb->dbInf.txnCapable;
+    dbInf.loginTimeout = copyDb->dbInf.loginTimeout;
+
+    // VARCHAR = Variable length character string
+    typeInfVarchar.FsqlType = copyDb->typeInfVarchar.FsqlType;
+    wxStrcpy(typeInfVarchar.TypeName, copyDb->typeInfVarchar.TypeName);
+    typeInfVarchar.Precision        = copyDb->typeInfVarchar.Precision;
+    typeInfVarchar.CaseSensitive    = copyDb->typeInfVarchar.CaseSensitive;
+    typeInfVarchar.MaximumScale     = copyDb->typeInfVarchar.MaximumScale;
+
+    // Float
+    typeInfFloat.FsqlType = copyDb->typeInfFloat.FsqlType;
+    wxStrcpy(typeInfFloat.TypeName, copyDb->typeInfFloat.TypeName);
+    typeInfFloat.Precision        = copyDb->typeInfFloat.Precision;
+    typeInfFloat.CaseSensitive    = copyDb->typeInfFloat.CaseSensitive;
+    typeInfFloat.MaximumScale     = copyDb->typeInfFloat.MaximumScale;
+
+    // Integer
+    typeInfInteger.FsqlType = copyDb->typeInfInteger.FsqlType;
+    wxStrcpy(typeInfInteger.TypeName, copyDb->typeInfInteger.TypeName);
+    typeInfInteger.Precision        = copyDb->typeInfInteger.Precision;
+    typeInfInteger.CaseSensitive    = copyDb->typeInfInteger.CaseSensitive;
+    typeInfInteger.MaximumScale     = copyDb->typeInfInteger.MaximumScale;
+
+    // Date/Time
+    typeInfDate.FsqlType = copyDb->typeInfDate.FsqlType;
+    wxStrcpy(typeInfDate.TypeName, copyDb->typeInfDate.TypeName);
+    typeInfDate.Precision        = copyDb->typeInfDate.Precision;
+    typeInfDate.CaseSensitive    = copyDb->typeInfDate.CaseSensitive;
+    typeInfDate.MaximumScale     = copyDb->typeInfDate.MaximumScale;
+
+#ifdef DBDEBUG_CONSOLE
+    cout << "VARCHAR DATA TYPE: " << typeInfVarchar.TypeName << endl;
+    cout << "INTEGER DATA TYPE: " << typeInfInteger.TypeName << endl;
+    cout << "FLOAT   DATA TYPE: " << typeInfFloat.TypeName << endl;
+    cout << "DATE    DATA TYPE: " << typeInfDate.TypeName << endl;
+    cout << endl;
+#endif
+
+    // Completed Successfully
+    return(TRUE);
+} // wxDb::Open() 2

 
 
 
 

-/********** wxDB::setConnectionOptions() **********/
-bool wxDB::setConnectionOptions(void)
+/********** wxDb::setConnectionOptions() **********/
+bool wxDb::setConnectionOptions(void)

 /*
  * NOTE: The Intersolv/Oracle 7 driver was "Not Capable" of setting the login timeout.
  */
 {
 /*
  * NOTE: The Intersolv/Oracle 7 driver was "Not Capable" of setting the login timeout.
  */
 {

+    SWORD cb;
+
+    // I need to get the DBMS name here, because some of the connection options
+    // are database specific and need to call the Dbms() function.
+    if (SQLGetInfo(hdbc, SQL_DBMS_NAME, (UCHAR*) dbInf.dbmsName, 40, &cb) != SQL_SUCCESS)
+        return(DispAllErrors(henv, hdbc));
+

     SQLSetConnectOption(hdbc, SQL_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF);
     SQLSetConnectOption(hdbc, SQL_OPT_TRACE, SQL_OPT_TRACE_OFF);
     SQLSetConnectOption(hdbc, SQL_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF);
     SQLSetConnectOption(hdbc, SQL_OPT_TRACE, SQL_OPT_TRACE_OFF);

+//     SQLSetConnectOption(hdbc, SQL_TXN_ISOLATION, SQL_TXN_READ_COMMITTED);  // No dirty reads
+
+    // By default, MS Sql Server closes cursors on commit and rollback.  The following
+    // call to SQLSetConnectOption() is needed to force SQL Server to preserve cursors
+    // after a transaction.  This is a driver specific option and is not part of the
+    // ODBC standard.  Note: this behavior is specific to the ODBC interface to SQL Server.
+    // The database settings don't have any effect one way or the other.
+    if (Dbms() == dbmsMS_SQL_SERVER)
+    {
+        const long SQL_PRESERVE_CURSORS = 1204L;
+        const long SQL_PC_ON = 1L;
+        SQLSetConnectOption(hdbc, SQL_PRESERVE_CURSORS, SQL_PC_ON);
+    }

 
     // Display the connection options to verify them
 #ifdef DBDEBUG_CONSOLE
     long l;
 
     // Display the connection options to verify them
 #ifdef DBDEBUG_CONSOLE
     long l;

-    cout << ">>>>> CONNECTION OPTIONS <<<<<<" << endl;
-    
+    cout << "****** CONNECTION OPTIONS ******" << endl;
+

     if (SQLGetConnectOption(hdbc, SQL_AUTOCOMMIT, &l) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
     cout << "AUTOCOMMIT: " << (l == SQL_AUTOCOMMIT_OFF ? "OFF" : "ON") << endl;
     if (SQLGetConnectOption(hdbc, SQL_AUTOCOMMIT, &l) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
     cout << "AUTOCOMMIT: " << (l == SQL_AUTOCOMMIT_OFF ? "OFF" : "ON") << endl;

-    
+

     if (SQLGetConnectOption(hdbc, SQL_ODBC_CURSORS, &l) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
     cout << "ODBC CURSORS: ";
     if (SQLGetConnectOption(hdbc, SQL_ODBC_CURSORS, &l) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
     cout << "ODBC CURSORS: ";


@@ -476,7 +739,7 @@ bool wxDB::setConnectionOptions(void)
             break;
         }
         cout << endl;
             break;
         }
         cout << endl;

-    
+

     if (SQLGetConnectOption(hdbc, SQL_OPT_TRACE, &l) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
     cout << "TRACING: " << (l == SQL_OPT_TRACE_OFF ? "OFF" : "ON") << endl;
     if (SQLGetConnectOption(hdbc, SQL_OPT_TRACE, &l) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
     cout << "TRACING: " << (l == SQL_OPT_TRACE_OFF ? "OFF" : "ON") << endl;


@@ -487,11 +750,11 @@ bool wxDB::setConnectionOptions(void)
     // Completed Successfully
     return(TRUE);
 
     // Completed Successfully
     return(TRUE);
 

-} // wxDB::setConnectionOptions()
+} // wxDb::setConnectionOptions()

 
 
 
 

-/********** wxDB::getDbInfo() **********/
-bool wxDB::getDbInfo(void)
+/********** wxDb::getDbInfo() **********/
+bool wxDb::getDbInfo(void)

 {
     SWORD cb;
     RETCODE retcode;
 {
     SWORD cb;
     RETCODE retcode;


@@ -536,7 +799,11 @@ bool wxDB::getDbInfo(void)
         return(DispAllErrors(henv, hdbc));
 
     if (SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, (UCHAR*) &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 
     if (SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, (UCHAR*) &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb) != SQL_SUCCESS)

-        return(DispAllErrors(henv, hdbc));
+//        return(DispAllErrors(henv, hdbc));
+    {
+        // Not all drivers support this call - Nick Gorham(unixODBC)
+        dbInf.cliConfLvl = 0;
+    }

 
     if (SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, (UCHAR*) &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 
     if (SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, (UCHAR*) &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));


@@ -547,6 +814,9 @@ bool wxDB::getDbInfo(void)
     if (SQLGetInfo(hdbc, SQL_PROCEDURES, (UCHAR*) dbInf.procedureSupport, 2, &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 
     if (SQLGetInfo(hdbc, SQL_PROCEDURES, (UCHAR*) dbInf.procedureSupport, 2, &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 

+    if (SQLGetInfo(hdbc, SQL_ACCESSIBLE_TABLES, (UCHAR*) dbInf.accessibleTables, 2, &cb) != SQL_SUCCESS)
+        return(DispAllErrors(henv, hdbc));
+

     if (SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, (UCHAR*) &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 
     if (SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, (UCHAR*) &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc));
 


@@ -593,7 +863,7 @@ bool wxDB::getDbInfo(void)
         return(DispAllErrors(henv, hdbc));
 
 #ifdef DBDEBUG_CONSOLE
         return(DispAllErrors(henv, hdbc));
 
 #ifdef DBDEBUG_CONSOLE

-    cout << ">>>>> DATA SOURCE INFORMATION <<<<<" << endl;
+    cout << "***** DATA SOURCE INFORMATION *****" << endl;

     cout << "SERVER Name: " << dbInf.serverName << endl;
     cout << "DBMS Name: " << dbInf.dbmsName << "; DBMS Version: " << dbInf.dbmsVer << endl;
     cout << "ODBC Version: " << dbInf.odbcVer << "; Driver Version: " << dbInf.driverVer << endl;
     cout << "SERVER Name: " << dbInf.serverName << endl;
     cout << "DBMS Name: " << dbInf.dbmsName << "; DBMS Version: " << dbInf.dbmsVer << endl;
     cout << "ODBC Version: " << dbInf.odbcVer << "; Driver Version: " << dbInf.driverVer << endl;


@@ -618,16 +888,16 @@ bool wxDB::getDbInfo(void)
     cout << "SQL Conf. Level: ";
     switch(dbInf.sqlConfLvl)
     {
     cout << "SQL Conf. Level: ";
     switch(dbInf.sqlConfLvl)
     {

-        case SQL_OSC_MINIMUM:     cout << "Minimum Grammer";     break;
-        case SQL_OSC_CORE:        cout << "Core Grammer";        break;
-        case SQL_OSC_EXTENDED:    cout << "Extended Grammer";    break;
+        case SQL_OSC_MINIMUM:     cout << "Minimum Grammar";     break;
+        case SQL_OSC_CORE:        cout << "Core Grammar";        break;
+        case SQL_OSC_EXTENDED:    cout << "Extended Grammar";    break;

     }
     cout << endl;
 
     cout << "Max. Connections: "       << dbInf.maxConnections   << endl;
     cout << "Outer Joins: "            << dbInf.outerJoins       << endl;
     cout << "Support for Procedures: " << dbInf.procedureSupport << endl;
     }
     cout << endl;
 
     cout << "Max. Connections: "       << dbInf.maxConnections   << endl;
     cout << "Outer Joins: "            << dbInf.outerJoins       << endl;
     cout << "Support for Procedures: " << dbInf.procedureSupport << endl;

-
+    cout << "All tables accessible : " << dbInf.accessibleTables << endl;

     cout << "Cursor COMMIT Behavior: ";
     switch(dbInf.cursorCommitBehavior)
     {
     cout << "Cursor COMMIT Behavior: ";
     switch(dbInf.cursorCommitBehavior)
     {


@@ -790,21 +1060,21 @@ bool wxDB::getDbInfo(void)
     // Completed Successfully
     return(TRUE);
 
     // Completed Successfully
     return(TRUE);
 

-} // wxDB::getDbInfo()
+} // wxDb::getDbInfo()

 
 
 
 

-/********** wxDB::getDataTypeInfo() **********/
-bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
+/********** wxDb::getDataTypeInfo() **********/
+bool wxDb::getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo)

 {
 /*
  * fSqlType will be something like SQL_VARCHAR.  This parameter determines
  * the data type inf. is gathered for.
  *
 {
 /*
  * fSqlType will be something like SQL_VARCHAR.  This parameter determines
  * the data type inf. is gathered for.
  *

- * SqlTypeInfo is a structure that is filled in with data type information,
+ * wxDbSqlTypeInfo is a structure that is filled in with data type information,

  */
     RETCODE retcode;
  */
     RETCODE retcode;

-    SDWORD cbRet;
-
+    SDWORD  cbRet;
+   

     // Get information about the data type specified
     if (SQLGetTypeInfo(hstmt, fSqlType) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));
     // Get information about the data type specified
     if (SQLGetTypeInfo(hstmt, fSqlType) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));


@@ -823,16 +1093,27 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
     if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));
 
     if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));
 

+    // BJO 20000503: no more needed with new GetColumns...
+#if  OLD_GETCOLUMNS

     // BJO 991209
     if (Dbms() == dbmsMY_SQL)
     {
     // BJO 991209
     if (Dbms() == dbmsMY_SQL)
     {

-        if (!strcmp(structSQLTypeInfo.TypeName, "middleint")) strcpy(structSQLTypeInfo.TypeName, "mediumint");
-        if (!strcmp(structSQLTypeInfo.TypeName, "middleint unsigned")) strcpy(structSQLTypeInfo.TypeName, "mediumint unsigned");
-        if (!strcmp(structSQLTypeInfo.TypeName, "integer")) strcpy(structSQLTypeInfo.TypeName, "int");
-        if (!strcmp(structSQLTypeInfo.TypeName, "integer unsigned")) strcpy(structSQLTypeInfo.TypeName, "int unsigned");
-        if (!strcmp(structSQLTypeInfo.TypeName, "middleint")) strcpy(structSQLTypeInfo.TypeName, "mediumint");
-        if (!strcmp(structSQLTypeInfo.TypeName, "varchar")) strcpy(structSQLTypeInfo.TypeName, "char");
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "middleint")) wxStrcpy(structSQLTypeInfo.TypeName, "mediumint");
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "middleint unsigned")) wxStrcpy(structSQLTypeInfo.TypeName, "mediumint unsigned");
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "integer")) wxStrcpy(structSQLTypeInfo.TypeName, "int");
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "integer unsigned")) wxStrcpy(structSQLTypeInfo.TypeName, "int unsigned");
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "middleint")) wxStrcpy(structSQLTypeInfo.TypeName, "mediumint");
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "varchar")) wxStrcpy(structSQLTypeInfo.TypeName, "char");

     }
     }

+    
+    // BJO 20000427 : OpenLink driver 
+    if (!wxStrncmp(dbInf.driverName, "oplodbc", 7) ||
+        !wxStrncmp(dbInf.driverName, "OLOD", 4))    
+    {
+        if (!wxStrcmp(structSQLTypeInfo.TypeName, "double precision"))
+            wxStrcpy(structSQLTypeInfo.TypeName, "real");
+    }
+#endif

 
     if (SQLGetData(hstmt, 3, SQL_C_LONG, (UCHAR*) &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));
 
     if (SQLGetData(hstmt, 3, SQL_C_LONG, (UCHAR*) &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));


@@ -854,11 +1135,11 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
     // Completed Successfully
     return(TRUE);
 
     // Completed Successfully
     return(TRUE);
 

-} // wxDB::getDataTypeInfo()
+} // wxDb::getDataTypeInfo()

 
 
 
 

-/********** wxDB::Close() **********/
-void wxDB::Close(void)
+/********** wxDb::Close() **********/
+void wxDb::Close(void)

 {
     // Close the Sql Log file
     if (fpSqlLog)
 {
     // Close the Sql Log file
     if (fpSqlLog)


@@ -886,18 +1167,18 @@ void wxDB::Close(void)
     assert(nTables == 0);
 
 #ifdef __WXDEBUG__
     assert(nTables == 0);
 
 #ifdef __WXDEBUG__

-    CstructTablesInUse *tiu;
+    wxTablesInUse *tiu;

     wxNode *pNode;
     pNode = TablesInUse.First();
     wxString s,s2;
     while (pNode)
     {
     wxNode *pNode;
     pNode = TablesInUse.First();
     wxString s,s2;
     while (pNode)
     {

-        tiu = (CstructTablesInUse *)pNode->Data();
+        tiu = (wxTablesInUse *)pNode->Data();

         if (tiu->pDb == this)
         {
         if (tiu->pDb == this)
         {

-            s.sprintf("(%-20s)     tableID:[%6lu]     pDb:[%p]", tiu->tableName,tiu->tableID,tiu->pDb);
-            s2.sprintf("Orphaned found using pDb:[%p]",this);
-            wxMessageBox (s,s2);
+            s.sprintf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
+            s2.sprintf(wxT("Orphaned found using pDb:[%p]"),this);
+            wxLogDebug (s.c_str(),s2.c_str());

         }
         pNode = pNode->Next();
     }
         }
         pNode = pNode->Next();
     }


@@ -908,11 +1189,14 @@ void wxDB::Close(void)
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
         wxStrcpy(DBerrorList[i],errorList[i]);
 
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
         wxStrcpy(DBerrorList[i],errorList[i]);
 

-} // wxDB::Close()
+    dbmsType   = dbmsUNIDENTIFIED;
+    dbIsOpen = FALSE;
+
+} // wxDb::Close()

 
 
 
 

-/********** wxDB::CommitTrans() **********/
-bool wxDB::CommitTrans(void)
+/********** wxDb::CommitTrans() **********/
+bool wxDb::CommitTrans(void)

 {
     if (this)
     {
 {
     if (this)
     {


@@ -924,11 +1208,11 @@ bool wxDB::CommitTrans(void)
     // Completed successfully
     return(TRUE);
 
     // Completed successfully
     return(TRUE);
 

-} // wxDB::CommitTrans()
+} // wxDb::CommitTrans()

 
 
 
 

-/********** wxDB::RollbackTrans() **********/
-bool wxDB::RollbackTrans(void)
+/********** wxDb::RollbackTrans() **********/
+bool wxDb::RollbackTrans(void)

 {
     // Rollback the transaction
     if (SQLTransact(henv, hdbc, SQL_ROLLBACK) != SQL_SUCCESS)
 {
     // Rollback the transaction
     if (SQLTransact(henv, hdbc, SQL_ROLLBACK) != SQL_SUCCESS)


@@ -937,74 +1221,90 @@ bool wxDB::RollbackTrans(void)
     // Completed successfully
     return(TRUE);
 
     // Completed successfully
     return(TRUE);
 

-} // wxDB::RollbackTrans()
+} // wxDb::RollbackTrans()

 
 
 
 

-/********** wxDB::DispAllErrors() **********/
-bool wxDB::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
+/********** wxDb::DispAllErrors() **********/
+bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
+/*
+ * This function is called internally whenever an error condition prevents the user's
+ * request from being executed.  This function will query the datasource as to the
+ * actual error(s) that just occured on the previous request of the datasource.
+ *
+ * The function will retrieve each error condition from the datasource and 
+ * sprintf the codes/text values into a string which it then logs via logError().
+ * If in DBDEBUG_CONSOLE mode, the constructed string will be displayed in the console
+ * window and program execution will be paused until the user presses a key.
+ *
+ * This function always returns a FALSE, so that functions which call this function
+ * can have a line like "return (DispAllErrors(henv, hdbc));" to indicate the failure
+ * of the users request, so that the calling code can then process the error msg log
+ */

 {
 {

-//    char odbcErrMsg[DB_MAX_ERROR_MSG_LEN];

     wxString odbcErrMsg;
 
     while (SQLError(aHenv, aHdbc, aHstmt, (UCHAR FAR *) sqlState, &nativeError, (UCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
     {
         odbcErrMsg.sprintf("SQL State = %s\nNative Error Code = %li\nError Message = %s\n", sqlState, nativeError, errorMsg);
     wxString odbcErrMsg;
 
     while (SQLError(aHenv, aHdbc, aHstmt, (UCHAR FAR *) sqlState, &nativeError, (UCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
     {
         odbcErrMsg.sprintf("SQL State = %s\nNative Error Code = %li\nError Message = %s\n", sqlState, nativeError, errorMsg);

-        logError(odbcErrMsg.GetData(), sqlState);
+        logError(odbcErrMsg.c_str(), sqlState);

         if (!silent)
         {
 #ifdef DBDEBUG_CONSOLE
             // When run in console mode, use standard out to display errors.
         if (!silent)
         {
 #ifdef DBDEBUG_CONSOLE
             // When run in console mode, use standard out to display errors.

-            cout << odbcErrMsg.GetData() << endl;
+            cout << odbcErrMsg.c_str() << endl;

             cout << "Press any key to continue..." << endl;
             getchar();
 #endif
             cout << "Press any key to continue..." << endl;
             getchar();
 #endif

-        }

 
 #ifdef __WXDEBUG__
 
 #ifdef __WXDEBUG__

-        wxMessageBox(odbcErrMsg.GetData(),"DEBUG MESSAGE from DispAllErrors()");
+            wxLogDebug(odbcErrMsg.c_str(),wxT("ODBC DEBUG MESSAGE from DispAllErrors()"));

 #endif
 #endif

+        }

     }
 
     return(FALSE);  // This function always returns false.
 
     }
 
     return(FALSE);  // This function always returns false.
 

-} // wxDB::DispAllErrors()
+} // wxDb::DispAllErrors()

 
 
 
 

-/********** wxDB::GetNextError() **********/
-bool wxDB::GetNextError(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
+/********** wxDb::GetNextError() **********/
+bool wxDb::GetNextError(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)

 {
     if (SQLError(aHenv, aHdbc, aHstmt, (UCHAR FAR *) sqlState, &nativeError, (UCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
         return(TRUE);
     else
         return(FALSE);
 
 {
     if (SQLError(aHenv, aHdbc, aHstmt, (UCHAR FAR *) sqlState, &nativeError, (UCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS)
         return(TRUE);
     else
         return(FALSE);
 

-} // wxDB::GetNextError()
+} // wxDb::GetNextError()

 
 
 
 

-/********** wxDB::DispNextError() **********/
-void wxDB::DispNextError(void)
+/********** wxDb::DispNextError() **********/
+void wxDb::DispNextError(void)

 {
 {

-//    char odbcErrMsg[DB_MAX_ERROR_MSG_LEN];

     wxString odbcErrMsg;
 
     odbcErrMsg.sprintf("SQL State = %s\nNative Error Code = %li\nError Message = %s\n", sqlState, nativeError, errorMsg);
     wxString odbcErrMsg;
 
     odbcErrMsg.sprintf("SQL State = %s\nNative Error Code = %li\nError Message = %s\n", sqlState, nativeError, errorMsg);

-    logError(odbcErrMsg.GetData(), sqlState);
+    logError(odbcErrMsg.c_str(), sqlState);

 
     if (silent)
         return;
 
 #ifdef DBDEBUG_CONSOLE
     // When run in console mode, use standard out to display errors.
 
     if (silent)
         return;
 
 #ifdef DBDEBUG_CONSOLE
     // When run in console mode, use standard out to display errors.

-    cout << odbcErrMsg.GetData() << endl;
+    cout << odbcErrMsg.c_str() << endl;

     cout << "Press any key to continue..."  << endl;
     getchar();
 #endif
 
     cout << "Press any key to continue..."  << endl;
     getchar();
 #endif
 

-} // wxDB::DispNextError()
+#ifdef __WXDEBUG__
+    wxLogDebug(odbcErrMsg,wxT("ODBC DEBUG MESSAGE"));
+#endif  // __WXDEBUG__
+
+} // wxDb::DispNextError()

 
 
 
 

-/********** wxDB::logError() **********/
-void wxDB::logError(const char *errMsg, const char *SQLState)
+/********** wxDb::logError() **********/
+void wxDb::logError(const char *errMsg, const char *SQLState)

 {
     assert(errMsg && wxStrlen(errMsg));
 
 {
     assert(errMsg && wxStrlen(errMsg));
 


@@ -1028,201 +1328,200 @@ void wxDB::logError(const char *errMsg, const char *SQLState)
     // Add the errmsg to the sql log
     WriteSqlLog(errMsg);
 
     // Add the errmsg to the sql log
     WriteSqlLog(errMsg);
 

-}  // wxDB::logError()
+}  // wxDb::logError()

 
 
 
 

-/**********wxDB::TranslateSqlState()  **********/
-int wxDB::TranslateSqlState(const char *SQLState)
+/**********wxDb::TranslateSqlState()  **********/
+int wxDb::TranslateSqlState(const wxChar *SQLState)

 {
 {

-    if (!wxStrcmp(SQLState, "01000"))
+    if (!wxStrcmp(SQLState, wxT("01000")))

         return(DB_ERR_GENERAL_WARNING);
         return(DB_ERR_GENERAL_WARNING);

-    if (!wxStrcmp(SQLState, "01002"))
+    if (!wxStrcmp(SQLState, wxT("01002")))

         return(DB_ERR_DISCONNECT_ERROR);
         return(DB_ERR_DISCONNECT_ERROR);

-    if (!wxStrcmp(SQLState, "01004"))
+    if (!wxStrcmp(SQLState, wxT("01004")))

         return(DB_ERR_DATA_TRUNCATED);
         return(DB_ERR_DATA_TRUNCATED);

-    if (!wxStrcmp(SQLState, "01006"))
+    if (!wxStrcmp(SQLState, wxT("01006")))

         return(DB_ERR_PRIV_NOT_REVOKED);
         return(DB_ERR_PRIV_NOT_REVOKED);

-    if (!wxStrcmp(SQLState, "01S00"))
+    if (!wxStrcmp(SQLState, wxT("01S00")))

         return(DB_ERR_INVALID_CONN_STR_ATTR);
         return(DB_ERR_INVALID_CONN_STR_ATTR);

-    if (!wxStrcmp(SQLState, "01S01"))
+    if (!wxStrcmp(SQLState, wxT("01S01")))

         return(DB_ERR_ERROR_IN_ROW);
         return(DB_ERR_ERROR_IN_ROW);

-    if (!wxStrcmp(SQLState, "01S02"))
+    if (!wxStrcmp(SQLState, wxT("01S02")))

         return(DB_ERR_OPTION_VALUE_CHANGED);
         return(DB_ERR_OPTION_VALUE_CHANGED);

-    if (!wxStrcmp(SQLState, "01S03"))
+    if (!wxStrcmp(SQLState, wxT("01S03")))

         return(DB_ERR_NO_ROWS_UPD_OR_DEL);
         return(DB_ERR_NO_ROWS_UPD_OR_DEL);

-    if (!wxStrcmp(SQLState, "01S04"))
+    if (!wxStrcmp(SQLState, wxT("01S04")))

         return(DB_ERR_MULTI_ROWS_UPD_OR_DEL);
         return(DB_ERR_MULTI_ROWS_UPD_OR_DEL);

-    if (!wxStrcmp(SQLState, "07001"))
+    if (!wxStrcmp(SQLState, wxT("07001")))

         return(DB_ERR_WRONG_NO_OF_PARAMS);
         return(DB_ERR_WRONG_NO_OF_PARAMS);

-    if (!wxStrcmp(SQLState, "07006"))
+    if (!wxStrcmp(SQLState, wxT("07006")))

         return(DB_ERR_DATA_TYPE_ATTR_VIOL);
         return(DB_ERR_DATA_TYPE_ATTR_VIOL);

-    if (!wxStrcmp(SQLState, "08001"))
+    if (!wxStrcmp(SQLState, wxT("08001")))

         return(DB_ERR_UNABLE_TO_CONNECT);
         return(DB_ERR_UNABLE_TO_CONNECT);

-    if (!wxStrcmp(SQLState, "08002"))
+    if (!wxStrcmp(SQLState, wxT("08002")))

         return(DB_ERR_CONNECTION_IN_USE);
         return(DB_ERR_CONNECTION_IN_USE);

-    if (!wxStrcmp(SQLState, "08003"))
+    if (!wxStrcmp(SQLState, wxT("08003")))

         return(DB_ERR_CONNECTION_NOT_OPEN);
         return(DB_ERR_CONNECTION_NOT_OPEN);

-    if (!wxStrcmp(SQLState, "08004"))
+    if (!wxStrcmp(SQLState, wxT("08004")))

         return(DB_ERR_REJECTED_CONNECTION);
         return(DB_ERR_REJECTED_CONNECTION);

-    if (!wxStrcmp(SQLState, "08007"))
+    if (!wxStrcmp(SQLState, wxT("08007")))

         return(DB_ERR_CONN_FAIL_IN_TRANS);
         return(DB_ERR_CONN_FAIL_IN_TRANS);

-    if (!wxStrcmp(SQLState, "08S01"))
+    if (!wxStrcmp(SQLState, wxT("08S01")))

         return(DB_ERR_COMM_LINK_FAILURE);
         return(DB_ERR_COMM_LINK_FAILURE);

-    if (!wxStrcmp(SQLState, "21S01"))
+    if (!wxStrcmp(SQLState, wxT("21S01")))

         return(DB_ERR_INSERT_VALUE_LIST_MISMATCH);
         return(DB_ERR_INSERT_VALUE_LIST_MISMATCH);

-    if (!wxStrcmp(SQLState, "21S02"))
+    if (!wxStrcmp(SQLState, wxT("21S02")))

         return(DB_ERR_DERIVED_TABLE_MISMATCH);
         return(DB_ERR_DERIVED_TABLE_MISMATCH);

-    if (!wxStrcmp(SQLState, "22001"))
+    if (!wxStrcmp(SQLState, wxT("22001")))

         return(DB_ERR_STRING_RIGHT_TRUNC);
         return(DB_ERR_STRING_RIGHT_TRUNC);

-    if (!wxStrcmp(SQLState, "22003"))
+    if (!wxStrcmp(SQLState, wxT("22003")))

         return(DB_ERR_NUMERIC_VALUE_OUT_OF_RNG);
         return(DB_ERR_NUMERIC_VALUE_OUT_OF_RNG);

-    if (!wxStrcmp(SQLState, "22005"))
+    if (!wxStrcmp(SQLState, wxT("22005")))

         return(DB_ERR_ERROR_IN_ASSIGNMENT);
         return(DB_ERR_ERROR_IN_ASSIGNMENT);

-    if (!wxStrcmp(SQLState, "22008"))
+    if (!wxStrcmp(SQLState, wxT("22008")))

         return(DB_ERR_DATETIME_FLD_OVERFLOW);
         return(DB_ERR_DATETIME_FLD_OVERFLOW);

-    if (!wxStrcmp(SQLState, "22012"))
+    if (!wxStrcmp(SQLState, wxT("22012")))

         return(DB_ERR_DIVIDE_BY_ZERO);
         return(DB_ERR_DIVIDE_BY_ZERO);

-    if (!wxStrcmp(SQLState, "22026"))
+    if (!wxStrcmp(SQLState, wxT("22026")))

         return(DB_ERR_STR_DATA_LENGTH_MISMATCH);
         return(DB_ERR_STR_DATA_LENGTH_MISMATCH);

-    if (!wxStrcmp(SQLState, "23000"))
+    if (!wxStrcmp(SQLState, wxT("23000")))

         return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);
         return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);

-    if (!wxStrcmp(SQLState, "24000"))
+    if (!wxStrcmp(SQLState, wxT("24000")))

         return(DB_ERR_INVALID_CURSOR_STATE);
         return(DB_ERR_INVALID_CURSOR_STATE);

-    if (!wxStrcmp(SQLState, "25000"))
+    if (!wxStrcmp(SQLState, wxT("25000")))

         return(DB_ERR_INVALID_TRANS_STATE);
         return(DB_ERR_INVALID_TRANS_STATE);

-    if (!wxStrcmp(SQLState, "28000"))
+    if (!wxStrcmp(SQLState, wxT("28000")))

         return(DB_ERR_INVALID_AUTH_SPEC);
         return(DB_ERR_INVALID_AUTH_SPEC);

-    if (!wxStrcmp(SQLState, "34000"))
+    if (!wxStrcmp(SQLState, wxT("34000")))

         return(DB_ERR_INVALID_CURSOR_NAME);
         return(DB_ERR_INVALID_CURSOR_NAME);

-    if (!wxStrcmp(SQLState, "37000"))
+    if (!wxStrcmp(SQLState, wxT("37000")))

         return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL);
         return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL);

-    if (!wxStrcmp(SQLState, "3C000"))
+    if (!wxStrcmp(SQLState, wxT("3C000")))

         return(DB_ERR_DUPLICATE_CURSOR_NAME);
         return(DB_ERR_DUPLICATE_CURSOR_NAME);

-    if (!wxStrcmp(SQLState, "40001"))
+    if (!wxStrcmp(SQLState, wxT("40001")))

         return(DB_ERR_SERIALIZATION_FAILURE);
         return(DB_ERR_SERIALIZATION_FAILURE);

-    if (!wxStrcmp(SQLState, "42000"))
+    if (!wxStrcmp(SQLState, wxT("42000")))

         return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL2);
         return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL2);

-    if (!wxStrcmp(SQLState, "70100"))
+    if (!wxStrcmp(SQLState, wxT("70100")))

         return(DB_ERR_OPERATION_ABORTED);
         return(DB_ERR_OPERATION_ABORTED);

-    if (!wxStrcmp(SQLState, "IM001"))
+    if (!wxStrcmp(SQLState, wxT("IM001")))

         return(DB_ERR_UNSUPPORTED_FUNCTION);
         return(DB_ERR_UNSUPPORTED_FUNCTION);

-    if (!wxStrcmp(SQLState, "IM002"))
+    if (!wxStrcmp(SQLState, wxT("IM002")))

         return(DB_ERR_NO_DATA_SOURCE);
         return(DB_ERR_NO_DATA_SOURCE);

-    if (!wxStrcmp(SQLState, "IM003"))
+    if (!wxStrcmp(SQLState, wxT("IM003")))

         return(DB_ERR_DRIVER_LOAD_ERROR);
         return(DB_ERR_DRIVER_LOAD_ERROR);

-    if (!wxStrcmp(SQLState, "IM004"))
+    if (!wxStrcmp(SQLState, wxT("IM004")))

         return(DB_ERR_SQLALLOCENV_FAILED);
         return(DB_ERR_SQLALLOCENV_FAILED);

-    if (!wxStrcmp(SQLState, "IM005"))
+    if (!wxStrcmp(SQLState, wxT("IM005")))

         return(DB_ERR_SQLALLOCCONNECT_FAILED);
         return(DB_ERR_SQLALLOCCONNECT_FAILED);

-    if (!wxStrcmp(SQLState, "IM006"))
+    if (!wxStrcmp(SQLState, wxT("IM006")))

         return(DB_ERR_SQLSETCONNECTOPTION_FAILED);
         return(DB_ERR_SQLSETCONNECTOPTION_FAILED);

-    if (!wxStrcmp(SQLState, "IM007"))
+    if (!wxStrcmp(SQLState, wxT("IM007")))

         return(DB_ERR_NO_DATA_SOURCE_DLG_PROHIB);
         return(DB_ERR_NO_DATA_SOURCE_DLG_PROHIB);

-    if (!wxStrcmp(SQLState, "IM008"))
+    if (!wxStrcmp(SQLState, wxT("IM008")))

         return(DB_ERR_DIALOG_FAILED);
         return(DB_ERR_DIALOG_FAILED);

-    if (!wxStrcmp(SQLState, "IM009"))
+    if (!wxStrcmp(SQLState, wxT("IM009")))

         return(DB_ERR_UNABLE_TO_LOAD_TRANSLATION_DLL);
         return(DB_ERR_UNABLE_TO_LOAD_TRANSLATION_DLL);

-    if (!wxStrcmp(SQLState, "IM010"))
+    if (!wxStrcmp(SQLState, wxT("IM010")))

         return(DB_ERR_DATA_SOURCE_NAME_TOO_LONG);
         return(DB_ERR_DATA_SOURCE_NAME_TOO_LONG);

-    if (!wxStrcmp(SQLState, "IM011"))
+    if (!wxStrcmp(SQLState, wxT("IM011")))

         return(DB_ERR_DRIVER_NAME_TOO_LONG);
         return(DB_ERR_DRIVER_NAME_TOO_LONG);

-    if (!wxStrcmp(SQLState, "IM012"))
+    if (!wxStrcmp(SQLState, wxT("IM012")))

         return(DB_ERR_DRIVER_KEYWORD_SYNTAX_ERROR);
         return(DB_ERR_DRIVER_KEYWORD_SYNTAX_ERROR);

-    if (!wxStrcmp(SQLState, "IM013"))
+    if (!wxStrcmp(SQLState, wxT("IM013")))

         return(DB_ERR_TRACE_FILE_ERROR);
         return(DB_ERR_TRACE_FILE_ERROR);

-    if (!wxStrcmp(SQLState, "S0001"))
+    if (!wxStrcmp(SQLState, wxT("S0001")))

         return(DB_ERR_TABLE_OR_VIEW_ALREADY_EXISTS);
         return(DB_ERR_TABLE_OR_VIEW_ALREADY_EXISTS);

-    if (!wxStrcmp(SQLState, "S0002"))
+    if (!wxStrcmp(SQLState, wxT("S0002")))

         return(DB_ERR_TABLE_NOT_FOUND);
         return(DB_ERR_TABLE_NOT_FOUND);

-    if (!wxStrcmp(SQLState, "S0011"))
+    if (!wxStrcmp(SQLState, wxT("S0011")))

         return(DB_ERR_INDEX_ALREADY_EXISTS);
         return(DB_ERR_INDEX_ALREADY_EXISTS);

-    if (!wxStrcmp(SQLState, "S0012"))
+    if (!wxStrcmp(SQLState, wxT("S0012")))

         return(DB_ERR_INDEX_NOT_FOUND);
         return(DB_ERR_INDEX_NOT_FOUND);

-    if (!wxStrcmp(SQLState, "S0021"))
+    if (!wxStrcmp(SQLState, wxT("S0021")))

         return(DB_ERR_COLUMN_ALREADY_EXISTS);
         return(DB_ERR_COLUMN_ALREADY_EXISTS);

-    if (!wxStrcmp(SQLState, "S0022"))
+    if (!wxStrcmp(SQLState, wxT("S0022")))

         return(DB_ERR_COLUMN_NOT_FOUND);
         return(DB_ERR_COLUMN_NOT_FOUND);

-    if (!wxStrcmp(SQLState, "S0023"))
+    if (!wxStrcmp(SQLState, wxT("S0023")))

         return(DB_ERR_NO_DEFAULT_FOR_COLUMN);
         return(DB_ERR_NO_DEFAULT_FOR_COLUMN);

-    if (!wxStrcmp(SQLState, "S1000"))
+    if (!wxStrcmp(SQLState, wxT("S1000")))

         return(DB_ERR_GENERAL_ERROR);
         return(DB_ERR_GENERAL_ERROR);

-    if (!wxStrcmp(SQLState, "S1001"))
+    if (!wxStrcmp(SQLState, wxT("S1001")))

         return(DB_ERR_MEMORY_ALLOCATION_FAILURE);
         return(DB_ERR_MEMORY_ALLOCATION_FAILURE);

-    if (!wxStrcmp(SQLState, "S1002"))
+    if (!wxStrcmp(SQLState, wxT("S1002")))

         return(DB_ERR_INVALID_COLUMN_NUMBER);
         return(DB_ERR_INVALID_COLUMN_NUMBER);

-    if (!wxStrcmp(SQLState, "S1003"))
+    if (!wxStrcmp(SQLState, wxT("S1003")))

         return(DB_ERR_PROGRAM_TYPE_OUT_OF_RANGE);
         return(DB_ERR_PROGRAM_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1004"))
+    if (!wxStrcmp(SQLState, wxT("S1004")))

         return(DB_ERR_SQL_DATA_TYPE_OUT_OF_RANGE);
         return(DB_ERR_SQL_DATA_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1008"))
+    if (!wxStrcmp(SQLState, wxT("S1008")))

         return(DB_ERR_OPERATION_CANCELLED);
         return(DB_ERR_OPERATION_CANCELLED);

-    if (!wxStrcmp(SQLState, "S1009"))
+    if (!wxStrcmp(SQLState, wxT("S1009")))

         return(DB_ERR_INVALID_ARGUMENT_VALUE);
         return(DB_ERR_INVALID_ARGUMENT_VALUE);

-    if (!wxStrcmp(SQLState, "S1010"))
+    if (!wxStrcmp(SQLState, wxT("S1010")))

         return(DB_ERR_FUNCTION_SEQUENCE_ERROR);
         return(DB_ERR_FUNCTION_SEQUENCE_ERROR);

-    if (!wxStrcmp(SQLState, "S1011"))
+    if (!wxStrcmp(SQLState, wxT("S1011")))

         return(DB_ERR_OPERATION_INVALID_AT_THIS_TIME);
         return(DB_ERR_OPERATION_INVALID_AT_THIS_TIME);

-    if (!wxStrcmp(SQLState, "S1012"))
+    if (!wxStrcmp(SQLState, wxT("S1012")))

         return(DB_ERR_INVALID_TRANS_OPERATION_CODE);
         return(DB_ERR_INVALID_TRANS_OPERATION_CODE);

-    if (!wxStrcmp(SQLState, "S1015"))
+    if (!wxStrcmp(SQLState, wxT("S1015")))

         return(DB_ERR_NO_CURSOR_NAME_AVAIL);
         return(DB_ERR_NO_CURSOR_NAME_AVAIL);

-    if (!wxStrcmp(SQLState, "S1090"))
+    if (!wxStrcmp(SQLState, wxT("S1090")))

         return(DB_ERR_INVALID_STR_OR_BUF_LEN);
         return(DB_ERR_INVALID_STR_OR_BUF_LEN);

-    if (!wxStrcmp(SQLState, "S1091"))
+    if (!wxStrcmp(SQLState, wxT("S1091")))

         return(DB_ERR_DESCRIPTOR_TYPE_OUT_OF_RANGE);
         return(DB_ERR_DESCRIPTOR_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1092"))
+    if (!wxStrcmp(SQLState, wxT("S1092")))

         return(DB_ERR_OPTION_TYPE_OUT_OF_RANGE);
         return(DB_ERR_OPTION_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1093"))
+    if (!wxStrcmp(SQLState, wxT("S1093")))

         return(DB_ERR_INVALID_PARAM_NO);
         return(DB_ERR_INVALID_PARAM_NO);

-    if (!wxStrcmp(SQLState, "S1094"))
+    if (!wxStrcmp(SQLState, wxT("S1094")))

         return(DB_ERR_INVALID_SCALE_VALUE);
         return(DB_ERR_INVALID_SCALE_VALUE);

-    if (!wxStrcmp(SQLState, "S1095"))
+    if (!wxStrcmp(SQLState, wxT("S1095")))

         return(DB_ERR_FUNCTION_TYPE_OUT_OF_RANGE);
         return(DB_ERR_FUNCTION_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1096"))
+    if (!wxStrcmp(SQLState, wxT("S1096")))

         return(DB_ERR_INF_TYPE_OUT_OF_RANGE);
         return(DB_ERR_INF_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1097"))
+    if (!wxStrcmp(SQLState, wxT("S1097")))

         return(DB_ERR_COLUMN_TYPE_OUT_OF_RANGE);
         return(DB_ERR_COLUMN_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1098"))
+    if (!wxStrcmp(SQLState, wxT("S1098")))

         return(DB_ERR_SCOPE_TYPE_OUT_OF_RANGE);
         return(DB_ERR_SCOPE_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1099"))
+    if (!wxStrcmp(SQLState, wxT("S1099")))

         return(DB_ERR_NULLABLE_TYPE_OUT_OF_RANGE);
         return(DB_ERR_NULLABLE_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1100"))
+    if (!wxStrcmp(SQLState, wxT("S1100")))

         return(DB_ERR_UNIQUENESS_OPTION_TYPE_OUT_OF_RANGE);
         return(DB_ERR_UNIQUENESS_OPTION_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1101"))
+    if (!wxStrcmp(SQLState, wxT("S1101")))

         return(DB_ERR_ACCURACY_OPTION_TYPE_OUT_OF_RANGE);
         return(DB_ERR_ACCURACY_OPTION_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1103"))
+    if (!wxStrcmp(SQLState, wxT("S1103")))

         return(DB_ERR_DIRECTION_OPTION_OUT_OF_RANGE);
         return(DB_ERR_DIRECTION_OPTION_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1104"))
+    if (!wxStrcmp(SQLState, wxT("S1104")))

         return(DB_ERR_INVALID_PRECISION_VALUE);
         return(DB_ERR_INVALID_PRECISION_VALUE);

-    if (!wxStrcmp(SQLState, "S1105"))
+    if (!wxStrcmp(SQLState, wxT("S1105")))

         return(DB_ERR_INVALID_PARAM_TYPE);
         return(DB_ERR_INVALID_PARAM_TYPE);

-    if (!wxStrcmp(SQLState, "S1106"))
+    if (!wxStrcmp(SQLState, wxT("S1106")))

         return(DB_ERR_FETCH_TYPE_OUT_OF_RANGE);
         return(DB_ERR_FETCH_TYPE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1107"))
+    if (!wxStrcmp(SQLState, wxT("S1107")))

         return(DB_ERR_ROW_VALUE_OUT_OF_RANGE);
         return(DB_ERR_ROW_VALUE_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1108"))
+    if (!wxStrcmp(SQLState, wxT("S1108")))

         return(DB_ERR_CONCURRENCY_OPTION_OUT_OF_RANGE);
         return(DB_ERR_CONCURRENCY_OPTION_OUT_OF_RANGE);

-    if (!wxStrcmp(SQLState, "S1109"))
+    if (!wxStrcmp(SQLState, wxT("S1109")))

         return(DB_ERR_INVALID_CURSOR_POSITION);
         return(DB_ERR_INVALID_CURSOR_POSITION);

-    if (!wxStrcmp(SQLState, "S1110"))
+    if (!wxStrcmp(SQLState, wxT("S1110")))

         return(DB_ERR_INVALID_DRIVER_COMPLETION);
         return(DB_ERR_INVALID_DRIVER_COMPLETION);

-    if (!wxStrcmp(SQLState, "S1111"))
+    if (!wxStrcmp(SQLState, wxT("S1111")))

         return(DB_ERR_INVALID_BOOKMARK_VALUE);
         return(DB_ERR_INVALID_BOOKMARK_VALUE);

-    if (!wxStrcmp(SQLState, "S1C00"))
+    if (!wxStrcmp(SQLState, wxT("S1C00")))

         return(DB_ERR_DRIVER_NOT_CAPABLE);
         return(DB_ERR_DRIVER_NOT_CAPABLE);

-    if (!wxStrcmp(SQLState, "S1T00"))
+    if (!wxStrcmp(SQLState, wxT("S1T00")))

         return(DB_ERR_TIMEOUT_EXPIRED);
 
     // No match
     return(0);
 
         return(DB_ERR_TIMEOUT_EXPIRED);
 
     // No match
     return(0);
 

-}  // wxDB::TranslateSqlState()
+}  // wxDb::TranslateSqlState()

 
 

-    
-/**********  wxDB::Grant() **********/
-bool wxDB::Grant(int privileges, const char *tableName, const char *userList)
+
+/**********  wxDb::Grant() **********/
+bool wxDb::Grant(int privileges, const char *tableName, const char *userList)

 {
 {

-//    char sqlStmt[DB_MAX_STATEMENT_LEN];

     wxString sqlStmt;
 
     // Build the grant statement
     wxString sqlStmt;
 
     // Build the grant statement


@@ -1263,20 +1562,19 @@ bool wxDB::Grant(int privileges, const char *tableName, const char *userList)
     sqlStmt += userList;
 
 #ifdef DBDEBUG_CONSOLE
     sqlStmt += userList;
 
 #ifdef DBDEBUG_CONSOLE

-    cout << endl << sqlStmt.GetData() << endl;
+    cout << endl << sqlStmt.c_str() << endl;

 #endif
 
 #endif
 

-    WriteSqlLog(sqlStmt.GetData());
+    WriteSqlLog(sqlStmt.c_str());

 
 

-    return(ExecSql(sqlStmt.GetData()));
+    return(ExecSql(sqlStmt.c_str()));

 
 

-}  // wxDB::Grant()
+}  // wxDb::Grant()

 
 
 
 

-/********** wxDB::CreateView() **********/
-bool wxDB::CreateView(const char *viewName, const char *colList, const char *pSqlStmt, bool attemptDrop)
+/********** wxDb::CreateView() **********/
+bool wxDb::CreateView(const char *viewName, const char *colList, const char *pSqlStmt, bool attemptDrop)

 {
 {

-//    char sqlStmt[DB_MAX_STATEMENT_LEN];

     wxString sqlStmt;
 
     // Drop the view first
     wxString sqlStmt;
 
     // Drop the view first


@@ -1286,7 +1584,7 @@ bool wxDB::CreateView(const char *viewName, const char *colList, const char *pSq
     // Build the create view statement
     sqlStmt  = "CREATE VIEW ";
     sqlStmt += viewName;
     // Build the create view statement
     sqlStmt  = "CREATE VIEW ";
     sqlStmt += viewName;

-    
+

     if (wxStrlen(colList))
     {
         sqlStmt += " (";
     if (wxStrlen(colList))
     {
         sqlStmt += " (";


@@ -1297,19 +1595,19 @@ bool wxDB::CreateView(const char *viewName, const char *colList, const char *pSq
     sqlStmt += " AS ";
     sqlStmt += pSqlStmt;
 
     sqlStmt += " AS ";
     sqlStmt += pSqlStmt;
 

-    WriteSqlLog(sqlStmt.GetData());
+    WriteSqlLog(sqlStmt.c_str());

 
 #ifdef DBDEBUG_CONSOLE
 
 #ifdef DBDEBUG_CONSOLE

-    cout << sqlStmt.GetData() << endl;
+    cout << sqlStmt.c_str() << endl;

 #endif
 
 #endif
 

-    return(ExecSql(sqlStmt.GetData()));
+    return(ExecSql(sqlStmt.c_str()));

 
 

-}  // wxDB::CreateView()
+}  // wxDb::CreateView()

 
 
 
 

-/********** wxDB::DropView()  **********/
-bool wxDB::DropView(const char *viewName)
+/********** wxDb::DropView()  **********/
+bool wxDb::DropView(const char *viewName)

 {
 /*
  * NOTE: This function returns TRUE if the View does not exist, but
 {
 /*
  * NOTE: This function returns TRUE if the View does not exist, but


@@ -1322,20 +1620,20 @@ bool wxDB::DropView(const char *viewName)
 
     sqlStmt.sprintf("DROP VIEW %s", viewName);
 
 
     sqlStmt.sprintf("DROP VIEW %s", viewName);
 

-    WriteSqlLog(sqlStmt.GetData());
+    WriteSqlLog(sqlStmt.c_str());

 
 #ifdef DBDEBUG_CONSOLE
 
 #ifdef DBDEBUG_CONSOLE

-    cout << endl << sqlStmt.GetData() << endl;
+    cout << endl << sqlStmt.c_str() << endl;

 #endif
 
 #endif
 

-    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.GetData(), SQL_NTS) != SQL_SUCCESS)
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)

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

-        if (wxStrcmp(sqlState,"S0002"))  // "Base table not found"
+        if (wxStrcmp(sqlState,wxT("S0002")))  // "Base table not found"

         {
             // Check for product specific error codes
         {
             // Check for product specific error codes

-            if (!((Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(sqlState,"42000"))))  // 5.x (and lower?)
+            if (!((Dbms() == dbmsSYBASE_ASA    && !wxStrcmp(sqlState,wxT("42000")))))  // 5.x (and lower?)

             {
                 DispNextError();
                 DispAllErrors(henv, hdbc, hstmt);
             {
                 DispNextError();
                 DispAllErrors(henv, hdbc, hstmt);


@@ -1351,11 +1649,11 @@ bool wxDB::DropView(const char *viewName)
 
     return TRUE;
 
 
     return TRUE;
 

-}  // wxDB::DropView()
+}  // wxDb::DropView()

 
 
 
 

-/********** wxDB::ExecSql()  **********/
-bool wxDB::ExecSql(const char *pSqlStmt)
+/********** wxDb::ExecSql()  **********/
+bool wxDb::ExecSql(const char *pSqlStmt)

 {
     SQLFreeStmt(hstmt, SQL_CLOSE);
     if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)
 {
     SQLFreeStmt(hstmt, SQL_CLOSE);
     if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)


@@ -1366,11 +1664,11 @@ bool wxDB::ExecSql(const char *pSqlStmt)
         return(FALSE);
     }
 
         return(FALSE);
     }
 

-}  // wxDB::ExecSql()
+}  // wxDb::ExecSql()

 
 
 
 

-/********** wxDB::GetNext()  **********/
-bool wxDB::GetNext(void)
+/********** wxDb::GetNext()  **********/
+bool wxDb::GetNext(void)

 {
     if (SQLFetch(hstmt) == SQL_SUCCESS)
         return(TRUE);
 {
     if (SQLFetch(hstmt) == SQL_SUCCESS)
         return(TRUE);


@@ -1380,11 +1678,11 @@ bool wxDB::GetNext(void)
         return(FALSE);
     }
 
         return(FALSE);
     }
 

-}  // wxDB::GetNext()
+}  // wxDb::GetNext()

 
 
 
 

-/********** wxDB::GetData()  **********/
-bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned)
+/********** wxDb::GetData()  **********/
+bool wxDb::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned)

 {
     assert(pData);
     assert(cbReturned);
 {
     assert(pData);
     assert(cbReturned);


@@ -1397,11 +1695,11 @@ bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FA
         return(FALSE);
     }
 
         return(FALSE);
     }
 

-}  // wxDB::GetData()
+}  // wxDb::GetData()

 
 
 
 

-/********** wxDB::GetKeyFields() **********/
-int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)
+/********** wxDb::GetKeyFields() **********/
+int wxDb::GetKeyFields(char *tableName, wxDbColInf* colInf, int noCols)

 {
     char         szPkTable[DB_MAX_TABLE_NAME_LEN+1];  /* Primary key table name */
     char         szFkTable[DB_MAX_TABLE_NAME_LEN+1];  /* Foreign key table name */
 {
     char         szPkTable[DB_MAX_TABLE_NAME_LEN+1];  /* Primary key table name */
     char         szFkTable[DB_MAX_TABLE_NAME_LEN+1];  /* Foreign key table name */


@@ -1415,7 +1713,7 @@ int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)
     wxString     Temp0;
     /*
      * ---------------------------------------------------------------------
     wxString     Temp0;
     /*
      * ---------------------------------------------------------------------

-     * -- 19991224 : mj10777@gmx.net : Create                         ------
+     * -- 19991224 : mj10777 : Create                         ------

      * --          : Three things are done and stored here :          ------
      * --          : 1) which Column(s) is/are Primary Key(s)         ------
      * --          : 2) which tables use this Key as a Foreign Key    ------
      * --          : Three things are done and stored here :          ------
      * --          : 1) which Column(s) is/are Primary Key(s)         ------
      * --          : 2) which tables use this Key as a Foreign Key    ------


@@ -1449,8 +1747,8 @@ int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)
             for (i=0;i<noCols;i++)                          // Find the Column name
                 if (!wxStrcmp(colInf[i].colName,szPkCol))   // We have found the Column
                     colInf[i].PkCol = iKeySeq;              // Which Primary Key is this (first, second usw.) ?
             for (i=0;i<noCols;i++)                          // Find the Column name
                 if (!wxStrcmp(colInf[i].colName,szPkCol))   // We have found the Column
                     colInf[i].PkCol = iKeySeq;              // Which Primary Key is this (first, second usw.) ?

-        }   // if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-    }    // while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
+        }  // if
+    }  // while

     SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated).      */
 
     /*---------------------------------------------------------------------*/
     SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated).      */
 
     /*---------------------------------------------------------------------*/


@@ -1480,16 +1778,18 @@ int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)
             GetData( 5, SQL_C_SSHORT, &iKeySeq,    0,                        &cb);
             GetData( 7, SQL_C_CHAR,   szFkTable,   DB_MAX_TABLE_NAME_LEN+1,  &cb);
             GetData( 8, SQL_C_CHAR,   szFkCol,     DB_MAX_COLUMN_NAME_LEN+1, &cb);
             GetData( 5, SQL_C_SSHORT, &iKeySeq,    0,                        &cb);
             GetData( 7, SQL_C_CHAR,   szFkTable,   DB_MAX_TABLE_NAME_LEN+1,  &cb);
             GetData( 8, SQL_C_CHAR,   szFkCol,     DB_MAX_COLUMN_NAME_LEN+1, &cb);

-            Temp0.Printf("%s[%s] ",Temp0.c_str(),szFkTable);  // [ ] in case there is a blank in the Table name
-        }  // if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-    }   // while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
+            Temp0.Printf(wxT("%s[%s] "),Temp0.c_str(),szFkTable);  // [ ] in case there is a blank in the Table name
+        }  // if
+    }  // while

     Temp0.Trim();     // Get rid of any unneeded blanks
     Temp0.Trim();     // Get rid of any unneeded blanks

-    if (Temp0 != "")
+    if (Temp0 != wxT(""))

     {
     {

-        for (i=0;i<noCols;i++)                          // Find the Column name
-            if (!wxStrcmp(colInf[i].colName,szPkCol))   // We have found the Column, store the Information
-                strcpy(colInf[i].PkTableName,Temp0);    // Name of the Tables where this Primary Key is used as a Foreign Key
-    }  // if (Temp0 != "")
+        for (i=0;i<noCols;i++)
+        {   // Find the Column name
+            if (!wxStrcmp(colInf[i].colName,szPkCol))           // We have found the Column, store the Information
+                wxStrcpy(colInf[i].PkTableName,Temp0.c_str());  // Name of the Tables where this Primary Key is used as a Foreign Key
+        }
+    }  // if

     SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
 
     /*---------------------------------------------------------------------*/
     SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
 
     /*---------------------------------------------------------------------*/


@@ -1523,29 +1823,30 @@ int wxDB::GetKeyFields(char *tableName, wxColInf* colInf,int noCols)
                 if (!wxStrcmp(colInf[i].colName,szFkCol))       // We have found the (Foreign Key) Column
                 {
                     colInf[i].FkCol = iKeySeq;                  // Which Foreign Key is this (first, second usw.) ?
                 if (!wxStrcmp(colInf[i].colName,szFkCol))       // We have found the (Foreign Key) Column
                 {
                     colInf[i].FkCol = iKeySeq;                  // Which Foreign Key is this (first, second usw.) ?

-                    strcpy(colInf[i].FkTableName,szPkTable);    // Name of the Table where this Foriegn is the Primary Key
-                } // if (!wxStrcmp(colInf[i].colName,szFkCol))
-            }  // for (i=0;i<noCols;i++)
-        }   // if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
-    }    // while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
+                    wxStrcpy(colInf[i].FkTableName,szPkTable);  // Name of the Table where this Foriegn is the Primary Key
+                } // if
+            }  // for
+        }  // if
+    }  // while

     SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
 
     SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
 

-    /*---------------------------------------------------------------------*/

     return TRUE;
     return TRUE;

-}  // wxDB::GetKeyFields()

 
 

+}  // wxDb::GetKeyFields()

 
 

-/********** wxDB::GetColumns() **********/
-wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
+
+#if OLD_GETCOLUMNS
+/********** wxDb::GetColumns() **********/
+wxDbColInf *wxDb::GetColumns(char *tableName[], const char *userID)

 /*
  *        1) The last array element of the tableName[] argument must be zero (null).
  *            This is how the end of the array is detected.
 /*
  *        1) The last array element of the tableName[] argument must be zero (null).
  *            This is how the end of the array is detected.

- *        2) This function returns an array of wxColInf structures.  If no columns
+ *        2) This function returns an array of wxDbColInf structures.  If no columns

  *            were found, or an error occured, this pointer will be zero (null).  THE
  *            CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE MEMORY RETURNED WHEN IT
  *            IS FINISHED WITH IT.  i.e.
  *
  *            were found, or an error occured, this pointer will be zero (null).  THE
  *            CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE MEMORY RETURNED WHEN IT
  *            IS FINISHED WITH IT.  i.e.
  *

- *            wxColInf *colInf = pDb->GetColumns(tableList, userID);
+ *            wxDbColInf *colInf = pDb->GetColumns(tableList, userID);

  *            if (colInf)
  *            {
  *                // Use the column inf
  *            if (colInf)
  *            {
  *                // Use the column inf


@@ -1559,14 +1860,14 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
  *        userID == ""    ... UserID set equal to 'this->uid'
  *        userID != ""    ... UserID set equal to 'userID'
  *
  *        userID == ""    ... UserID set equal to 'this->uid'
  *        userID != ""    ... UserID set equal to 'userID'
  *

- * NOTE: ALL column bindings associated with this wxDB instance are unbound
- *       by this function.  This function should use its own wxDB instance 
+ * NOTE: ALL column bindings associated with this wxDb instance are unbound
+ *       by this function.  This function should use its own wxDb instance

  *       to avoid undesired unbinding of columns.
  */
 {
     int      noCols = 0;
     int      colNo  = 0;
  *       to avoid undesired unbinding of columns.
  */
 {
     int      noCols = 0;
     int      colNo  = 0;

-    wxColInf *colInf = 0;
+    wxDbColInf *colInf = 0;

 
     RETCODE  retcode;
     SDWORD   cb;
 
     RETCODE  retcode;
     SDWORD   cb;


@@ -1588,13 +1889,13 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
     if (Dbms() == dbmsDBASE)
         UserID = "";
 
     if (Dbms() == dbmsDBASE)
         UserID = "";
 

-    // Oracle user names may only be in uppercase, so force 
+    // Oracle and Interbase user names may only be in uppercase, so force

     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     // Pass 1 - Determine how many columns there are.
     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     // Pass 1 - Determine how many columns there are.

-    // Pass 2 - Allocate the wxColInf array and fill in
+    // Pass 2 - Allocate the wxDbColInf array and fill in

     //                the array with the column information.
     int pass;
     for (pass = 1; pass <= 2; pass++)
     //                the array with the column information.
     int pass;
     for (pass = 1; pass <= 2; pass++)


@@ -1603,13 +1904,13 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
         {
             if (noCols == 0)  // Probably a bogus table name(s)
                 break;
         {
             if (noCols == 0)  // Probably a bogus table name(s)
                 break;

-            // Allocate n wxColInf objects to hold the column information
-            colInf = new wxColInf[noCols+1];
+            // Allocate n wxDbColInf objects to hold the column information
+            colInf = new wxDbColInf[noCols+1];

             if (!colInf)
                 break;
             // Mark the end of the array
             if (!colInf)
                 break;
             // Mark the end of the array

-            wxStrcpy(colInf[noCols].tableName, "");
-            wxStrcpy(colInf[noCols].colName, "");
+            wxStrcpy(colInf[noCols].tableName, wxT(""));
+            wxStrcpy(colInf[noCols].colName, wxT(""));

             colInf[noCols].sqlDataType = 0;
         }
         // Loop through each table name
             colInf[noCols].sqlDataType = 0;
         }
         // Loop through each table name


@@ -1617,23 +1918,25 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
         for (tbl = 0; tableName[tbl]; tbl++)
         {
             TableName = tableName[tbl];
         for (tbl = 0; tableName[tbl]; tbl++)
         {
             TableName = tableName[tbl];

-            // Oracle table names are uppercase only, so force 
+            // Oracle and Interbase table names are uppercase only, so force

             // the name to uppercase just in case programmer forgot to do this
             // the name to uppercase just in case programmer forgot to do this

-            if (Dbms() == dbmsORACLE)
+            if ((Dbms() == dbmsORACLE) || 
+                (Dbms() == dbmsINTERBASE))

                 TableName = TableName.Upper();
 
             SQLFreeStmt(hstmt, SQL_CLOSE);
 
                 TableName = TableName.Upper();
 
             SQLFreeStmt(hstmt, SQL_CLOSE);
 

-            // MySQL and Access cannot accept a user name when looking up column names, so we
+            // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we

             // use the call below that leaves out the user name
             // use the call below that leaves out the user name

-            if (wxStrcmp(UserID.GetData(),"") &&
+            if (wxStrcmp(UserID.c_str(),wxT("")) &&

                  Dbms() != dbmsMY_SQL &&
                  Dbms() != dbmsMY_SQL &&

-                 Dbms() != dbmsACCESS)
+                 Dbms() != dbmsACCESS &&
+                 Dbms() != dbmsMS_SQL_SERVER)

             {
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers
             {
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers

-                                     (UCHAR *) UserID.GetData(), SQL_NTS,    // Owner
-                                     (UCHAR *) TableName.GetData(), SQL_NTS,
+                                     (UCHAR *) UserID.c_str(), SQL_NTS,    // Owner
+                                     (UCHAR *) TableName.c_str(), SQL_NTS,

                                      NULL, 0);                               // All columns
             }
             else
                                      NULL, 0);                               // All columns
             }
             else


@@ -1641,7 +1944,7 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers
                                      NULL, 0,                                // Owner
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers
                                      NULL, 0,                                // Owner

-                                     (UCHAR *) TableName.GetData(), SQL_NTS,
+                                     (UCHAR *) TableName.c_str(), SQL_NTS,

                                      NULL, 0);                               // All columns
             }
             if (retcode != SQL_SUCCESS)
                                      NULL, 0);                               // All columns
             }
             if (retcode != SQL_SUCCESS)


@@ -1673,12 +1976,23 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
                         GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                        &cb);
                         GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                        &cb);
                         GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                        &cb);
                         GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                        &cb);
                         GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                        &cb);
                         GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                        &cb);

-                        GetData(12, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].remarks,         254+1,                    &cb);
-
-                        // Determine the wxDB data type that is used to represent the native data type of this data source
+                        GetData(12, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].remarks,      254+1,                    &cb);
+        
+                        // Determine the wxDb data type that is used to represent the native data type of this data source

                         colInf[colNo].dbDataType = 0;
                         if (!wxStricmp(typeInfVarchar.TypeName,colInf[colNo].typeName))
                         colInf[colNo].dbDataType = 0;
                         if (!wxStricmp(typeInfVarchar.TypeName,colInf[colNo].typeName))

+                        {
+#ifdef _IODBC_          
+                            // IODBC does not return a correct columnSize, so we set
+                            // columnSize = bufferLength if no column size was returned
+                            // IODBC returns the columnSize in bufferLength.. (bug)
+                            if (colInf[colNo].columnSize < 1)
+                            {
+                               colInf[colNo].columnSize = colInf[colNo].bufferLength;
+                            }
+#endif

                             colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;
                             colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;

+                        }

                         else if (!wxStricmp(typeInfInteger.TypeName,colInf[colNo].typeName))
                             colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
                         else if (!wxStricmp(typeInfFloat.TypeName,colInf[colNo].typeName))
                         else if (!wxStricmp(typeInfInteger.TypeName,colInf[colNo].typeName))
                             colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
                         else if (!wxStricmp(typeInfFloat.TypeName,colInf[colNo].typeName))


@@ -1704,29 +2018,30 @@ wxColInf *wxDB::GetColumns(char *tableName[], const char *userID)
     SQLFreeStmt(hstmt, SQL_CLOSE);
     return colInf;
 
     SQLFreeStmt(hstmt, SQL_CLOSE);
     return colInf;
 

-}  // wxDB::GetColumns()
+}  // wxDb::GetColumns()

 
 
 
 

-/********** wxDB::GetColumns() **********/
-wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
-/*
- * Same as the above GetColumns() function except this one gets columns
- * only for a single table, and if 'numCols' is not NULL, the number of
- * columns stored in the returned wxColInf is set in '*numCols'
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- *
- * NOTE: ALL column bindings associated with this wxDB instance are unbound
- *       by this function.  This function should use its own wxDB instance 
- *       to avoid undesired unbinding of columns.
- */
+/********** wxDb::GetColumns() **********/
+
+wxDbColInf *wxDb::GetColumns(char *tableName, int *numCols, const char *userID)
+//
+// Same as the above GetColumns() function except this one gets columns
+// only for a single table, and if 'numCols' is not NULL, the number of
+// columns stored in the returned wxDbColInf is set in '*numCols'
+//
+// userID is evaluated in the following manner:
+//        userID == NULL  ... UserID is ignored
+//        userID == ""    ... UserID set equal to 'this->uid'
+//        userID != ""    ... UserID set equal to 'userID'
+//
+// NOTE: ALL column bindings associated with this wxDb instance are unbound
+//       by this function.  This function should use its own wxDb instance
+//       to avoid undesired unbinding of columns.
+

 {
     int       noCols = 0;
     int       colNo  = 0;
 {
     int       noCols = 0;
     int       colNo  = 0;

-    wxColInf *colInf = 0;
+    wxDbColInf *colInf = 0;

 
     RETCODE  retcode;
     SDWORD   cb;
 
     RETCODE  retcode;
     SDWORD   cb;


@@ -1748,13 +2063,13 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
     if (Dbms() == dbmsDBASE)
         UserID = "";
 
     if (Dbms() == dbmsDBASE)
         UserID = "";
 

-    // Oracle user names may only be in uppercase, so force 
+    // Oracle user names may only be in uppercase, so force

     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     // Pass 1 - Determine how many columns there are.
     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     // Pass 1 - Determine how many columns there are.

-    // Pass 2 - Allocate the wxColInf array and fill in
+    // Pass 2 - Allocate the wxDbColInf array and fill in

     //                the array with the column information.
     int pass;
     for (pass = 1; pass <= 2; pass++)
     //                the array with the column information.
     int pass;
     for (pass = 1; pass <= 2; pass++)


@@ -1763,34 +2078,36 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
         {
             if (noCols == 0)  // Probably a bogus table name(s)
                 break;
         {
             if (noCols == 0)  // Probably a bogus table name(s)
                 break;

-            // Allocate n wxColInf objects to hold the column information
-            colInf = new wxColInf[noCols+1];
+            // Allocate n wxDbColInf objects to hold the column information
+            colInf = new wxDbColInf[noCols+1];

             if (!colInf)
                 break;
             // Mark the end of the array
             if (!colInf)
                 break;
             // Mark the end of the array

-            wxStrcpy(colInf[noCols].tableName, "");
-            wxStrcpy(colInf[noCols].colName, "");
+            wxStrcpy(colInf[noCols].tableName, wxT(""));
+            wxStrcpy(colInf[noCols].colName, wxT(""));

             colInf[noCols].sqlDataType = 0;
         }
 
         TableName = tableName;
             colInf[noCols].sqlDataType = 0;
         }
 
         TableName = tableName;

-        // Oracle table names are uppercase only, so force 
+        // Oracle and Interbase table names are uppercase only, so force

         // the name to uppercase just in case programmer forgot to do this
         // the name to uppercase just in case programmer forgot to do this

-        if (Dbms() == dbmsORACLE)
+        if ((Dbms() == dbmsORACLE) || 
+            (Dbms() == dbmsINTERBASE))

             TableName = TableName.Upper();
 
         SQLFreeStmt(hstmt, SQL_CLOSE);
 
             TableName = TableName.Upper();
 
         SQLFreeStmt(hstmt, SQL_CLOSE);
 

-        // MySQL and Access cannot accept a user name when looking up column names, so we
+        // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we

         // use the call below that leaves out the user name
         // use the call below that leaves out the user name

-        if (wxStrcmp(UserID.GetData(),"") &&
+        if (wxStrcmp(UserID.c_str(),wxT("")) &&

              Dbms() != dbmsMY_SQL &&
              Dbms() != dbmsMY_SQL &&

-             Dbms() != dbmsACCESS)
+             Dbms() != dbmsACCESS &&
+             Dbms() != dbmsMS_SQL_SERVER)

         {
             retcode = SQLColumns(hstmt,
                                  NULL, 0,                                // All qualifiers
         {
             retcode = SQLColumns(hstmt,
                                  NULL, 0,                                // All qualifiers

-                                 (UCHAR *) UserID.GetData(), SQL_NTS,    // Owner
-                                 (UCHAR *) TableName.GetData(), SQL_NTS,
+                                 (UCHAR *) UserID.c_str(), SQL_NTS,    // Owner
+                                 (UCHAR *) TableName.c_str(), SQL_NTS,

                                  NULL, 0);                               // All columns
         }
         else
                                  NULL, 0);                               // All columns
         }
         else


@@ -1798,7 +2115,7 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
             retcode = SQLColumns(hstmt,
                                  NULL, 0,                                 // All qualifiers
                                  NULL, 0,                                 // Owner
             retcode = SQLColumns(hstmt,
                                  NULL, 0,                                 // All qualifiers
                                  NULL, 0,                                 // Owner

-                                 (UCHAR *) TableName.GetData(), SQL_NTS,
+                                 (UCHAR *) TableName.c_str(), SQL_NTS,

                                  NULL, 0);                                // All columns
         }
         if (retcode != SQL_SUCCESS)
                                  NULL, 0);                                // All columns
         }
         if (retcode != SQL_SUCCESS)


@@ -1829,7 +2146,7 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
                     GetData( 6, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].typeName,     128+1,                    &cb);
                     GetData( 7, SQL_C_SLONG,  (UCHAR*) &colInf[colNo].columnSize,   0,                        &cb);
                     // BJO 991214 : SQL_C_SSHORT instead of SQL_C_SLONG, otherwise fails on Sparc (probably all 64 bit architectures)
                     GetData( 6, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].typeName,     128+1,                    &cb);
                     GetData( 7, SQL_C_SLONG,  (UCHAR*) &colInf[colNo].columnSize,   0,                        &cb);
                     // BJO 991214 : SQL_C_SSHORT instead of SQL_C_SLONG, otherwise fails on Sparc (probably all 64 bit architectures)

-                    GetData( 8, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].bufferLength, 0,                        &cb);    
+                    GetData( 8, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].bufferLength, 0,                        &cb);

                     GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                        &cb);
                     GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                        &cb);
                     GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                        &cb);
                     GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                        &cb);
                     GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                        &cb);
                     GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                        &cb);


@@ -1840,17 +2157,37 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
                     colInf[colNo].FkCol = 0;           // Foreign key column   0=No; 1= First Key, 2 = Second Key etc.
                     colInf[colNo].FkTableName[0] = 0;  // Foreign key table name
 
                     colInf[colNo].FkCol = 0;           // Foreign key column   0=No; 1= First Key, 2 = Second Key etc.
                     colInf[colNo].FkTableName[0] = 0;  // Foreign key table name
 

-                    // Determine the wxDB data type that is used to represent the native data type of this data source
+                    // BJO 20000428 : Virtuoso returns type names with upper cases!
+                    if (Dbms() == dbmsVIRTUOSO)
+                    {
+                        wxString s =  colInf[colNo].typeName;
+                        s = s.MakeLower();
+                        wxStrcmp(colInf[colNo].typeName, s.c_str());        
+                    }
+                       
+                    // Determine the wxDb data type that is used to represent the native data type of this data source

                     colInf[colNo].dbDataType = 0;
                     if (!wxStricmp(typeInfVarchar.TypeName,colInf[colNo].typeName))
                     colInf[colNo].dbDataType = 0;
                     if (!wxStricmp(typeInfVarchar.TypeName,colInf[colNo].typeName))

+                    {
+#ifdef _IODBC_          
+                        // IODBC does not return a correct columnSize, so we set
+                        // columnSize = bufferLength if no column size was returned
+                        // IODBC returns the columnSize in bufferLength.. (bug)
+                        if (colInf[colNo].columnSize < 1)
+                        {
+                           colInf[colNo].columnSize = colInf[colNo].bufferLength;
+                        }
+#endif
+

                         colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;
                         colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;

+                    }

                     else if (!wxStricmp(typeInfInteger.TypeName,colInf[colNo].typeName))
                         colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
                     else if (!wxStricmp(typeInfFloat.TypeName,colInf[colNo].typeName))
                         colInf[colNo].dbDataType = DB_DATA_TYPE_FLOAT;
                     else if (!wxStricmp(typeInfDate.TypeName,colInf[colNo].typeName))
                     else if (!wxStricmp(typeInfInteger.TypeName,colInf[colNo].typeName))
                         colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;
                     else if (!wxStricmp(typeInfFloat.TypeName,colInf[colNo].typeName))
                         colInf[colNo].dbDataType = DB_DATA_TYPE_FLOAT;
                     else if (!wxStricmp(typeInfDate.TypeName,colInf[colNo].typeName))

-                        colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;
-
+                        colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;     
+            

                     colNo++;
                 }
             }
                     colNo++;
                 }
             }


@@ -1876,33 +2213,112 @@ wxColInf *wxDB::GetColumns(char *tableName, int *numCols, const char *userID)
         *numCols = noCols;
     return colInf;
 
         *numCols = noCols;
     return colInf;
 

-}  // wxDB::GetColumns()
+}  // wxDb::GetColumns()
+
+
+#else  // New GetColumns

 
 
 
 

-/********** wxDB::GetColumnCount() **********/
-int wxDB::GetColumnCount(char *tableName, const char *userID)

 /*
 /*

- * Returns a count of how many columns are in a table.
- * If an error occurs in computing the number of columns
- * this function will return a -1 for the count
- *
- * userID is evaluated in the following manner:
- *        userID == NULL  ... UserID is ignored
- *        userID == ""    ... UserID set equal to 'this->uid'
- *        userID != ""    ... UserID set equal to 'userID'
- *
- * NOTE: ALL column bindings associated with this wxDB instance are unbound
- *       by this function.  This function should use its own wxDB instance 
- *       to avoid undesired unbinding of columns.
- */
+    BJO 20000503
+    These are tentative new GetColumns members which should be more database
+    independant and which always returns the columns in the order they were 
+    created.
+
+    - The first one (wxDbColInf *wxDb::GetColumns(char *tableName[], const 
+      char* userID)) calls the second implementation for each separate table
+      before merging the results. This makes the code easier to maintain as 
+      only one member (the second) makes the real work
+    - wxDbColInf *wxDb::GetColumns(char *tableName, int *numCols, const 
+      char *userID) is a little bit improved 
+    - It doesn't anymore rely on the type-name to find out which database-type 
+      each column has
+    - It ends by sorting the columns, so that they are returned in the same 
+      order they were created
+*/
+
+typedef struct

 {
 {

-    int      noCols = 0;
+    int noCols;
+    wxDbColInf *colInf;
+} _TableColumns;

 
 

-    RETCODE  retcode;

 
 

+wxDbColInf *wxDb::GetColumns(char *tableName[], const char* userID)
+{
+    int i, j;
+    // The last array element of the tableName[] argument must be zero (null).
+    // This is how the end of the array is detected.
+
+    int noCols = 0;
+
+    // How many tables ?
+    int tbl;
+    for (tbl = 0 ; tableName[tbl]; tbl++); 
+    
+    // Create a table to maintain the columns for each separate table
+    _TableColumns *TableColumns = new _TableColumns[tbl];
+    
+    // Fill the table
+    for (i = 0 ; i < tbl ; i++)
+        
+    {
+        TableColumns[i].colInf = GetColumns(tableName[i], &TableColumns[i].noCols, userID);
+        if (TableColumns[i].colInf == NULL) 
+            return NULL;
+        noCols += TableColumns[i].noCols;
+    }
+    
+    // Now merge all the separate table infos
+    wxDbColInf *colInf = new wxDbColInf[noCols+1];
+    
+    // Mark the end of the array
+    wxStrcpy(colInf[noCols].tableName, wxT(""));
+    wxStrcpy(colInf[noCols].colName, wxT(""));
+    colInf[noCols].sqlDataType = 0;
+    
+    // Merge ...
+    int offset = 0;
+    
+    for (i = 0 ; i < tbl ; i++)
+    {
+        for (j = 0 ; j < TableColumns[i].noCols ; j++)
+        {
+            colInf[offset++] = TableColumns[i].colInf[j];        
+        }
+    }
+    
+    delete [] TableColumns;
+    
+    return colInf;
+}  // wxDb::GetColumns()  -- NEW
+
+
+wxDbColInf *wxDb::GetColumns(char *tableName, int *numCols, const char *userID)
+//
+// Same as the above GetColumns() function except this one gets columns
+// only for a single table, and if 'numCols' is not NULL, the number of
+// columns stored in the returned wxDbColInf is set in '*numCols'
+//
+// userID is evaluated in the following manner:
+//        userID == NULL  ... UserID is ignored
+//        userID == ""    ... UserID set equal to 'this->uid'
+//        userID != ""    ... UserID set equal to 'userID'
+//
+// NOTE: ALL column bindings associated with this wxDb instance are unbound
+//       by this function.  This function should use its own wxDb instance
+//       to avoid undesired unbinding of columns.
+{
+    SWORD       noCols = 0;
+    int         colNo  = 0;
+    wxDbColInf *colInf = 0;
+    
+    RETCODE  retcode;
+    SDWORD   cb;
+    

     wxString UserID;
     wxString TableName;
     wxString UserID;
     wxString TableName;

-
+    

     if (userID)
     {
         if (!wxStrlen(userID))
     if (userID)
     {
         if (!wxStrlen(userID))


@@ -1912,37 +2328,311 @@ int wxDB::GetColumnCount(char *tableName, const char *userID)
     }
     else
         UserID = "";
     }
     else
         UserID = "";

-
+    

     // dBase does not use user names, and some drivers fail if you try to pass one
     if (Dbms() == dbmsDBASE)
         UserID = "";
     // dBase does not use user names, and some drivers fail if you try to pass one
     if (Dbms() == dbmsDBASE)
         UserID = "";

-
-    // Oracle user names may only be in uppercase, so force 
+    
+    // Oracle user names may only be in uppercase, so force

     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();

-
+    
+    // Pass 1 - Determine how many columns there are.
+    // Pass 2 - Allocate the wxDbColInf array and fill in
+    //                the array with the column information.
+    int pass;
+    for (pass = 1; pass <= 2; pass++)

     {
     {

-        // Loop through each table name
+        if (pass == 2)

         {
         {

-            TableName = tableName;
-            // Oracle table names are uppercase only, so force 
-            // the name to uppercase just in case programmer forgot to do this
-            if (Dbms() == dbmsORACLE)
-                TableName = TableName.Upper();
-
+            if (noCols == 0)  // Probably a bogus table name(s)
+                break;
+            // Allocate n wxDbColInf objects to hold the column information
+            colInf = new wxDbColInf[noCols+1];
+            if (!colInf)
+                break;
+            // Mark the end of the array
+            wxStrcpy(colInf[noCols].tableName, wxT(""));
+            wxStrcpy(colInf[noCols].colName, wxT(""));
+            colInf[noCols].sqlDataType = 0;
+        }
+        
+        TableName = tableName;
+        // Oracle and Interbase table names are uppercase only, so force
+        // the name to uppercase just in case programmer forgot to do this
+        if ((Dbms() == dbmsORACLE) || 
+            (Dbms() == dbmsINTERBASE))
+            TableName = TableName.Upper();
+        
+        SQLFreeStmt(hstmt, SQL_CLOSE);
+        
+        // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we
+        // use the call below that leaves out the user name
+        if (wxStrcmp(UserID.c_str(),wxT("")) &&
+            Dbms() != dbmsMY_SQL &&
+            Dbms() != dbmsACCESS &&
+            Dbms() != dbmsMS_SQL_SERVER)
+        {
+            retcode = SQLColumns(hstmt,
+                                 NULL, 0,                              // All qualifiers
+                                 (UCHAR *) UserID.c_str(), SQL_NTS,    // Owner
+                                 (UCHAR *) TableName.c_str(), SQL_NTS,
+                                 NULL, 0);                             // All columns
+        }
+        else
+        {
+            retcode = SQLColumns(hstmt,
+                                 NULL, 0,                              // All qualifiers
+                                 NULL, 0,                              // Owner
+                                 (UCHAR *) TableName.c_str(), SQL_NTS,
+                                 NULL, 0);                             // All columns
+        }
+        if (retcode != SQL_SUCCESS)
+        {  // Error occured, abort
+            DispAllErrors(henv, hdbc, hstmt);
+            if (colInf)
+                delete [] colInf;

             SQLFreeStmt(hstmt, SQL_CLOSE);
             SQLFreeStmt(hstmt, SQL_CLOSE);

+            if (numCols)
+                *numCols = 0;
+            return(0);
+        }
+        
+        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
+        {
+            if (pass == 1)  // First pass, just add up the number of columns
+                noCols++;
+            else  // Pass 2; Fill in the array of structures
+            {
+                if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
+                {
+                    // NOTE: Only the ODBC 1.x fields are retrieved
+                    GetData( 1, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].catalog,      128+1,                    &cb);
+                    GetData( 2, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].schema,       128+1,                    &cb);
+                    GetData( 3, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].tableName,    DB_MAX_TABLE_NAME_LEN+1,  &cb);
+                    GetData( 4, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
+                    GetData( 5, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].sqlDataType,  0,                        &cb);
+                    GetData( 6, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].typeName,     128+1,                    &cb);
+                    GetData( 7, SQL_C_SLONG,  (UCHAR*) &colInf[colNo].columnSize,   0,                        &cb);                
+                    GetData( 8, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].bufferLength, 0,                        &cb);
+                    GetData( 9, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].decimalDigits,0,                        &cb);
+                    GetData(10, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].numPrecRadix, 0,                        &cb);
+                    GetData(11, SQL_C_SSHORT, (UCHAR*) &colInf[colNo].nullable,     0,                        &cb);
+                    GetData(12, SQL_C_CHAR,   (UCHAR*)  colInf[colNo].remarks,      254+1,                    &cb);
+                    // Start Values for Primary/Foriegn Key (=No)
+                    colInf[colNo].PkCol = 0;           // Primary key column   0=No; 1= First Key, 2 = Second Key etc.
+                    colInf[colNo].PkTableName[0] = 0;  // Tablenames where Primary Key is used as a Foreign Key
+                    colInf[colNo].FkCol = 0;           // Foreign key column   0=No; 1= First Key, 2 = Second Key etc.
+                    colInf[colNo].FkTableName[0] = 0;  // Foreign key table name
+                    
+#ifdef _IODBC_          
+                    // IODBC does not return a correct columnSize, so we set
+                    // columnSize = bufferLength if no column size was returned
+                    // IODBC returns the columnSize in bufferLength.. (bug)
+                    if (colInf[colNo].columnSize < 1)
+                    {
+                       colInf[colNo].columnSize = colInf[colNo].bufferLength;
+                    }
+#endif
+                    
+                    // Determine the wxDb data type that is used to represent the native data type of this data source
+                    colInf[colNo].dbDataType = 0;
+                    // Get the intern datatype
+                    switch (colInf[colNo].sqlDataType)
+                    {
+                        case SQL_VARCHAR:
+                        case SQL_CHAR:
+                            colInf[colNo].dbDataType = DB_DATA_TYPE_VARCHAR;             
+                        break;
+                        
+                        case SQL_TINYINT:
+                        case SQL_SMALLINT:
+                        case SQL_INTEGER:
+                            colInf[colNo].dbDataType = DB_DATA_TYPE_INTEGER;     
+                            break;
+                        case SQL_DOUBLE:
+                        case SQL_DECIMAL:
+                        case SQL_NUMERIC:
+                        case SQL_FLOAT:
+                        case SQL_REAL:
+                            colInf[colNo].dbDataType = DB_DATA_TYPE_FLOAT;   
+                            break;
+                        case SQL_DATE:
+                            colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;   
+                            break;
+#ifdef __WXDEBUG__
+                        default:
+                            wxString errMsg;
+                            errMsg.sprintf("SQL Data type %d currently not supported by wxWindows", colInf[colNo].sqlDataType);
+                            wxLogDebug(errMsg,wxT("ODBC DEBUG MESSAGE"));
+#endif              
+                    }
+                    colNo++;
+                }
+            }
+        }
+        if (retcode != SQL_NO_DATA_FOUND)
+        {  // Error occured, abort
+            DispAllErrors(henv, hdbc, hstmt);
+            if (colInf)
+                delete [] colInf;
+            SQLFreeStmt(hstmt, SQL_CLOSE);
+            if (numCols)
+                *numCols = 0;
+            return(0);
+        }
+    }
+    
+    SQLFreeStmt(hstmt, SQL_CLOSE);
+    
+    // Store Primary and Foreign Keys
+    GetKeyFields(tableName,colInf,noCols);
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Now sort the the columns in order to make them appear in the right order
+    ///////////////////////////////////////////////////////////////////////////
+    
+    // Build a generic SELECT statement which returns 0 rows
+    wxString Stmt;
+    
+    Stmt.sprintf("select * from %s where 0=1", tableName);
+    
+    // Execute query  
+    if (SQLExecDirect(hstmt, (UCHAR FAR *) Stmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+    {
+        DispAllErrors(henv, hdbc, hstmt);
+        return NULL;
+    } 
+    
+    // Get the number of result columns
+    if (SQLNumResultCols (hstmt, &noCols) != SQL_SUCCESS)
+    {
+        DispAllErrors(henv, hdbc, hstmt);
+        return NULL;
+    }
+    
+    if (noCols == 0) // Probably a bogus table name
+        return NULL;
+    
+    //  Get the name 
+    int i;
+    short colNum;
+    UCHAR name[100];
+    SWORD Sword;
+    SDWORD Sdword;
+    for (colNum = 0; colNum < noCols; colNum++)
+    { 
+        if (SQLColAttributes(hstmt,colNum+1, SQL_COLUMN_NAME, 
+            name, sizeof(name), 
+            &Sword, &Sdword) != SQL_SUCCESS)
+        {
+            DispAllErrors(henv, hdbc, hstmt);
+            return NULL;
+        } 
+        
+        wxString Name1 = name;
+        Name1 = Name1.Upper();
+        
+        // Where is this name in the array ?
+        for (i = colNum ; i < noCols ; i++)
+        {
+            wxString Name2 =  colInf[i].colName;
+            Name2 = Name2.Upper();
+            if (Name2 == Name1)
+            {
+                if (colNum != i) // swap to sort
+                {
+                    wxDbColInf tmpColInf = colInf[colNum];
+                    colInf[colNum] =  colInf[i];
+                    colInf[i] = tmpColInf;
+                }
+                break;
+            } 
+        }     
+    } 
+    SQLFreeStmt(hstmt, SQL_CLOSE);

 
 

-            // MySQL and Access cannot accept a user name when looking up column names, so we
+    ///////////////////////////////////////////////////////////////////////////
+    // End sorting
+    ///////////////////////////////////////////////////////////////////////////
+
+    if (numCols)
+        *numCols = noCols;
+    return colInf;
+    
+}  // wxDb::GetColumns()
+
+
+#endif  // #else OLD_GETCOLUMNS
+
+
+/********** wxDb::GetColumnCount() **********/
+int wxDb::GetColumnCount(char *tableName, const char *userID)
+/*
+ * Returns a count of how many columns are in a table.
+ * If an error occurs in computing the number of columns
+ * this function will return a -1 for the count
+ *
+ * userID is evaluated in the following manner:
+ *        userID == NULL  ... UserID is ignored
+ *        userID == ""    ... UserID set equal to 'this->uid'
+ *        userID != ""    ... UserID set equal to 'userID'
+ *
+ * NOTE: ALL column bindings associated with this wxDb instance are unbound
+ *       by this function.  This function should use its own wxDb instance
+ *       to avoid undesired unbinding of columns.
+ */
+{
+    int      noCols = 0;
+
+    RETCODE  retcode;
+
+    wxString UserID;
+    wxString TableName;
+
+    if (userID)
+    {
+        if (!wxStrlen(userID))
+            UserID = uid;
+        else
+            UserID = userID;
+    }
+    else
+        UserID = wxT("");
+
+    // dBase does not use user names, and some drivers fail if you try to pass one
+    if (Dbms() == dbmsDBASE)
+        UserID = wxT("");
+
+    // Oracle user names may only be in uppercase, so force
+    // the name to uppercase
+    if (Dbms() == dbmsORACLE)
+        UserID = UserID.Upper();
+
+    {
+        // Loop through each table name
+        {
+            TableName = tableName;
+            // Oracle and Interbase table names are uppercase only, so force
+            // the name to uppercase just in case programmer forgot to do this
+            if ((Dbms() == dbmsORACLE) || 
+                (Dbms() == dbmsINTERBASE))
+                TableName = TableName.Upper();
+
+            SQLFreeStmt(hstmt, SQL_CLOSE);
+
+            // MySQL, SQLServer, and Access cannot accept a user name when looking up column names, so we

             // use the call below that leaves out the user name
             // use the call below that leaves out the user name

-            if (wxStrcmp(UserID.GetData(),"") &&
+            if (wxStrcmp(UserID.c_str(),wxT("")) &&

                  Dbms() != dbmsMY_SQL &&
                  Dbms() != dbmsMY_SQL &&

-                 Dbms() != dbmsACCESS)
+                 Dbms() != dbmsACCESS &&
+                 Dbms() != dbmsMS_SQL_SERVER)

             {
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers
             {
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers

-                                     (UCHAR *) UserID.GetData(), SQL_NTS,    // Owner
-                                     (UCHAR *) TableName.GetData(), SQL_NTS,
+                                     (UCHAR *) UserID.c_str(), SQL_NTS,      // Owner
+                                     (UCHAR *) TableName.c_str(), SQL_NTS,

                                      NULL, 0);                               // All columns
             }
             else
                                      NULL, 0);                               // All columns
             }
             else


@@ -1950,7 +2640,7 @@ int wxDB::GetColumnCount(char *tableName, const char *userID)
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers
                                      NULL, 0,                                // Owner
                 retcode = SQLColumns(hstmt,
                                      NULL, 0,                                // All qualifiers
                                      NULL, 0,                                // Owner

-                                     (UCHAR *) TableName.GetData(), SQL_NTS,
+                                     (UCHAR *) TableName.c_str(), SQL_NTS,

                                      NULL, 0);                               // All columns
             }
             if (retcode != SQL_SUCCESS)
                                      NULL, 0);                               // All columns
             }
             if (retcode != SQL_SUCCESS)


@@ -1976,14 +2666,14 @@ int wxDB::GetColumnCount(char *tableName, const char *userID)
     SQLFreeStmt(hstmt, SQL_CLOSE);
     return noCols;
 
     SQLFreeStmt(hstmt, SQL_CLOSE);
     return noCols;
 

-}  // wxDB::GetColumnCount()
+}  // wxDb::GetColumnCount()

 
 
 
 

-/********** wxDB::GetCatalog() *******/
-wxDbInf *wxDB::GetCatalog(char *userID)
+/********** wxDb::GetCatalog() *******/
+wxDbInf *wxDb::GetCatalog(char *userID)

 /*
  * ---------------------------------------------------------------------
 /*
  * ---------------------------------------------------------------------

- * -- 19991203 : mj10777@gmx.net : Create                         ------
+ * -- 19991203 : mj10777 : Create                                 ------

  * --          : Creates a wxDbInf with Tables / Cols Array       ------
  * --          : uses SQLTables and fills pTableInf;              ------
  * --          : pColInf is set to NULL and numCols to 0;         ------
  * --          : Creates a wxDbInf with Tables / Cols Array       ------
  * --          : uses SQLTables and fills pTableInf;              ------
  * --          : pColInf is set to NULL and numCols to 0;         ------


@@ -1998,8 +2688,8 @@ wxDbInf *wxDB::GetCatalog(char *userID)
  *        userID == ""    ... UserID set equal to 'this->uid'
  *        userID != ""    ... UserID set equal to 'userID'
  *
  *        userID == ""    ... UserID set equal to 'this->uid'
  *        userID != ""    ... UserID set equal to 'userID'
  *

- * NOTE: ALL column bindings associated with this wxDB instance are unbound
- *       by this function.  This function should use its own wxDB instance 
+ * NOTE: ALL column bindings associated with this wxDb instance are unbound
+ *       by this function.  This function should use its own wxDb instance

  *       to avoid undesired unbinding of columns.
  */
 {
  *       to avoid undesired unbinding of columns.
  */
 {


@@ -2008,7 +2698,6 @@ wxDbInf *wxDB::GetCatalog(char *userID)
     int      pass;
     RETCODE  retcode;
     SDWORD   cb;
     int      pass;
     RETCODE  retcode;
     SDWORD   cb;

-//    char     tblNameSave[DB_MAX_TABLE_NAME_LEN+1];

     wxString tblNameSave;
 
     wxString UserID;
     wxString tblNameSave;
 
     wxString UserID;


@@ -2021,41 +2710,38 @@ wxDbInf *wxDB::GetCatalog(char *userID)
             UserID = userID;
     }
     else
             UserID = userID;
     }
     else

-        UserID = "";
+        UserID = wxT("");

 
     // dBase does not use user names, and some drivers fail if you try to pass one
     if (Dbms() == dbmsDBASE)
 
     // dBase does not use user names, and some drivers fail if you try to pass one
     if (Dbms() == dbmsDBASE)

-        UserID = "";
+        UserID = wxT("");

 
 

-    // Oracle user names may only be in uppercase, so force 
+    // Oracle user names may only be in uppercase, so force

     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     //-------------------------------------------------------------
     pDbInf = new wxDbInf;          // Create the Database Arrray
     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     //-------------------------------------------------------------
     pDbInf = new wxDbInf;          // Create the Database Arrray

-    pDbInf->catalog[0]     = 0;
-    pDbInf->schema[0]      = 0;
-    pDbInf->numTables      = 0;    // Counter for Tables
-    pDbInf->pTableInf      = NULL; // Array of Tables

     //-------------------------------------------------------------
     // Table Information
     // Pass 1 - Determine how many Tables there are.
     // Pass 2 - Create the Table array and fill it
     //        - Create the Cols array = NULL
     //-------------------------------------------------------------
     //-------------------------------------------------------------
     // Table Information
     // Pass 1 - Determine how many Tables there are.
     // Pass 2 - Create the Table array and fill it
     //        - Create the Cols array = NULL
     //-------------------------------------------------------------

+

     for (pass = 1; pass <= 2; pass++)
     {
         SQLFreeStmt(hstmt, SQL_CLOSE);   // Close if Open
     for (pass = 1; pass <= 2; pass++)
     {
         SQLFreeStmt(hstmt, SQL_CLOSE);   // Close if Open

-        tblNameSave = "";
+        tblNameSave = wxT("");

 
 

-        if (wxStrcmp(UserID.GetData(),"") &&
-             Dbms() != dbmsMY_SQL &&
-             Dbms() != dbmsACCESS)
+        if (wxStrcmp(UserID.c_str(),wxT("")) &&
+            Dbms() != dbmsMY_SQL &&
+            Dbms() != dbmsACCESS)

         {
             retcode = SQLTables(hstmt,
                                 NULL, 0,                             // All qualifiers
         {
             retcode = SQLTables(hstmt,
                                 NULL, 0,                             // All qualifiers

-                                (UCHAR *) UserID.GetData(), SQL_NTS, // User specified
+                                (UCHAR *) UserID.c_str(), SQL_NTS,   // User specified

                                 NULL, 0,                             // All tables
                                 NULL, 0);                            // All columns
         }
                                 NULL, 0,                             // All tables
                                 NULL, 0);                            // All columns
         }


@@ -2067,6 +2753,7 @@ wxDbInf *wxDB::GetCatalog(char *userID)
                                 NULL, 0,           // All tables
                                 NULL, 0);          // All columns
         }
                                 NULL, 0,           // All tables
                                 NULL, 0);          // All columns
         }

+

         if (retcode != SQL_SUCCESS)
         {
             DispAllErrors(henv, hdbc, hstmt);
         if (retcode != SQL_SUCCESS)
         {
             DispAllErrors(henv, hdbc, hstmt);


@@ -2074,7 +2761,7 @@ wxDbInf *wxDB::GetCatalog(char *userID)
             SQLFreeStmt(hstmt, SQL_CLOSE);
             return pDbInf;
         }
             SQLFreeStmt(hstmt, SQL_CLOSE);
             return pDbInf;
         }

-
+    

         while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)   // Table Information
         {
             if (pass == 1)  // First pass, just count the Tables
         while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)   // Table Information
         {
             if (pass == 1)  // First pass, just count the Tables


@@ -2090,24 +2777,18 @@ wxDbInf *wxDB::GetCatalog(char *userID)
             {
                 if (pDbInf->pTableInf == NULL)   // Has the Table Array been created
                 {  // no, then create the Array
             {
                 if (pDbInf->pTableInf == NULL)   // Has the Table Array been created
                 {  // no, then create the Array

-                    pDbInf->pTableInf = new wxTableInf[pDbInf->numTables];
-                    for (noTab=0;noTab<pDbInf->numTables;noTab++)
-                    {
-                        (pDbInf->pTableInf+noTab)->tableName[0]    = 0;
-                        (pDbInf->pTableInf+noTab)->tableType[0]    = 0;
-                        (pDbInf->pTableInf+noTab)->tableRemarks[0] = 0;
-                        (pDbInf->pTableInf+noTab)->numCols         = 0;
-                        (pDbInf->pTableInf+noTab)->pColInf         = NULL;
-                    }
+                    pDbInf->pTableInf = new wxDbTableInf[pDbInf->numTables];

                     noTab = 0;
                     noTab = 0;

-                } // if (pDbInf->pTableInf == NULL)   // Has the Table Array been created
+                } // if (pDbInf->pTableInf == NULL)   // Has the Table Array been created   
+

                 GetData( 3, SQL_C_CHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableName,    DB_MAX_TABLE_NAME_LEN+1, &cb);
                 GetData( 4, SQL_C_CHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableType,    30+1,                    &cb);
                 GetData( 5, SQL_C_CHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableRemarks, 254+1,                   &cb);
                 GetData( 3, SQL_C_CHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableName,    DB_MAX_TABLE_NAME_LEN+1, &cb);
                 GetData( 4, SQL_C_CHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableType,    30+1,                    &cb);
                 GetData( 5, SQL_C_CHAR,   (UCHAR*)  (pDbInf->pTableInf+noTab)->tableRemarks, 254+1,                   &cb);

+

                 noTab++;
                 noTab++;

-            }  // if (pass == 2)  We now know the amount of Tables
-        }   // while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
-    }    // for (pass = 1; pass <= 2; pass++)
+            }  // if
+        }  // while
+    }  // for

     SQLFreeStmt(hstmt, SQL_CLOSE);
 
     // Query how many columns are in each table
     SQLFreeStmt(hstmt, SQL_CLOSE);
 
     // Query how many columns are in each table


@@ -2115,12 +2796,14 @@ wxDbInf *wxDB::GetCatalog(char *userID)
     {
         (pDbInf->pTableInf+noTab)->numCols = GetColumnCount((pDbInf->pTableInf+noTab)->tableName,UserID);
     }
     {
         (pDbInf->pTableInf+noTab)->numCols = GetColumnCount((pDbInf->pTableInf+noTab)->tableName,UserID);
     }

+

     return pDbInf;
     return pDbInf;

-}  // wxDB::GetCatalog()

 
 

+}  // wxDb::GetCatalog()

 
 

-/********** wxDB::Catalog() **********/
-bool wxDB::Catalog(const char *userID, const char *fileName)
+
+/********** wxDb::Catalog() **********/
+bool wxDb::Catalog(const char *userID, const char *fileName)

 /*
  * Creates the text file specified in 'filename' which will contain
  * a minimal data dictionary of all tables accessible by the user specified
 /*
  * Creates the text file specified in 'filename' which will contain
  * a minimal data dictionary of all tables accessible by the user specified


@@ -2131,8 +2814,8 @@ bool wxDB::Catalog(const char *userID, const char *fileName)
  *        userID == ""    ... UserID set equal to 'this->uid'
  *        userID != ""    ... UserID set equal to 'userID'
  *
  *        userID == ""    ... UserID set equal to 'this->uid'
  *        userID != ""    ... UserID set equal to 'userID'
  *

- * NOTE: ALL column bindings associated with this wxDB instance are unbound
- *       by this function.  This function should use its own wxDB instance 
+ * NOTE: ALL column bindings associated with this wxDb instance are unbound
+ *       by this function.  This function should use its own wxDb instance

  *       to avoid undesired unbinding of columns.
  */
 {
  *       to avoid undesired unbinding of columns.
  */
 {


@@ -2163,24 +2846,24 @@ bool wxDB::Catalog(const char *userID, const char *fileName)
             UserID = userID;
     }
     else
             UserID = userID;
     }
     else

-        UserID = "";
+        UserID = wxT("");

 
     // dBase does not use user names, and some drivers fail if you try to pass one
     if (Dbms() == dbmsDBASE)
 
     // dBase does not use user names, and some drivers fail if you try to pass one
     if (Dbms() == dbmsDBASE)

-        UserID = "";
+        UserID = wxT("");

 
 

-    // Oracle user names may only be in uppercase, so force 
+    // Oracle user names may only be in uppercase, so force

     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 
     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
 

-    if (wxStrcmp(UserID.GetData(),"") &&
+    if (wxStrcmp(UserID.c_str(),wxT("")) &&

          Dbms() != dbmsMY_SQL &&
          Dbms() != dbmsACCESS)
     {
         retcode = SQLColumns(hstmt,
                              NULL, 0,                                // All qualifiers
          Dbms() != dbmsMY_SQL &&
          Dbms() != dbmsACCESS)
     {
         retcode = SQLColumns(hstmt,
                              NULL, 0,                                // All qualifiers

-                             (UCHAR *) UserID.GetData(), SQL_NTS,    // User specified
+                             (UCHAR *) UserID.c_str(), SQL_NTS,      // User specified

                              NULL, 0,                                // All tables
                              NULL, 0);                               // All columns
     }
                              NULL, 0,                                // All tables
                              NULL, 0);                               // All columns
     }


@@ -2200,12 +2883,12 @@ bool wxDB::Catalog(const char *userID, const char *fileName)
     }
 
     wxString outStr;
     }
 
     wxString outStr;

-    tblNameSave = "";
+    tblNameSave = wxT("");

     int cnt = 0;
 
     while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
     {
     int cnt = 0;
 
     while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
     {

-        if (wxStrcmp(tblName,tblNameSave.GetData()))
+        if (wxStrcmp(tblName,tblNameSave.c_str()))

         {
             if (cnt)
                 fputs("\n", fp);
         {
             if (cnt)
                 fputs("\n", fp);


@@ -2214,9 +2897,9 @@ bool wxDB::Catalog(const char *userID, const char *fileName)
             fputs("===================== ", fp);
             fputs("========= ", fp);
             fputs("=========\n", fp);
             fputs("===================== ", fp);
             fputs("========= ", fp);
             fputs("=========\n", fp);

-            outStr.sprintf("%-32s %-32s %-21s %9s %9s\n",
-                "TABLE NAME", "COLUMN NAME", "DATA TYPE", "PRECISION", "LENGTH");
-            fputs(outStr.GetData(), fp);
+            outStr.sprintf(wxT("%-32s %-32s %-21s %9s %9s\n"),
+                wxT("TABLE NAME"), wxT("COLUMN NAME"), wxT("DATA TYPE"), wxT("PRECISION"), wxT("LENGTH"));
+            fputs(outStr.c_str(), fp);

             fputs("================================ ", fp);
             fputs("================================ ", fp);
             fputs("===================== ", fp);
             fputs("================================ ", fp);
             fputs("================================ ", fp);
             fputs("===================== ", fp);


@@ -2234,7 +2917,7 @@ bool wxDB::Catalog(const char *userID, const char *fileName)
 
         outStr.sprintf("%-32s %-32s (%04d)%-15s %9d %9d\n",
             tblName, colName, sqlDataType, typeName, precision, length);
 
         outStr.sprintf("%-32s %-32s (%04d)%-15s %9d %9d\n",
             tblName, colName, sqlDataType, typeName, precision, length);

-        if (fputs(outStr.GetData(), fp) == EOF)
+        if (fputs(outStr.c_str(), fp) == EOF)

         {
             SQLFreeStmt(hstmt, SQL_CLOSE);
             fclose(fp);
         {
             SQLFreeStmt(hstmt, SQL_CLOSE);
             fclose(fp);


@@ -2251,10 +2934,10 @@ bool wxDB::Catalog(const char *userID, const char *fileName)
     fclose(fp);
     return(retcode == SQL_NO_DATA_FOUND);
 
     fclose(fp);
     return(retcode == SQL_NO_DATA_FOUND);
 

-}  // wxDB::Catalog()
+}  // wxDb::Catalog()

 
 
 
 

-bool wxDB::TableExists(const char *tableName, const char *userID, const char *tablePath)
+bool wxDb::TableExists(const char *tableName, const char *userID, const char *tablePath)

 /*
  * Table name can refer to a table, view, alias or synonym.  Returns true
  * if the object exists in the database.  This function does not indicate
 /*
  * Table name can refer to a table, view, alias or synonym.  Returns true
  * if the object exists in the database.  This function does not indicate


@@ -2269,22 +2952,22 @@ bool wxDB::TableExists(const char *tableName, const char *userID, const char *ta
 {
     wxString UserID;
     wxString TableName;
 {
     wxString UserID;
     wxString TableName;

-
+    

     assert(tableName && wxStrlen(tableName));
     assert(tableName && wxStrlen(tableName));

-
-    if (Dbms() == dbmsDBASE)
+    
+    if (Dbms() == dbmsDBASE) 

     {
         wxString dbName;
         if (tablePath && wxStrlen(tablePath))
     {
         wxString dbName;
         if (tablePath && wxStrlen(tablePath))

-            dbName.sprintf("%s/%s.dbf",tablePath,tableName);
+            dbName.sprintf("%s\\%s.dbf",tablePath,tableName);      

         else
             dbName.sprintf("%s.dbf",tableName);
         else
             dbName.sprintf("%s.dbf",tableName);

-
+        

         bool exists;
         bool exists;

-        exists = wxFileExists(dbName.GetData());
+        exists = wxFileExists(dbName.c_str());    

         return exists;
     }
         return exists;
     }

-
+    

     if (userID)
     {
         if (!wxStrlen(userID))
     if (userID)
     {
         if (!wxStrlen(userID))


@@ -2294,59 +2977,186 @@ bool wxDB::TableExists(const char *tableName, const char *userID, const char *ta
     }
     else
         UserID = "";
     }
     else
         UserID = "";

-
-    // Oracle user names may only be in uppercase, so force 
+    
+    // Oracle user names may only be in uppercase, so force

     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();
     // the name to uppercase
     if (Dbms() == dbmsORACLE)
         UserID = UserID.Upper();

-
+    

     TableName = tableName;
     TableName = tableName;

-    // Oracle table names are uppercase only, so force 
+    // Oracle and Interbase table names are uppercase only, so force

     // the name to uppercase just in case programmer forgot to do this
     // the name to uppercase just in case programmer forgot to do this

-    if (Dbms() == dbmsORACLE)
+    if ((Dbms() == dbmsORACLE) || 
+        (Dbms() == dbmsINTERBASE))

         TableName = TableName.Upper();
         TableName = TableName.Upper();

-
+    

     SQLFreeStmt(hstmt, SQL_CLOSE);
     RETCODE retcode;
     SQLFreeStmt(hstmt, SQL_CLOSE);
     RETCODE retcode;

-
-    // MySQL and Access cannot accept a user name when looking up table names, so we
-    // use the call below that leaves out the user name
+    
+    // Some databases cannot accept a user name when looking up table names,
+    // so we use the call below that leaves out the user name

     if (wxStrcmp(UserID,"") &&
     if (wxStrcmp(UserID,"") &&

-         Dbms() != dbmsMY_SQL &&
-         Dbms() != dbmsACCESS)
+        Dbms() != dbmsMY_SQL &&
+        Dbms() != dbmsACCESS &&
+        Dbms() != dbmsMS_SQL_SERVER)

     {
         retcode = SQLTables(hstmt,
     {
         retcode = SQLTables(hstmt,

-                            NULL, 0,                                    // All qualifiers
-                            (UCHAR *) UserID.GetData(), SQL_NTS,        // All owners
-                            (UCHAR FAR *)TableName.GetData(), SQL_NTS,
-                            NULL, 0);                                   // All table types
+                            NULL, 0,                                  // All qualifiers
+                            (UCHAR *) UserID.c_str(), SQL_NTS,        // Only tables owned by this user
+                            (UCHAR FAR *)TableName.c_str(), SQL_NTS,
+                            NULL, 0);                                 // All table types

     }
     else
     {
         retcode = SQLTables(hstmt,
     }
     else
     {
         retcode = SQLTables(hstmt,

-                            NULL, 0,                                    // All qualifiers
-                            NULL, 0,                                    // All owners
-                            (UCHAR FAR *)TableName.GetData(), SQL_NTS,
-                            NULL, 0);                                   // All table types
+                            NULL, 0,                                  // All qualifiers
+                            NULL, 0,                                  // All owners
+                            (UCHAR FAR *)TableName.c_str(), SQL_NTS,
+                            NULL, 0);                                 // All table types

     }
     if (retcode != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));
     }
     if (retcode != SQL_SUCCESS)
         return(DispAllErrors(henv, hdbc, hstmt));

-
+    

     retcode = SQLFetch(hstmt);
     retcode = SQLFetch(hstmt);

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

     {
         SQLFreeStmt(hstmt, SQL_CLOSE);
         return(DispAllErrors(henv, hdbc, hstmt));
     }
     {
         SQLFreeStmt(hstmt, SQL_CLOSE);
         return(DispAllErrors(henv, hdbc, hstmt));
     }

-
+    

     SQLFreeStmt(hstmt, SQL_CLOSE);
     SQLFreeStmt(hstmt, SQL_CLOSE);

+

     return(TRUE);
     return(TRUE);

+    
+}  // wxDb::TableExists()
+
+
+/********** wxDb::TablePrivileges() **********/
+bool wxDb::TablePrivileges(const char *tableName, const char* priv, const char *userID, 
+                            const char *schema, const char *tablePath)
+{
+    wxDbTablePrivilegeInfo  result;
+    SDWORD  cbRetVal;
+    RETCODE retcode;
+    
+    //We probably need to be able to dynamically set this based on 
+    //the driver type, and state.
+    char curRole[]="public";
+    
+    //Prologue here similar to db::TableExists()
+    wxString UserID;
+    wxString TableName;
+    
+    assert(userID);
+    assert(tableName && wxStrlen(tableName));
+    
+    if (userID)
+    {
+        if (!wxStrlen(userID))
+            UserID = uid;
+        else
+            UserID = userID;
+    }
+    else
+        UserID = "";
+    
+    // Oracle user names may only be in uppercase, so force 
+    // the name to uppercase
+    if (Dbms() == dbmsORACLE)
+        UserID = UserID.Upper();
+    
+    TableName = tableName;
+    // Oracle and Interbase table names are uppercase only, so force
+    // the name to uppercase just in case programmer forgot to do this
+    if ((Dbms() == dbmsORACLE) || 
+        (Dbms() == dbmsINTERBASE))
+        TableName = TableName.Upper();
+    
+    SQLFreeStmt(hstmt, SQL_CLOSE);
+
+    if (!schema)
+    {
+        retcode = SQLTablePrivileges(hstmt,
+                                     NULL, 0,                                    // Catalog
+                                     NULL, 0,                                    // Schema
+                                     (UCHAR FAR *)TableName.c_str(), SQL_NTS);  
+    }
+    else
+    {
+        retcode = SQLTablePrivileges(hstmt,
+                                     NULL, 0,                                    // Catalog
+                                     (UCHAR FAR *)schema, SQL_NTS,               // Schema
+                                     (UCHAR FAR *)TableName.c_str(), SQL_NTS);  
+    }
+
+#ifdef DBDEBUG_CONSOLE 
+    fprintf(stderr ,"SQLTablePrivileges() returned %i \n",retcode);
+#endif
+    
+    if ((retcode != SQL_SUCCESS) && (retcode != SQL_SUCCESS_WITH_INFO))
+        return(DispAllErrors(henv, hdbc, hstmt));
+
+    retcode = SQLFetch(hstmt);
+    while (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO) 
+    {
+        if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) result.tableQual, sizeof(result.tableQual), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+    
+        if (SQLGetData(hstmt, 2, SQL_C_CHAR, (UCHAR*) result.tableOwner, sizeof(result.tableOwner), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+    
+        if (SQLGetData(hstmt, 3, SQL_C_CHAR, (UCHAR*) result.tableName, sizeof(result.tableName), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+    
+        if (SQLGetData(hstmt, 4, SQL_C_CHAR, (UCHAR*) result.grantor, sizeof(result.grantor), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+    
+        if (SQLGetData(hstmt, 5, SQL_C_CHAR, (UCHAR*) result.grantee, sizeof(result.grantee), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+    
+        if (SQLGetData(hstmt, 6, SQL_C_CHAR, (UCHAR*) result.privilege, sizeof(result.privilege), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+    
+        if (SQLGetData(hstmt, 7, SQL_C_CHAR, (UCHAR*) result.grantable, sizeof(result.grantable), &cbRetVal) != SQL_SUCCESS)
+            return(DispAllErrors(henv, hdbc, hstmt));
+
+#ifdef DBDEBUG_CONSOLE
+        fprintf(stderr,"Scanning %s privilege on table %s.%s granted by %s to %s\n",
+                result.privilege,result.tableOwner,result.tableName,
+                result.grantor, result.grantee);
+#endif 
+
+        if (UserID.IsSameAs(result.tableOwner,false))
+        {
+            SQLFreeStmt(hstmt, SQL_CLOSE);
+            return TRUE;
+        }
+        
+        if (UserID.IsSameAs(result.grantee,false) &&
+            !wxStrcmp(result.privilege,priv))
+        {
+            SQLFreeStmt(hstmt, SQL_CLOSE);
+            return TRUE;
+        }
+        
+        if (!wxStrcmp(result.grantee,curRole) &&
+            !wxStrcmp(result.privilege,priv))
+        {
+            SQLFreeStmt(hstmt, SQL_CLOSE);
+            return TRUE;
+        }
+        
+        retcode = SQLFetch(hstmt);
+    } 
+    
+    SQLFreeStmt(hstmt, SQL_CLOSE);
+    return FALSE;

 
 

-}  // wxDB::TableExists()
+}  // wxDb::TablePrivileges

 
 
 
 

-/********** wxDB::SqlLog() **********/
-bool wxDB::SqlLog(enum sqlLog state, const char *filename, bool append)
+/********** wxDb::SetSqlLogging() **********/
+bool wxDb::SetSqlLogging(wxDbSqlLogState state, const char *filename, bool append)

 {
     assert(state == sqlLogON  || state == sqlLogOFF);
     assert(state == sqlLogOFF || filename);
 {
     assert(state == sqlLogON  || state == sqlLogOFF);
     assert(state == sqlLogOFF || filename);


@@ -2373,11 +3183,11 @@ bool wxDB::SqlLog(enum sqlLog state, const char *filename, bool append)
     sqlLogState = state;
     return(TRUE);
 
     sqlLogState = state;
     return(TRUE);
 

-}  // wxDB::SqlLog()
+}  // wxDb::SetSqlLogging()

 
 
 
 

-/********** wxDB::WriteSqlLog() **********/
-bool wxDB::WriteSqlLog(const char *logMsg)
+/********** wxDb::WriteSqlLog() **********/
+bool wxDb::WriteSqlLog(const wxChar *logMsg)

 {
     assert(logMsg);
 
 {
     assert(logMsg);
 


@@ -2390,18 +3200,18 @@ bool wxDB::WriteSqlLog(const char *logMsg)
 
     return(TRUE);
 
 
     return(TRUE);
 

-}  // wxDB::WriteSqlLog()
+}  // wxDb::WriteSqlLog()

 
 
 
 

-/********** wxDB::Dbms() **********/
-DBMS wxDB::Dbms(void)
+/********** wxDb::Dbms() **********/
+wxDBMS wxDb::Dbms(void)

 /*
  * Be aware that not all database engines use the exact same syntax, and not
  * every ODBC compliant database is compliant to the same level of compliancy.
  * Some manufacturers support the minimum Level 1 compliancy, and others up
  * through Level 3.  Others support subsets of features for levels above 1.
  *
 /*
  * Be aware that not all database engines use the exact same syntax, and not
  * every ODBC compliant database is compliant to the same level of compliancy.
  * Some manufacturers support the minimum Level 1 compliancy, and others up
  * through Level 3.  Others support subsets of features for levels above 1.
  *

- * If you find an inconsistency between the wxDB class and a specific database
+ * If you find an inconsistency between the wxDb class and a specific database

  * engine, and an identifier to this section, and special handle the database in
  * the area where behavior is non-conforming with the other databases.
  *
  * engine, and an identifier to this section, and special handle the database in
  * the area where behavior is non-conforming with the other databases.
  *


@@ -2415,8 +3225,8 @@ DBMS wxDB::Dbms(void)
  * DBASE
  *        - Does not support the SQL_TIMESTAMP structure
  *        - Supports only one cursor and one connect (apparently? with Microsoft driver only?)
  * DBASE
  *        - Does not support the SQL_TIMESTAMP structure
  *        - Supports only one cursor and one connect (apparently? with Microsoft driver only?)

- *    - Does not automatically create the primary index if the 'keyField' param of SetColDef
- *      is TRUE.  The user must create ALL indexes from their program.
+ *        - Does not automatically create the primary index if the 'keyField' param of SetColDef
+ *            is TRUE.  The user must create ALL indexes from their program.

  *        - Table names can only be 8 characters long
  *        - Column names can only be 10 characters long
  *
  *        - Table names can only be 8 characters long
  *        - Column names can only be 10 characters long
  *


@@ -2428,55 +3238,105 @@ DBMS wxDB::Dbms(void)
  *
  * SYBASE (Enterprise)
  *        - If a column is part of the Primary Key, the column cannot be NULL
  *
  * SYBASE (Enterprise)
  *        - If a column is part of the Primary Key, the column cannot be NULL

+ *        - Maximum row size is somewhere in the neighborhood of 1920 bytes

  *
  * MY_SQL
  *        - If a column is part of the Primary Key, the column cannot be NULL
  *        - Cannot support selecting for update [::CanSelectForUpdate()].  Always returns FALSE
  *
  * MY_SQL
  *        - If a column is part of the Primary Key, the column cannot be NULL
  *        - Cannot support selecting for update [::CanSelectForUpdate()].  Always returns FALSE

+ *        - Columns that are part of primary or secondary keys must be defined as being NOT NULL
+ *            when they are created.  Some code is added in ::CreateIndex to try to adjust the
+ *            column definition if it is not defined correctly, but it is experimental
+ *        - Does not support sub-queries in SQL statements

  *
  * POSTGRES
  *
  * POSTGRES

- *        - Does not support the keywords 'ASC' or 'DESC' as of release v6.5.0 
+ *        - Does not support the keywords 'ASC' or 'DESC' as of release v6.5.0
+ *        - Does not support sub-queries in SQL statements

  *
  *

+ * DB2
+ *        - Primary keys must be declared as NOT NULL

  *
  */
 {
  *
  */
 {

-    wxChar baseName[25+1];
+    // Should only need to do this once for each new database connection
+    // so return the value we already determined it to be to save time 
+    // and lots of string comparisons
+    if (dbmsType != dbmsUNIDENTIFIED)
+        return(dbmsType);

 
 

+    wxChar baseName[25+1];

     wxStrncpy(baseName,dbInf.dbmsName,25);
     wxStrncpy(baseName,dbInf.dbmsName,25);

+    baseName[25] = 0;
+
+    // RGG 20001025 : add support for Interbase
+    // GT : Integrated to base classes on 20001121
+    if (!wxStricmp(dbInf.dbmsName,"Interbase"))
+        return((wxDBMS)(dbmsType = dbmsINTERBASE));
+
+    // BJO 20000428 : add support for Virtuoso
+    if (!wxStricmp(dbInf.dbmsName,"OpenLink Virtuoso VDBMS"))
+      return((wxDBMS)(dbmsType = dbmsVIRTUOSO));
+

     if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
     if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))

-        return(dbmsSYBASE_ASA);
-    if (!wxStricmp(dbInf.dbmsName,"SQL Server"))  // Sybase Adaptive Server 
-        return(dbmsSYBASE_ASE);
+        return((wxDBMS)(dbmsType = dbmsSYBASE_ASA));
+
+    // BJO 20000427 : The "SQL Server" string is also returned by SQLServer when
+    // connected through an OpenLink driver.
+    // Is it also returned by Sybase Adapatitve server?    
+    // OpenLink driver name is OLOD3032.DLL for msw and oplodbc.so for unix 
+    if (!wxStricmp(dbInf.dbmsName,"SQL Server"))       
+    {
+      if (!wxStrncmp(dbInf.driverName, "oplodbc", 7) ||
+          !wxStrncmp(dbInf.driverName, "OLOD", 4))
+                       return ((wxDBMS)(dbmsMS_SQL_SERVER));
+               else
+                       return ((wxDBMS)(dbmsType = dbmsSYBASE_ASE));
+    }
+

     if (!wxStricmp(dbInf.dbmsName,"Microsoft SQL Server"))
     if (!wxStricmp(dbInf.dbmsName,"Microsoft SQL Server"))

-        return(dbmsMS_SQL_SERVER);
+        return((wxDBMS)(dbmsType = dbmsMS_SQL_SERVER));

     if (!wxStricmp(dbInf.dbmsName,"MySQL"))
     if (!wxStricmp(dbInf.dbmsName,"MySQL"))

-        return(dbmsMY_SQL);
+        return((wxDBMS)(dbmsType = dbmsMY_SQL));

     if (!wxStricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
     if (!wxStricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0

-        return(dbmsPOSTGRES);
+        return((wxDBMS)(dbmsType = dbmsPOSTGRES));

 
     baseName[8] = 0;
     if (!wxStricmp(baseName,"Informix"))
 
     baseName[8] = 0;
     if (!wxStricmp(baseName,"Informix"))

-        return(dbmsINFORMIX);
+        return((wxDBMS)(dbmsType = dbmsINFORMIX));

 
     baseName[6] = 0;
     if (!wxStricmp(baseName,"Oracle"))
 
     baseName[6] = 0;
     if (!wxStricmp(baseName,"Oracle"))

-        return(dbmsORACLE);
+        return((wxDBMS)(dbmsType = dbmsORACLE));

     if (!wxStricmp(dbInf.dbmsName,"ACCESS"))
     if (!wxStricmp(dbInf.dbmsName,"ACCESS"))

-        return(dbmsACCESS);
+        return((wxDBMS)(dbmsType = dbmsACCESS));

     if (!wxStricmp(dbInf.dbmsName,"MySQL"))
     if (!wxStricmp(dbInf.dbmsName,"MySQL"))

-        return(dbmsMY_SQL);
+        return((wxDBMS)(dbmsType = dbmsMY_SQL));
+    if (!wxStricmp(baseName,"Sybase"))             
+      return((wxDBMS)(dbmsType = dbmsSYBASE_ASE));

 
     baseName[5] = 0;
     if (!wxStricmp(baseName,"DBASE"))
 
     baseName[5] = 0;
     if (!wxStricmp(baseName,"DBASE"))

-        return(dbmsDBASE);
+        return((wxDBMS)(dbmsType = dbmsDBASE));
+
+    baseName[3] = 0;
+    if (!wxStricmp(baseName,"DB2"))
+        return((wxDBMS)(dbmsType = dbmsDBASE));

 
 

-    return(dbmsUNIDENTIFIED);
-}  // wxDB::Dbms()
+    return((wxDBMS)(dbmsType = dbmsUNIDENTIFIED));

 
 

+}  // wxDb::Dbms()

 
 

-/********** GetDbConnection() **********/
-wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
+
+/********** wxDbGetConnection() **********/
+wxDb WXDLLEXPORT *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors)

 {
 {

-    DbList *pList;
+    wxDbList *pList;
+
+    // Used to keep a pointer to a DB connection that matches the requested
+    // DSN and FwdOnlyCursors settings, even if it is not FREE, so that the
+    // data types can be copied from it (using the wxDb::Open(wxDb *) function)
+    // rather than having to re-query the datasource to get all the values
+    // using the wxDb::Open(Dsn,Uid,AuthStr) function
+    wxDb *matchingDbConnection = NULL;

 
     // Scan the linked list searching for an available database connection
     // that's already been opened but is currently not in use.
 
     // Scan the linked list searching for an available database connection
     // that's already been opened but is currently not in use.


@@ -2484,11 +3344,18 @@ wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
     {
         // The database connection must be for the same datasource
         // name and must currently not be in use.
     {
         // The database connection must be for the same datasource
         // name and must currently not be in use.

-        if (pList->Free && (! wxStrcmp(pDbStuff->Dsn, pList->Dsn)))  // Found a free connection
+        if (pList->Free &&
+            (pList->PtrDb->FwdOnlyCursors() == FwdOnlyCursors) &&
+            (!wxStrcmp(pDbConfig->Dsn, pList->Dsn)))  // Found a free connection

         {
             pList->Free = FALSE;
             return(pList->PtrDb);
         }
         {
             pList->Free = FALSE;
             return(pList->PtrDb);
         }

+
+        if (!wxStrcmp(pDbConfig->Dsn, pList->Dsn) &&
+            !wxStrcmp(pDbConfig->Uid, pList->Uid) &&
+            !wxStrcmp(pDbConfig->AuthStr, pList->AuthStr))
+            matchingDbConnection = pList->PtrDb;

     }
 
     // No available connections.  A new connection must be made and
     }
 
     // No available connections.  A new connection must be made and


@@ -2498,27 +3365,37 @@ wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
         // Find the end of the list
         for (pList = PtrBegDbList; pList->PtrNext; pList = pList->PtrNext);
         // Append a new list item
         // Find the end of the list
         for (pList = PtrBegDbList; pList->PtrNext; pList = pList->PtrNext);
         // Append a new list item

-        pList->PtrNext = new DbList;
+        pList->PtrNext = new wxDbList;

         pList->PtrNext->PtrPrev = pList;
         pList = pList->PtrNext;
     }
         pList->PtrNext->PtrPrev = pList;
         pList = pList->PtrNext;
     }

-    else    // Empty list
+    else  // Empty list

     {
         // Create the first node on the list
     {
         // Create the first node on the list

-        pList = PtrBegDbList = new DbList;
+        pList = PtrBegDbList = new wxDbList;

         pList->PtrPrev = 0;
     }
 
     // Initialize new node in the linked list
     pList->PtrNext = 0;
     pList->Free = FALSE;
         pList->PtrPrev = 0;
     }
 
     // Initialize new node in the linked list
     pList->PtrNext = 0;
     pList->Free = FALSE;

-    wxStrcpy(pList->Dsn, pDbStuff->Dsn);
-    pList->PtrDb = new wxDB(pDbStuff->Henv,FwdOnlyCursors);
+    wxStrcpy(pList->Dsn, pDbConfig->Dsn);
+    wxStrcpy(pList->Uid, pDbConfig->Uid);
+    wxStrcpy(pList->AuthStr, pDbConfig->AuthStr);
+
+    pList->PtrDb = new wxDb(pDbConfig->Henv,FwdOnlyCursors);
+
+    bool opened = FALSE;
+
+    if (!matchingDbConnection)
+        opened = pList->PtrDb->Open(pDbConfig->Dsn, pDbConfig->Uid, pDbConfig->AuthStr);
+    else
+        opened = pList->PtrDb->Open(matchingDbConnection);

 
     // Connect to the datasource
 
     // Connect to the datasource

-    if (pList->PtrDb->Open(pDbStuff->Dsn, pDbStuff->Uid, pDbStuff->AuthStr))
+    if (opened)

     {
     {

-        pList->PtrDb->SqlLog(SQLLOGstate,SQLLOGfn,TRUE);
+        pList->PtrDb->SetSqlLogging(SQLLOGstate,SQLLOGfn,TRUE);

         return(pList->PtrDb);
     }
     else  // Unable to connect, destroy list item
         return(pList->PtrDb);
     }
     else  // Unable to connect, destroy list item


@@ -2527,59 +3404,59 @@ wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
             pList->PtrPrev->PtrNext = 0;
         else
             PtrBegDbList = 0;                // Empty list again
             pList->PtrPrev->PtrNext = 0;
         else
             PtrBegDbList = 0;                // Empty list again

-        pList->PtrDb->CommitTrans();    // Commit any open transactions on wxDB object
-        pList->PtrDb->Close();            // Close the wxDB object
-        delete pList->PtrDb;                // Deletes the wxDB object
+        pList->PtrDb->CommitTrans();    // Commit any open transactions on wxDb object
+        pList->PtrDb->Close();            // Close the wxDb object
+        delete pList->PtrDb;                // Deletes the wxDb object

         delete pList;                        // Deletes the linked list object
         return(0);
     }
 
         delete pList;                        // Deletes the linked list object
         return(0);
     }
 

-}  // GetDbConnection()
+}  // wxDbGetConnection()

 
 
 
 

-/********** FreeDbConnection() **********/
-bool WXDLLEXPORT FreeDbConnection(wxDB *pDb)
+/********** wxDbFreeConnection() **********/
+bool WXDLLEXPORT wxDbFreeConnection(wxDb *pDb)

 {
 {

-    DbList *pList;
+    wxDbList *pList;

 
     // Scan the linked list searching for the database connection
     for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
     {
 
     // Scan the linked list searching for the database connection
     for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
     {

-        if (pList->PtrDb == pDb)        // Found it!!!
-            return(pList->Free = TRUE);
+        if (pList->PtrDb == pDb)  // Found it, now free it!!!
+            return (pList->Free = TRUE);

     }
 
     // Never found the database object, return failure
     return(FALSE);
 
     }
 
     // Never found the database object, return failure
     return(FALSE);
 

-}  // FreeDbConnection()
+}  // wxDbFreeConnection()

 
 
 
 

-/********** CloseDbConnections() **********/
-void WXDLLEXPORT CloseDbConnections(void)
+/********** wxDbCloseConnections() **********/
+void WXDLLEXPORT wxDbCloseConnections(void)

 {
 {

-    DbList *pList, *pNext;
-    
+    wxDbList *pList, *pNext;
+

     // Traverse the linked list closing database connections and freeing memory as I go.
     for (pList = PtrBegDbList; pList; pList = pNext)
     {
         pNext = pList->PtrNext;       // Save the pointer to next
     // Traverse the linked list closing database connections and freeing memory as I go.
     for (pList = PtrBegDbList; pList; pList = pNext)
     {
         pNext = pList->PtrNext;       // Save the pointer to next

-        pList->PtrDb->CommitTrans();  // Commit any open transactions on wxDB object
-        pList->PtrDb->Close();        // Close the wxDB object
-        delete pList->PtrDb;          // Deletes the wxDB object
+        pList->PtrDb->CommitTrans();  // Commit any open transactions on wxDb object
+        pList->PtrDb->Close();        // Close the wxDb object
+        delete pList->PtrDb;          // Deletes the wxDb object

         delete pList;                 // Deletes the linked list object
     }
 
     // Mark the list as empty
     PtrBegDbList = 0;
 
         delete pList;                 // Deletes the linked list object
     }
 
     // Mark the list as empty
     PtrBegDbList = 0;
 

-}  // CloseDbConnections()
+}  // wxDbCloseConnections()

 
 
 
 

-/********** NumberDbConnectionsInUse() **********/
-int WXDLLEXPORT NumberDbConnectionsInUse(void)
+/********** wxDbConnectionsInUse() **********/
+int WXDLLEXPORT wxDbConnectionsInUse(void)

 {
 {

-    DbList *pList;
+    wxDbList *pList;

     int cnt = 0;
 
     // Scan the linked list counting db connections that are currently in use
     int cnt = 0;
 
     // Scan the linked list counting db connections that are currently in use


@@ -2591,32 +3468,115 @@ int WXDLLEXPORT NumberDbConnectionsInUse(void)
 
     return(cnt);
 
 
     return(cnt);
 

-}  // NumberDbConnectionsInUse()
+}  // wxDbConnectionsInUse()

 
 
 
 

-/********** SqlLog() **********/
-bool SqlLog(enum sqlLog state, char *filename)
+/********** wxDbSqlLog() **********/
+bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename)

 {
     bool append = FALSE;
 {
     bool append = FALSE;

-    DbList *pList;
+    wxDbList *pList;

 
     for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
     {
 
     for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
     {

-        if (!pList->PtrDb->SqlLog(state,filename,append))
+        if (!pList->PtrDb->SetSqlLogging(state,filename,append))

             return(FALSE);
         append = TRUE;
     }
 
     SQLLOGstate = state;
             return(FALSE);
         append = TRUE;
     }
 
     SQLLOGstate = state;

-    wxStrcpy(SQLLOGfn,filename);
+    SQLLOGfn = filename;

 
     return(TRUE);
 
 
     return(TRUE);
 

-}  // SqlLog()
+}  // wxDbSqlLog()

 
 
 
 

-/********** GetDataSource() **********/
-bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
+#if 0
+/********** wxDbCreateDataSource() **********/
+int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *description,
+                         bool sysDSN, const char *defDir, wxWindow *parent)
+/*
+ * !!!! ONLY FUNCTIONAL UNDER MSW with VC6 !!!!
+ * Very rudimentary creation of an ODBC data source.  
+ *
+ * ODBC driver must be ODBC 3.0 compliant to use this function
+ */
+{
+    int result = FALSE;
+
+//!!!! ONLY FUNCTIONAL UNDER MSW with VC6 !!!!
+#ifdef __VISUALC__
+    int       dsnLocation;
+    wxString  setupStr;
+
+    if (sysDSN)
+        dsnLocation = ODBC_ADD_SYS_DSN;
+    else
+        dsnLocation = ODBC_ADD_DSN;
+
+    // NOTE: The decimal 2 is an invalid character in all keyword pairs
+    // so that is why I used it, as wxString does not deal well with 
+    // embedded nulls in strings
+    setupStr.sprintf("DSN=%s%cDescription=%s%cDefaultDir=%s%c",dsn,2,description,2,defDir,2);
+
+    // Replace the separator from above with the '\0' seperator needed
+    // by the SQLConfigDataSource() function
+    int k;
+    do
+    {
+        k = setupStr.Find((wxChar)2,TRUE);
+        if (k != wxNOT_FOUND)
+            setupStr[(UINT)k] = '\0';
+    }
+    while (k != wxNOT_FOUND);
+
+    result = SQLConfigDataSource((HWND)parent->GetHWND(), dsnLocation,
+                                 driverName, setupStr.c_str());
+
+    if ((result != SQL_SUCCESS) && (result != SQL_SUCCESS_WITH_INFO))
+    {
+        // check for errors caused by ConfigDSN based functions
+        DWORD retcode = 0;
+        WORD cb;
+        wxChar errMsg[SQL_MAX_MESSAGE_LENGTH];
+        errMsg[0] = '\0';
+
+        // This function is only supported in ODBC drivers v3.0 compliant and above
+        SQLInstallerError(1,&retcode,errMsg,SQL_MAX_MESSAGE_LENGTH-1,&cb);
+        if (retcode)
+        {
+#ifdef DBDEBUG_CONSOLE
+               // When run in console mode, use standard out to display errors.
+               cout << errMsg << endl;
+               cout << wxT("Press any key to continue...") << endl;
+               getchar();
+#endif  // DBDEBUG_CONSOLE
+
+#ifdef __WXDEBUG__
+               wxLogDebug(errMsg,wxT("ODBC DEBUG MESSAGE"));
+#endif  // __WXDEBUG__
+        }
+    }
+    else
+       result = TRUE;
+#else
+    // Using iODBC/unixODBC or some other compiler which does not support the APIs
+    // necessary to use this function, so this function is not supported
+#ifdef __WXDEBUG__
+    wxLogDebug("wxDbCreateDataSource() not available except under VC++/MSW",wxT("ODBC DEBUG MESSAGE"));
+#endif
+    result = FALSE;
+#endif  // __VISUALC__
+
+    return result;
+
+}  // wxDbCreateDataSource()
+#endif
+
+
+/********** wxDbGetDataSource() **********/
+bool wxDbGetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,

                          UWORD direction)
 /*
  * Dsn and DsDesc will contain the data source name and data source
                          UWORD direction)
 /*
  * Dsn and DsDesc will contain the data source name and data source


@@ -2631,8 +3591,51 @@ bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDes
     else
         return(FALSE);
 
     else
         return(FALSE);
 

-}  // GetDataSource()
+}  // wxDbGetDataSource()
+

 
 

+// Change this to 0 to remove use of all deprecated functions
+#if wxODBC_BACKWARD_COMPATABILITY
+/********************************************************************
+ ********************************************************************
+ *
+ * The following functions are all DEPRECATED and are included for
+ * backward compatability reasons only
+ *
+ ********************************************************************
+ ********************************************************************/
+bool SqlLog(sqlLog state, const wxChar *filename)
+{
+    return wxDbSqlLog((enum wxDbSqlLogState)state, filename);
+}
+/***** DEPRECATED: use wxGetDataSource() *****/
+bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
+                         UWORD direction)
+{
+    return wxDbGetDataSource(henv, Dsn, DsnMax, DsDesc, DsDescMax, direction);
+}
+/***** DEPRECATED: use wxDbGetConnection() *****/
+wxDb WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
+{
+    return wxDbGetConnection((wxDbConnectInf *)pDbStuff, FwdOnlyCursors);
+}
+/***** DEPRECATED: use wxDbFreeConnection() *****/
+bool WXDLLEXPORT FreeDbConnection(wxDb *pDb)
+{
+    return wxDbFreeConnection(pDb);
+}
+/***** DEPRECATED: use wxDbCloseConnections() *****/
+void WXDLLEXPORT CloseDbConnections(void)
+{
+    wxDbCloseConnections();
+}
+/***** DEPRECATED: use wxDbConnectionsInUse() *****/
+int WXDLLEXPORT NumberDbConnectionsInUse(void)
+{
+    return wxDbConnectionsInUse();
+}

 #endif
 #endif

- // wxUSE_ODBC

 
 

+
+#endif
+ // wxUSE_ODBC