]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/db.cpp
2 warnings from Solaris build log fixed
[wxWidgets.git] / src / common / db.cpp
index 378b02a37451a090ce01ad97f1162b9d7a5c97c1..4617ff18d765f4adfd03e3da299960bbef02cafb 100644 (file)
@@ -4,7 +4,7 @@
 //              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:
+// Modified by: George Tasker
 // Mods:        Dec, 1998: 
 //                -Added support for SQL statement logging and database cataloging
 // Mods:        April, 1999
 // SYNOPSIS STOP
 */
 
+#include "wx/wxprec.h"
+
 // Use this line for wxWindows v1.x
 //#include "wx_ver.h"
 // Use this line for wxWindows v2.x
 #include "wx/version.h"
-#include "wx/wxprec.h"
 
 #if wxMAJOR_VERSION == 2
        #ifdef __GNUG__
 #endif  //__BORLANDC__
 
 #if wxMAJOR_VERSION == 2
-       #ifndef WX_PRECOMP
-               #include  "wx/string.h"
-       #endif //WX_PRECOMP
+        #ifndef WX_PRECOMP
+                #include "wx/string.h"
+                #include "wx/object.h"
+                #include "wx/list.h"
+                #include "wx/utils.h"
+                #include "wx/msgdlg.h"
+       #endif
+       #include "wx/filefn.h"
+       #include "wx/wxchar.h"
 #endif
 
 #if wxMAJOR_VERSION == 1
 #include <assert.h>
 #include <stdlib.h>
 #include <ctype.h>
+
 #if   wxMAJOR_VERSION == 1
        #include "db.h"
 #elif wxMAJOR_VERSION == 2
        #include "wx/db.h"
 #endif
 
-DbList* WXDLLEXPORT PtrBegDbList = 0;
+DbList WXDLLEXPORT *PtrBegDbList = 0;
 
-#if __WXDEBUG__ > 0
-        #if   wxMAJOR_VERSION == 2
-                #include "wx/object.h"
-                #include "wx/list.h"
-                #include "wx/utils.h"
-                #include "wx/msgdlg.h"
-       #endif
+#ifdef __WXDEBUG__
        extern wxList TablesInUse;
 #endif
 
@@ -109,8 +111,109 @@ char SQLLOGfn[DB_PATH_MAX+1] = "sqllog.txt";
 // this variable.
 char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
+
+/********** wxColFor Constructor **********/
+wxColFor::wxColFor()
+{
+    i_Nation = 0;                // 0=EU, 1=UK, 2=International, 3=US
+    s_Field  = "";
+    for (int i=0;i<7;i++)
+    {
+        s_Format[i] = "";
+        s_Menge[i]  = "";
+        i_Menge[i]  = 0;
+    }
+    Format(1,DB_DATA_TYPE_VARCHAR,0,0,0);      // the Function that does the work
+}  // wxColFor::wxColFor()
+
+
+wxColFor::~wxColFor()
+{
+}  // wxColFor::~wxColFor()
+
+
+int wxColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSize,short decimalDigits)
+{
+    // ----------------------------------------------------------------------------------------
+    // -- 19991224 : mj10777@gmx.net : 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
+    // 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.
+    // ----------------------------------------------------------------------------------------
+    // There should also be a Function to scan in a string to fill the variable
+    // ----------------------------------------------------------------------------------------
+    wxString Temp0;
+    i_Nation     = Nation;                                  // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US
+    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
+    {
+        if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR))
+            i_dbDataType = DB_DATA_TYPE_VARCHAR;
+        if (i_sqlDataType == SQL_C_DATE)
+            i_dbDataType = DB_DATA_TYPE_DATE;
+        if (i_sqlDataType == SQL_C_BIT)
+            i_dbDataType = DB_DATA_TYPE_INTEGER;
+        if (i_sqlDataType == SQL_NUMERIC)
+            i_dbDataType = DB_DATA_TYPE_VARCHAR;
+        if (i_sqlDataType == SQL_REAL)
+            i_dbDataType = DB_DATA_TYPE_FLOAT;
+    }
+    if ((i_dbDataType == DB_DATA_TYPE_INTEGER) && (i_sqlDataType == SQL_C_DOUBLE))
+    {   // DBASE Numeric
+        i_dbDataType = DB_DATA_TYPE_FLOAT;
+    }
+    switch(i_dbDataType)     // -A-> Still a lot of proper formatting to do
+    {
+        case DB_DATA_TYPE_VARCHAR:
+            s_Field = "%s";        //
+            break;
+        case DB_DATA_TYPE_INTEGER:
+            s_Field = "%d";        //
+            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());        //
+            break;
+        case DB_DATA_TYPE_DATE:
+            if (i_Nation == 0)      // timestamp       YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE)
+            {
+                s_Field = "%04d-%02d-%02d %02d:%02d:%02d.%03d";
+            }
+            if (i_Nation == 1)      // European        DD.MM.YYYY HH:MM:SS.SSS
+            {
+                s_Field = "%02d.%02d.%04d %02d:%02d:%02d.%03d";
+            }
+            if (i_Nation == 2)      // UK              DD/MM/YYYY HH:MM:SS.SSS
+            {
+                s_Field = "%02d/%02d/%04d %02d:%02d:%02d.%03d";
+            }
+            if (i_Nation == 3)      // International   YYYY-MM-DD HH:MM:SS.SSS
+            {
+                s_Field = "%04d-%02d-%02d %02d:%02d:%02d.%03d";
+            }
+            if (i_Nation == 4)      // US              MM/DD/YYYY HH:MM:SS.SSS
+            {
+                s_Field = "%02d/%02d/%04d %02d:%02d:%02d.%03d";
+            }
+            break;
+        default:
+            s_Field.Printf("-E-> unknown Format(%d)-sql(%d)",dbDataType,sqlDataType);        //
+            break;
+    };
+    return TRUE;
+}  // wxColFor::Format()
+
+
 /********** wxDB Constructor **********/
-wxDB::wxDB(HENV &aHenv)
+wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)
 {
        int i;
 
@@ -118,32 +221,32 @@ wxDB::wxDB(HENV &aHenv)
        sqlLogState = sqlLogOFF;        // By default, logging is turned off
        nTables         = 0;
        
-       strcpy(sqlState,"");
-       strcpy(errorMsg,"");
+       wxStrcpy(sqlState,"");
+       wxStrcpy(errorMsg,"");
        nativeError = cbErrorMsg = 0;
        for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-               strcpy(errorList[i], "");
+               wxStrcpy(errorList[i], "");
 
        // Init typeInf structures
-       strcpy(typeInfVarchar.TypeName,"");
+       wxStrcpy(typeInfVarchar.TypeName,"");
        typeInfVarchar.FsqlType = 0;
        typeInfVarchar.Precision = 0;
        typeInfVarchar.CaseSensitive = 0;
        typeInfVarchar.MaximumScale = 0;
 
-       strcpy(typeInfInteger.TypeName,"");
+       wxStrcpy(typeInfInteger.TypeName,"");
        typeInfInteger.FsqlType = 0;
        typeInfInteger.Precision = 0;
        typeInfInteger.CaseSensitive = 0;
        typeInfInteger.MaximumScale = 0;
 
-       strcpy(typeInfFloat.TypeName,"");
+       wxStrcpy(typeInfFloat.TypeName,"");
        typeInfFloat.FsqlType = 0;
        typeInfFloat.Precision = 0;
        typeInfFloat.CaseSensitive = 0;
        typeInfFloat.MaximumScale = 0;
 
-       strcpy(typeInfDate.TypeName,"");
+       wxStrcpy(typeInfDate.TypeName,"");
        typeInfDate.FsqlType = 0;
        typeInfDate.Precision = 0;
        typeInfDate.CaseSensitive = 0;
@@ -154,6 +257,7 @@ wxDB::wxDB(HENV &aHenv)
        
        // Copy the HENV into the db class
        henv = aHenv;
+       fwdOnlyCursors = FwdOnlyCursors;
 
        // Allocate a data source connection handle
        if (SQLAllocConnect(henv, &hdbc) != SQL_SUCCESS)
@@ -167,35 +271,35 @@ wxDB::wxDB(HENV &aHenv)
 
 } // wxDB::wxDB()
 
+
 /********** wxDB::Open() **********/
 bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 {
-       assert(Dsn && strlen(Dsn));
+       assert(Dsn && wxStrlen(Dsn));
        dsn             = Dsn;
        uid             = Uid;
        authStr = AuthStr;
 
        RETCODE retcode;
 
-#ifndef FWD_ONLY_CURSORS
-
-       // 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);
+       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
+#ifdef DBDEBUG_CONSOLE
                if (retcode == SQL_SUCCESS)
                        cout << "SQLSetConnectOption(CURSOR_LIB) successful" << endl;
                else
                        cout << "SQLSetConnectOption(CURSOR_LIB) failed" << endl;
-       #endif
-
 #endif
+       }
 
        // 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)
@@ -208,6 +312,7 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
        SQLSetConnectOption(hdbc, 1041, (UDWORD) "");
        SQLSetConnectOption(hdbc, 1042, (UDWORD) "");
 */
+
        // Mark database as open
        dbIsOpen = TRUE;
 
@@ -244,10 +349,10 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
        // SQL_FLOAT                                            SQL_NO_DATA_FOUND
        // SQL_INTEGER                                          SQL_NO_DATA_FOUND
        // SQL_LONGVARBINARY                            type name = 'LONG RAW', Precision = 2 billion
-       // SQL_LONGVARCHAR                              type name = 'LONG', Precision = 2 billion
+       // SQL_LONGVARCHAR                                  type name = 'LONG', Precision = 2 billion
        // SQL_NUMERIC                                          SQL_NO_DATA_FOUND
        // SQL_REAL                                                     SQL_NO_DATA_FOUND
-       // SQL_SMALLINT                                 SQL_NO_DATA_FOUND
+       // SQL_SMALLINT                                     SQL_NO_DATA_FOUND
        // SQL_TIME                                                     SQL_NO_DATA_FOUND
        // SQL_TIMESTAMP                                        type name = 'DATE', Precision = 19
        // SQL_VARBINARY                                        type name = 'RAW', Precision = 255
@@ -331,10 +436,12 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 
 } // wxDB::Open()
 
-// The Intersolv/Oracle 7 driver was "Not Capable" of setting the login timeout.
 
 /********** wxDB::setConnectionOptions() **********/
 bool wxDB::setConnectionOptions(void)
+/*
+ * NOTE: The Intersolv/Oracle 7 driver was "Not Capable" of setting the login timeout.
+ */
 {
        SQLSetConnectOption(hdbc, SQL_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF);
        SQLSetConnectOption(hdbc, SQL_OPT_TRACE, SQL_OPT_TRACE_OFF);
@@ -377,6 +484,7 @@ bool wxDB::setConnectionOptions(void)
 
 } // wxDB::setConnectionOptions()
 
+
 /********** wxDB::getDbInfo() **********/
 bool wxDB::getDbInfo(void)
 {
@@ -671,7 +779,6 @@ bool wxDB::getDbInfo(void)
        cout << endl;
 
        cout << endl;
-
 #endif
 
        // Completed Successfully
@@ -679,14 +786,16 @@ bool wxDB::getDbInfo(void)
 
 } // wxDB::getDbInfo()
 
+
 /********** wxDB::getDataTypeInfo() **********/
 bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
 {
-       // 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,
-
+/*
+ * 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,
+ */
        RETCODE retcode;
        SDWORD cbRet;
 
@@ -707,6 +816,18 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
        // Obtain columns from the record
        if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)
                return(DispAllErrors(henv, hdbc, hstmt));
+
+    // 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 (SQLGetData(hstmt, 3, SQL_C_LONG, (UCHAR*) &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)
                return(DispAllErrors(henv, hdbc, hstmt));
        if (SQLGetData(hstmt, 8, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.CaseSensitive, 0, &cbRet) != SQL_SUCCESS)
@@ -714,13 +835,8 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
 //     if (SQLGetData(hstmt, 14, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.MinimumScale, 0, &cbRet) != SQL_SUCCESS)
 //             return(DispAllErrors(henv, hdbc, hstmt));
 
-//#ifdef __UNIX__ // BJO : IODBC knows about 5, not 15...
-//     if (SQLGetData(hstmt, 5, SQL_C_SHORT,(UCHAR*)  &structSQLTypeInfo.MaximumScale, 0, &cbRet) != SQL_SUCCESS)
-//             return(DispAllErrors(henv, hdbc, hstmt));
-//#else
        if (SQLGetData(hstmt, 15, SQL_C_SHORT,(UCHAR*)  &structSQLTypeInfo.MaximumScale, 0, &cbRet) != SQL_SUCCESS)
                return(DispAllErrors(henv, hdbc, hstmt));
-//#endif
 
        if (structSQLTypeInfo.MaximumScale < 0)
                structSQLTypeInfo.MaximumScale = 0;
@@ -734,6 +850,7 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
 
 } // wxDB::getDataTypeInfo()
 
+
 /********** wxDB::Close() **********/
 void wxDB::Close(void)
 {
@@ -762,7 +879,7 @@ void wxDB::Close(void)
        // There should be zero Ctable objects still connected to this db object
        assert(nTables == 0);
 
-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__
        CstructTablesInUse *tiu;
        wxNode *pNode;
        pNode = TablesInUse.First();
@@ -773,8 +890,8 @@ void wxDB::Close(void)
                tiu = (CstructTablesInUse *)pNode->Data();
                if (tiu->pDb == this)
                {
-                       sprintf(s, "(%-20s)     tableID:[%6lu]     pDb:[%lu]", tiu->tableName,tiu->tableID,tiu->pDb);
-                       sprintf(s2,"Orphaned found using pDb:[%lu]",this);
+                       sprintf(s, "(%-20s)     tableID:[%6lu]     pDb:[%p]", tiu->tableName,tiu->tableID,tiu->pDb);
+                       sprintf(s2,"Orphaned found using pDb:[%p]",this);
                        wxMessageBox (s,s2);
                }
                pNode = pNode->Next();
@@ -782,11 +899,13 @@ void wxDB::Close(void)
 #endif
 
        // Copy the error messages to a global variable
-       for (int i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-               strcpy(DBerrorList[i],errorList[i]);
+       int i;
+       for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
+               wxStrcpy(DBerrorList[i],errorList[i]);
 
 } // wxDB::Close()
 
+
 /********** wxDB::CommitTrans() **********/
 bool wxDB::CommitTrans(void)
 {
@@ -802,6 +921,7 @@ bool wxDB::CommitTrans(void)
 
 } // wxDB::CommitTrans()
 
+
 /********** wxDB::RollbackTrans() **********/
 bool wxDB::RollbackTrans(void)
 {
@@ -814,6 +934,7 @@ bool wxDB::RollbackTrans(void)
 
 } // wxDB::RollbackTrans()
 
+
 /********** wxDB::DispAllErrors() **********/
 bool wxDB::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
 {
@@ -842,6 +963,7 @@ bool wxDB::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
 
 } // wxDB::DispAllErrors()
 
+
 /********** wxDB::GetNextError() **********/
 bool wxDB::GetNextError(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
 {
@@ -852,6 +974,7 @@ bool wxDB::GetNextError(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
 
 } // wxDB::GetNextError()
 
+
 /********** wxDB::DispNextError() **********/
 void wxDB::DispNextError(void)
 {
@@ -872,10 +995,11 @@ void wxDB::DispNextError(void)
 
 } // wxDB::DispNextError()
 
+
 /********** wxDB::logError() **********/
-void wxDB::logError(char *errMsg, char *SQLState)
+void wxDB::logError(const char *errMsg, const char *SQLState)
 {
-       assert(errMsg && strlen(errMsg));
+       assert(errMsg && wxStrlen(errMsg));
 
        static int pLast = -1;
        int dbStatus;
@@ -884,13 +1008,13 @@ void wxDB::logError(char *errMsg, char *SQLState)
        {
                int i;
                for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
-                       strcpy(errorList[i], errorList[i+1]);
+                       wxStrcpy(errorList[i], errorList[i+1]);
                pLast--;
        }
 
-       strcpy(errorList[pLast], errMsg);
+       wxStrcpy(errorList[pLast], errMsg);
 
-       if (SQLState && strlen(SQLState))
+       if (SQLState && wxStrlen(SQLState))
                if ((dbStatus = TranslateSqlState(SQLState)) != DB_ERR_FUNCTION_SEQUENCE_ERROR)
                        DB_STATUS = dbStatus;
 
@@ -899,234 +1023,236 @@ void wxDB::logError(char *errMsg, char *SQLState)
 
 }  // wxDB::logError()
 
+
 /**********wxDB::TranslateSqlState()  **********/
-int wxDB::TranslateSqlState(char *SQLState)
+int wxDB::TranslateSqlState(const char *SQLState)
 {
-       if (!strcmp(SQLState, "01000"))
+       if (!wxStrcmp(SQLState, "01000"))
                return(DB_ERR_GENERAL_WARNING);
-       if (!strcmp(SQLState, "01002"))
+       if (!wxStrcmp(SQLState, "01002"))
                return(DB_ERR_DISCONNECT_ERROR);
-       if (!strcmp(SQLState, "01004"))
+       if (!wxStrcmp(SQLState, "01004"))
                return(DB_ERR_DATA_TRUNCATED);
-       if (!strcmp(SQLState, "01006"))
+       if (!wxStrcmp(SQLState, "01006"))
                return(DB_ERR_PRIV_NOT_REVOKED);
-       if (!strcmp(SQLState, "01S00"))
+       if (!wxStrcmp(SQLState, "01S00"))
                return(DB_ERR_INVALID_CONN_STR_ATTR);
-       if (!strcmp(SQLState, "01S01"))
+       if (!wxStrcmp(SQLState, "01S01"))
                return(DB_ERR_ERROR_IN_ROW);
-       if (!strcmp(SQLState, "01S02"))
+       if (!wxStrcmp(SQLState, "01S02"))
                return(DB_ERR_OPTION_VALUE_CHANGED);
-       if (!strcmp(SQLState, "01S03"))
+       if (!wxStrcmp(SQLState, "01S03"))
                return(DB_ERR_NO_ROWS_UPD_OR_DEL);
-       if (!strcmp(SQLState, "01S04"))
+       if (!wxStrcmp(SQLState, "01S04"))
                return(DB_ERR_MULTI_ROWS_UPD_OR_DEL);
-       if (!strcmp(SQLState, "07001"))
+       if (!wxStrcmp(SQLState, "07001"))
                return(DB_ERR_WRONG_NO_OF_PARAMS);
-       if (!strcmp(SQLState, "07006"))
+       if (!wxStrcmp(SQLState, "07006"))
                return(DB_ERR_DATA_TYPE_ATTR_VIOL);
-       if (!strcmp(SQLState, "08001"))
+       if (!wxStrcmp(SQLState, "08001"))
                return(DB_ERR_UNABLE_TO_CONNECT);
-       if (!strcmp(SQLState, "08002"))
+       if (!wxStrcmp(SQLState, "08002"))
                return(DB_ERR_CONNECTION_IN_USE);
-       if (!strcmp(SQLState, "08003"))
+       if (!wxStrcmp(SQLState, "08003"))
                return(DB_ERR_CONNECTION_NOT_OPEN);
-       if (!strcmp(SQLState, "08004"))
+       if (!wxStrcmp(SQLState, "08004"))
                return(DB_ERR_REJECTED_CONNECTION);
-       if (!strcmp(SQLState, "08007"))
+       if (!wxStrcmp(SQLState, "08007"))
                return(DB_ERR_CONN_FAIL_IN_TRANS);
-       if (!strcmp(SQLState, "08S01"))
+       if (!wxStrcmp(SQLState, "08S01"))
                return(DB_ERR_COMM_LINK_FAILURE);
-       if (!strcmp(SQLState, "21S01"))
+       if (!wxStrcmp(SQLState, "21S01"))
                return(DB_ERR_INSERT_VALUE_LIST_MISMATCH);
-       if (!strcmp(SQLState, "21S02"))
+       if (!wxStrcmp(SQLState, "21S02"))
                return(DB_ERR_DERIVED_TABLE_MISMATCH);
-       if (!strcmp(SQLState, "22001"))
+       if (!wxStrcmp(SQLState, "22001"))
                return(DB_ERR_STRING_RIGHT_TRUNC);
-       if (!strcmp(SQLState, "22003"))
+       if (!wxStrcmp(SQLState, "22003"))
                return(DB_ERR_NUMERIC_VALUE_OUT_OF_RNG);
-       if (!strcmp(SQLState, "22005"))
+       if (!wxStrcmp(SQLState, "22005"))
                return(DB_ERR_ERROR_IN_ASSIGNMENT);
-       if (!strcmp(SQLState, "22008"))
+       if (!wxStrcmp(SQLState, "22008"))
                return(DB_ERR_DATETIME_FLD_OVERFLOW);
-       if (!strcmp(SQLState, "22012"))
+       if (!wxStrcmp(SQLState, "22012"))
                return(DB_ERR_DIVIDE_BY_ZERO);
-       if (!strcmp(SQLState, "22026"))
+       if (!wxStrcmp(SQLState, "22026"))
                return(DB_ERR_STR_DATA_LENGTH_MISMATCH);
-       if (!strcmp(SQLState, "23000"))
+       if (!wxStrcmp(SQLState, "23000"))
                return(DB_ERR_INTEGRITY_CONSTRAINT_VIOL);
-       if (!strcmp(SQLState, "24000"))
+       if (!wxStrcmp(SQLState, "24000"))
                return(DB_ERR_INVALID_CURSOR_STATE);
-       if (!strcmp(SQLState, "25000"))
+       if (!wxStrcmp(SQLState, "25000"))
                return(DB_ERR_INVALID_TRANS_STATE);
-       if (!strcmp(SQLState, "28000"))
+       if (!wxStrcmp(SQLState, "28000"))
                return(DB_ERR_INVALID_AUTH_SPEC);
-       if (!strcmp(SQLState, "34000"))
+       if (!wxStrcmp(SQLState, "34000"))
                return(DB_ERR_INVALID_CURSOR_NAME);
-       if (!strcmp(SQLState, "37000"))
+       if (!wxStrcmp(SQLState, "37000"))
                return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL);
-       if (!strcmp(SQLState, "3C000"))
+       if (!wxStrcmp(SQLState, "3C000"))
                return(DB_ERR_DUPLICATE_CURSOR_NAME);
-       if (!strcmp(SQLState, "40001"))
+       if (!wxStrcmp(SQLState, "40001"))
                return(DB_ERR_SERIALIZATION_FAILURE);
-       if (!strcmp(SQLState, "42000"))
+       if (!wxStrcmp(SQLState, "42000"))
                return(DB_ERR_SYNTAX_ERROR_OR_ACCESS_VIOL2);
-       if (!strcmp(SQLState, "70100"))
+       if (!wxStrcmp(SQLState, "70100"))
                return(DB_ERR_OPERATION_ABORTED);
-       if (!strcmp(SQLState, "IM001"))
+       if (!wxStrcmp(SQLState, "IM001"))
                return(DB_ERR_UNSUPPORTED_FUNCTION);
-       if (!strcmp(SQLState, "IM002"))
+       if (!wxStrcmp(SQLState, "IM002"))
                return(DB_ERR_NO_DATA_SOURCE);
-       if (!strcmp(SQLState, "IM003"))
+       if (!wxStrcmp(SQLState, "IM003"))
                return(DB_ERR_DRIVER_LOAD_ERROR);
-       if (!strcmp(SQLState, "IM004"))
+       if (!wxStrcmp(SQLState, "IM004"))
                return(DB_ERR_SQLALLOCENV_FAILED);
-       if (!strcmp(SQLState, "IM005"))
+       if (!wxStrcmp(SQLState, "IM005"))
                return(DB_ERR_SQLALLOCCONNECT_FAILED);
-       if (!strcmp(SQLState, "IM006"))
+       if (!wxStrcmp(SQLState, "IM006"))
                return(DB_ERR_SQLSETCONNECTOPTION_FAILED);
-       if (!strcmp(SQLState, "IM007"))
+       if (!wxStrcmp(SQLState, "IM007"))
                return(DB_ERR_NO_DATA_SOURCE_DLG_PROHIB);
-       if (!strcmp(SQLState, "IM008"))
+       if (!wxStrcmp(SQLState, "IM008"))
                return(DB_ERR_DIALOG_FAILED);
-       if (!strcmp(SQLState, "IM009"))
+       if (!wxStrcmp(SQLState, "IM009"))
                return(DB_ERR_UNABLE_TO_LOAD_TRANSLATION_DLL);
-       if (!strcmp(SQLState, "IM010"))
+       if (!wxStrcmp(SQLState, "IM010"))
                return(DB_ERR_DATA_SOURCE_NAME_TOO_LONG);
-       if (!strcmp(SQLState, "IM011"))
+       if (!wxStrcmp(SQLState, "IM011"))
                return(DB_ERR_DRIVER_NAME_TOO_LONG);
-       if (!strcmp(SQLState, "IM012"))
+       if (!wxStrcmp(SQLState, "IM012"))
                return(DB_ERR_DRIVER_KEYWORD_SYNTAX_ERROR);
-       if (!strcmp(SQLState, "IM013"))
+       if (!wxStrcmp(SQLState, "IM013"))
                return(DB_ERR_TRACE_FILE_ERROR);
-       if (!strcmp(SQLState, "S0001"))
+       if (!wxStrcmp(SQLState, "S0001"))
                return(DB_ERR_TABLE_OR_VIEW_ALREADY_EXISTS);
-       if (!strcmp(SQLState, "S0002"))
+       if (!wxStrcmp(SQLState, "S0002"))
                return(DB_ERR_TABLE_NOT_FOUND);
-       if (!strcmp(SQLState, "S0011"))
+       if (!wxStrcmp(SQLState, "S0011"))
                return(DB_ERR_INDEX_ALREADY_EXISTS);
-       if (!strcmp(SQLState, "S0012"))
+       if (!wxStrcmp(SQLState, "S0012"))
                return(DB_ERR_INDEX_NOT_FOUND);
-       if (!strcmp(SQLState, "S0021"))
+       if (!wxStrcmp(SQLState, "S0021"))
                return(DB_ERR_COLUMN_ALREADY_EXISTS);
-       if (!strcmp(SQLState, "S0022"))
+       if (!wxStrcmp(SQLState, "S0022"))
                return(DB_ERR_COLUMN_NOT_FOUND);
-       if (!strcmp(SQLState, "S0023"))
+       if (!wxStrcmp(SQLState, "S0023"))
                return(DB_ERR_NO_DEFAULT_FOR_COLUMN);
-       if (!strcmp(SQLState, "S1000"))
+       if (!wxStrcmp(SQLState, "S1000"))
                return(DB_ERR_GENERAL_ERROR);
-       if (!strcmp(SQLState, "S1001"))
+       if (!wxStrcmp(SQLState, "S1001"))
                return(DB_ERR_MEMORY_ALLOCATION_FAILURE);
-       if (!strcmp(SQLState, "S1002"))
+       if (!wxStrcmp(SQLState, "S1002"))
                return(DB_ERR_INVALID_COLUMN_NUMBER);
-       if (!strcmp(SQLState, "S1003"))
+       if (!wxStrcmp(SQLState, "S1003"))
                return(DB_ERR_PROGRAM_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1004"))
+       if (!wxStrcmp(SQLState, "S1004"))
                return(DB_ERR_SQL_DATA_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1008"))
+       if (!wxStrcmp(SQLState, "S1008"))
                return(DB_ERR_OPERATION_CANCELLED);
-       if (!strcmp(SQLState, "S1009"))
+       if (!wxStrcmp(SQLState, "S1009"))
                return(DB_ERR_INVALID_ARGUMENT_VALUE);
-       if (!strcmp(SQLState, "S1010"))
+       if (!wxStrcmp(SQLState, "S1010"))
                return(DB_ERR_FUNCTION_SEQUENCE_ERROR);
-       if (!strcmp(SQLState, "S1011"))
+       if (!wxStrcmp(SQLState, "S1011"))
                return(DB_ERR_OPERATION_INVALID_AT_THIS_TIME);
-       if (!strcmp(SQLState, "S1012"))
+       if (!wxStrcmp(SQLState, "S1012"))
                return(DB_ERR_INVALID_TRANS_OPERATION_CODE);
-       if (!strcmp(SQLState, "S1015"))
+       if (!wxStrcmp(SQLState, "S1015"))
                return(DB_ERR_NO_CURSOR_NAME_AVAIL);
-       if (!strcmp(SQLState, "S1090"))
+       if (!wxStrcmp(SQLState, "S1090"))
                return(DB_ERR_INVALID_STR_OR_BUF_LEN);
-       if (!strcmp(SQLState, "S1091"))
+       if (!wxStrcmp(SQLState, "S1091"))
                return(DB_ERR_DESCRIPTOR_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1092"))
+       if (!wxStrcmp(SQLState, "S1092"))
                return(DB_ERR_OPTION_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1093"))
+       if (!wxStrcmp(SQLState, "S1093"))
                return(DB_ERR_INVALID_PARAM_NO);
-       if (!strcmp(SQLState, "S1094"))
+       if (!wxStrcmp(SQLState, "S1094"))
                return(DB_ERR_INVALID_SCALE_VALUE);
-       if (!strcmp(SQLState, "S1095"))
+       if (!wxStrcmp(SQLState, "S1095"))
                return(DB_ERR_FUNCTION_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1096"))
+       if (!wxStrcmp(SQLState, "S1096"))
                return(DB_ERR_INF_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1097"))
+       if (!wxStrcmp(SQLState, "S1097"))
                return(DB_ERR_COLUMN_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1098"))
+       if (!wxStrcmp(SQLState, "S1098"))
                return(DB_ERR_SCOPE_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1099"))
+       if (!wxStrcmp(SQLState, "S1099"))
                return(DB_ERR_NULLABLE_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1100"))
+       if (!wxStrcmp(SQLState, "S1100"))
                return(DB_ERR_UNIQUENESS_OPTION_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1101"))
+       if (!wxStrcmp(SQLState, "S1101"))
                return(DB_ERR_ACCURACY_OPTION_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1103"))
+       if (!wxStrcmp(SQLState, "S1103"))
                return(DB_ERR_DIRECTION_OPTION_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1104"))
+       if (!wxStrcmp(SQLState, "S1104"))
                return(DB_ERR_INVALID_PRECISION_VALUE);
-       if (!strcmp(SQLState, "S1105"))
+       if (!wxStrcmp(SQLState, "S1105"))
                return(DB_ERR_INVALID_PARAM_TYPE);
-       if (!strcmp(SQLState, "S1106"))
+       if (!wxStrcmp(SQLState, "S1106"))
                return(DB_ERR_FETCH_TYPE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1107"))
+       if (!wxStrcmp(SQLState, "S1107"))
                return(DB_ERR_ROW_VALUE_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1108"))
+       if (!wxStrcmp(SQLState, "S1108"))
                return(DB_ERR_CONCURRENCY_OPTION_OUT_OF_RANGE);
-       if (!strcmp(SQLState, "S1109"))
+       if (!wxStrcmp(SQLState, "S1109"))
                return(DB_ERR_INVALID_CURSOR_POSITION);
-       if (!strcmp(SQLState, "S1110"))
+       if (!wxStrcmp(SQLState, "S1110"))
                return(DB_ERR_INVALID_DRIVER_COMPLETION);
-       if (!strcmp(SQLState, "S1111"))
+       if (!wxStrcmp(SQLState, "S1111"))
                return(DB_ERR_INVALID_BOOKMARK_VALUE);
-       if (!strcmp(SQLState, "S1C00"))
+       if (!wxStrcmp(SQLState, "S1C00"))
                return(DB_ERR_DRIVER_NOT_CAPABLE);
-       if (!strcmp(SQLState, "S1T00"))
+       if (!wxStrcmp(SQLState, "S1T00"))
                return(DB_ERR_TIMEOUT_EXPIRED);
 
        // No match
        return(0);
 
 }  // wxDB::TranslateSqlState()
+
        
 /**********  wxDB::Grant() **********/
-bool wxDB::Grant(int privileges, char *tableName, char *userList)
+bool wxDB::Grant(int privileges, const char *tableName, const char *userList)
 {
        char sqlStmt[DB_MAX_STATEMENT_LEN];
 
        // Build the grant statement
-       strcpy(sqlStmt, "GRANT ");
+       wxStrcpy(sqlStmt, "GRANT ");
        if (privileges == DB_GRANT_ALL)
-               strcat(sqlStmt, "ALL");
+               wxStrcat(sqlStmt, "ALL");
        else
        {
                int c = 0;
                if (privileges & DB_GRANT_SELECT)
                {
-                       strcat(sqlStmt, "SELECT");
+                       wxStrcat(sqlStmt, "SELECT");
                        c++;
                }
                if (privileges & DB_GRANT_INSERT)
                {
                        if (c++)
-                               strcat(sqlStmt, ", ");
-                       strcat(sqlStmt, "INSERT");
+                               wxStrcat(sqlStmt, ", ");
+                       wxStrcat(sqlStmt, "INSERT");
                }
                if (privileges & DB_GRANT_UPDATE)
                {
                        if (c++)
-                               strcat(sqlStmt, ", ");
-                       strcat(sqlStmt, "UPDATE");
+                               wxStrcat(sqlStmt, ", ");
+                       wxStrcat(sqlStmt, "UPDATE");
                }
                if (privileges & DB_GRANT_DELETE)
                {
                        if (c++)
-                               strcat(sqlStmt, ", ");
-                       strcat(sqlStmt, "DELETE");
+                               wxStrcat(sqlStmt, ", ");
+                       wxStrcat(sqlStmt, "DELETE");
                }
        }
 
-       strcat(sqlStmt, " ON ");
-       strcat(sqlStmt, tableName);
-       strcat(sqlStmt, " TO ");
-       strcat(sqlStmt, userList);
+       wxStrcat(sqlStmt, " ON ");
+       wxStrcat(sqlStmt, tableName);
+       wxStrcat(sqlStmt, " TO ");
+       wxStrcat(sqlStmt, userList);
 
 #ifdef DBDEBUG_CONSOLE
        cout << endl << sqlStmt << endl;
@@ -1138,8 +1264,9 @@ bool wxDB::Grant(int privileges, char *tableName, char *userList)
 
 }  // wxDB::Grant()
 
+
 /********** wxDB::CreateView() **********/
-bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemptDrop)
+bool wxDB::CreateView(const char *viewName, const char *colList, const char *pSqlStmt, bool attemptDrop)
 {
        char sqlStmt[DB_MAX_STATEMENT_LEN];
 
@@ -1148,18 +1275,18 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemp
                return FALSE;
 
        // Build the create view statement
-       strcpy(sqlStmt, "CREATE VIEW ");
-       strcat(sqlStmt, viewName);
+       wxStrcpy(sqlStmt, "CREATE VIEW ");
+       wxStrcat(sqlStmt, viewName);
        
-       if (strlen(colList))
+       if (wxStrlen(colList))
        {
-               strcat(sqlStmt, " (");
-               strcat(sqlStmt, colList);
-               strcat(sqlStmt, ")");
+               wxStrcat(sqlStmt, " (");
+               wxStrcat(sqlStmt, colList);
+               wxStrcat(sqlStmt, ")");
        }
 
-       strcat(sqlStmt, " AS ");
-       strcat(sqlStmt, pSqlStmt);
+       wxStrcat(sqlStmt, " AS ");
+       wxStrcat(sqlStmt, pSqlStmt);
 
        WriteSqlLog(sqlStmt);
 
@@ -1171,14 +1298,16 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemp
 
 }  // wxDB::CreateView()
 
+
 /********** wxDB::DropView()  **********/
-bool wxDB::DropView(char *viewName)
+bool wxDB::DropView(const char *viewName)
 {
-       // NOTE: This function returns TRUE if the View does not exist, but
-       //       only for identified databases.  Code will need to be added
-       //                      below for any other databases when those databases are defined
-       //       to handle this situation consistently
-
+/*
+ * NOTE: This function returns TRUE if the View does not exist, but
+ *       only for identified databases.  Code will need to be added
+ *                     below for any other databases when those databases are defined
+ *       to handle this situation consistently
+ */
        char sqlStmt[DB_MAX_STATEMENT_LEN];
 
        sprintf(sqlStmt, "DROP VIEW %s", viewName);
@@ -1193,10 +1322,10 @@ bool wxDB::DropView(char *viewName)
        {
                // Check for "Base table not found" error and ignore
                GetNextError(henv, hdbc, hstmt);
-               if (strcmp(sqlState,"S0002"))  // "Base table not found"
+               if (wxStrcmp(sqlState,"S0002"))  // "Base table not found"
                {
                        // Check for product specific error codes
-                       if (!((Dbms() == dbmsSYBASE_ASA && !strcmp(sqlState,"42000"))))  // 5.x (and lower?)
+                       if (!((Dbms() == dbmsSYBASE_ASA && !wxStrcmp(sqlState,"42000"))))  // 5.x (and lower?)
                        {
                                DispNextError();
                                DispAllErrors(henv, hdbc, hstmt);
@@ -1216,7 +1345,7 @@ bool wxDB::DropView(char *viewName)
 
 
 /********** wxDB::ExecSql()  **********/
-bool wxDB::ExecSql(char *pSqlStmt)
+bool wxDB::ExecSql(const char *pSqlStmt)
 {
        SQLFreeStmt(hstmt, SQL_CLOSE);
        if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)
@@ -1229,6 +1358,7 @@ bool wxDB::ExecSql(char *pSqlStmt)
 
 }  // wxDB::ExecSql()
 
+
 /********** wxDB::GetNext()  **********/
 bool wxDB::GetNext(void)
 {
@@ -1242,6 +1372,7 @@ bool wxDB::GetNext(void)
 
 }  // wxDB::GetNext()
 
+
 /********** wxDB::GetData()  **********/
 bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned)
 {
@@ -1258,16 +1389,153 @@ bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FA
 
 }  // wxDB::GetData()
 
+
+/********** wxDB::GetKeyFields() **********/
+int wxDB::GetKeyFields(char *tableName, wxColInf* 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 */
+    short        iKeySeq;
+//    SQLSMALLINT  iKeySeq;
+    char         szPkCol[DB_MAX_COLUMN_NAME_LEN+1];   /* Primary key column     */
+    char         szFkCol[DB_MAX_COLUMN_NAME_LEN+1];   /* Foreign key column     */
+    SQLRETURN    retcode;
+    SDWORD       cb;
+    int          i;
+    wxString     Temp0;
+    /*
+     * ---------------------------------------------------------------------
+     * -- 19991224 : mj10777@gmx.net : 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    ------
+     * --          : 3) which columns are Foreign Key and the name    ------
+     * --          :     of the Table where the Key is the Primary Key -----
+     * --          : Called from GetColumns(char *tableName,          ------
+     * --                           int *numCols,const char *userID ) ------
+     * ---------------------------------------------------------------------
+     */
+
+    /*---------------------------------------------------------------------*/
+    /* Get the names of the columns in the primary key.                    */
+    /*---------------------------------------------------------------------*/
+    retcode = SQLPrimaryKeys(hstmt,
+                             NULL, 0,                       /* Catalog name  */
+                             NULL, 0,                       /* Schema name   */
+                             (UCHAR *) tableName, SQL_NTS); /* Table name    */
+
+    /*---------------------------------------------------------------------*/
+    /* Fetch and display the result set. This will be a list of the        */
+    /* columns in the primary key of the tableName table.                  */
+    /*---------------------------------------------------------------------*/
+    while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
+    {
+        retcode = SQLFetch(hstmt);
+        if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
+        {
+            GetData( 4, SQL_C_CHAR,   szPkCol,     DB_MAX_COLUMN_NAME_LEN+1, &cb);
+            GetData( 5, SQL_C_SSHORT, &iKeySeq,    0,                        &cb);
+            //-------
+            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))
+    SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated).      */
+
+    /*---------------------------------------------------------------------*/
+    /* Get all the foreign keys that refer to tableName primary key.       */
+    /*---------------------------------------------------------------------*/
+    retcode = SQLForeignKeys(hstmt,
+                             NULL, 0,                       /* Primary catalog   */
+                             NULL, 0,                       /* Primary schema    */
+                             (UCHAR *)tableName, SQL_NTS,   /* Primary table     */
+                             NULL, 0,                       /* Foreign catalog   */
+                             NULL, 0,                       /* Foreign schema    */
+                             NULL, 0);                      /* Foreign table     */
+
+    /*---------------------------------------------------------------------*/
+    /* Fetch and display the result set. This will be all of the foreign   */
+    /* keys in other tables that refer to the tableName  primary key.      */
+    /*---------------------------------------------------------------------*/
+    Temp0.Empty();
+    szPkCol[0] = 0;
+    while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
+    {
+        retcode = SQLFetch(hstmt);
+        if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
+        {
+            GetData( 3, SQL_C_CHAR,   szPkTable,   DB_MAX_TABLE_NAME_LEN+1,  &cb);
+            GetData( 4, SQL_C_CHAR,   szPkCol,     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.Trim();     // Get rid of any unneeded blanks
+    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
+                strcpy(colInf[i].PkTableName,Temp0);    // Name of the Tables where this Primary Key is used as a Foreign Key
+    }  // if (Temp0 != "")
+    SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
+
+    /*---------------------------------------------------------------------*/
+    /* Get all the foreign keys in the tablename table.                    */
+    /*---------------------------------------------------------------------*/
+    retcode = SQLForeignKeys(hstmt,
+                             NULL, 0,                        /* Primary catalog   */
+                             NULL, 0,                        /* Primary schema    */
+                             NULL, 0,                        /* Primary table     */
+                             NULL, 0,                        /* Foreign catalog   */
+                             NULL, 0,                        /* Foreign schema    */
+                             (UCHAR *)tableName, SQL_NTS);   /* Foreign table     */
+
+    /*---------------------------------------------------------------------*/
+    /*  Fetch and display the result set. This will be all of the          */
+    /*  primary keys in other tables that are referred to by foreign       */
+    /*  keys in the tableName table.                                       */
+    /*---------------------------------------------------------------------*/
+    i = 0;
+    while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO))
+    {
+        retcode = SQLFetch(hstmt);
+        if (retcode == SQL_SUCCESS || retcode == SQL_SUCCESS_WITH_INFO)
+        {
+            GetData( 3, SQL_C_CHAR,   szPkTable,   DB_MAX_TABLE_NAME_LEN+1,  &cb);
+            GetData( 5, SQL_C_SSHORT, &iKeySeq,    0,                        &cb);
+            GetData( 8, SQL_C_CHAR,   szFkCol,     DB_MAX_COLUMN_NAME_LEN+1, &cb);
+            //-------
+            for (i=0;i<noCols;i++)                              // Find the Column name
+            {
+                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))
+    SQLFreeStmt(hstmt, SQL_CLOSE);  /* Close the cursor (the hstmt is still allocated). */
+
+    /*---------------------------------------------------------------------*/
+    return TRUE;
+}  // wxDB::GetKeyFields()
+
+
 /********** wxDB::GetColumns() **********/
+wxColInf *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.
- *             2) This function returns an array of CcolInf structures.  If no columns
+ *             2) This function returns an array of wxColInf 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.
  *
- *                     CcolInf *colInf = pDb->GetColumns(tableList, userID);
+ *                     wxColInf *colInf = pDb->GetColumns(tableList, userID);
  *                     if (colInf)
  *                     {
  *                             // Use the column inf
@@ -1275,40 +1543,48 @@ bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FA
  *                             // Destroy the memory
  *                             delete [] colInf;
  *                     }
+ *
+ * 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.
  */
-CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
 {
-       UINT noCols = 0;
-       UINT colNo = 0;
-       CcolInf *colInf = 0;
-       RETCODE retcode;
-       SDWORD cb;
-       char tblName[DB_MAX_TABLE_NAME_LEN+1];
-       char colName[DB_MAX_COLUMN_NAME_LEN+1];
-       SWORD sqlDataType;
-       char userIdUC[80+1];
-       char tableNameUC[DB_MAX_TABLE_NAME_LEN+1];
+       int      noCols = 0;
+       int      colNo  = 0;
+       wxColInf *colInf = 0;
+
+       RETCODE  retcode;
+       SDWORD   cb;
 
-       if (!userID || !strlen(userID))
-               userID = uid;
+       wxString UserID;
+       wxString TableName;
+
+       if (userID)
+       {
+               if (!wxStrlen(userID))
+                       UserID = uid;
+               else
+                       UserID = userID;
+       }
+       else
+               UserID = "";
 
        // dBase does not use user names, and some drivers fail if you try to pass one
        if (Dbms() == dbmsDBASE)
-               userID = "";
+               UserID = "";
 
        // Oracle user names may only be in uppercase, so force 
        // the name to uppercase
        if (Dbms() == dbmsORACLE)
-       {
-               int i = 0;
-               for (char *p = userID; *p; p++)
-                       userIdUC[i++] = toupper(*p);
-               userIdUC[i] = 0;
-               userID = userIdUC;
-       }
+               UserID = UserID.Upper();
 
        // Pass 1 - Determine how many columns there are.
-       // Pass 2 - Allocate the CcolInf array and fill in
+       // Pass 2 - Allocate the wxColInf array and fill in
        //                              the array with the column information.
        int pass;
        for (pass = 1; pass <= 2; pass++)
@@ -1317,43 +1593,37 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                {
                        if (noCols == 0)  // Probably a bogus table name(s)
                                break;
-                       // Allocate n CcolInf objects to hold the column information
-                       colInf = new CcolInf[noCols+1];
+                       // Allocate n wxColInf objects to hold the column information
+                       colInf = new wxColInf[noCols+1];
                        if (!colInf)
                                break;
                        // Mark the end of the array
-                       strcpy(colInf[noCols].tableName, "");
-                       strcpy(colInf[noCols].colName, "");
+                       wxStrcpy(colInf[noCols].tableName, "");
+                       wxStrcpy(colInf[noCols].colName, "");
                        colInf[noCols].sqlDataType = 0;
                }
                // Loop through each table name
                int tbl;
                for (tbl = 0; tableName[tbl]; tbl++)
                {
+                       TableName = tableName[tbl];
                        // Oracle table names are uppercase only, so force 
                        // the name to uppercase just in case programmer forgot to do this
                        if (Dbms() == dbmsORACLE)
-                       {
-                               int i = 0;
-                               for (char *p = tableName[tbl]; *p; p++)
-                                       tableNameUC[i++] = toupper(*p);
-                               tableNameUC[i] = 0;
-                       }
-                       else
-                               sprintf(tableNameUC,tableName[tbl]);
+                               TableName = TableName.Upper();
 
                        SQLFreeStmt(hstmt, SQL_CLOSE);
 
                        // MySQL 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 (strcmp(userID,"") &&
+                       if (wxStrcmp(UserID.GetData(),"") &&
                                 Dbms() != dbmsMY_SQL &&
                                 Dbms() != dbmsACCESS)
                        {
                                retcode = SQLColumns(hstmt,
                                                                                        NULL, 0,                                                                                        // All qualifiers
-                                                                                       (UCHAR *) userID, SQL_NTS,                                      // Owner
-                                                                                       (UCHAR *) tableNameUC, SQL_NTS,
+                                                                                       (UCHAR *) UserID.GetData(), SQL_NTS,    // Owner
+                                                                                       (UCHAR *) TableName.GetData(), SQL_NTS,
                                                                                        NULL, 0);                                                                               // All columns
                        }
                        else
@@ -1361,7 +1631,7 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                retcode = SQLColumns(hstmt,
                                                                                        NULL, 0,                                                                                        // All qualifiers
                                                                                        NULL, 0,                                                                                        // Owner
-                                                                                       (UCHAR *) tableNameUC, SQL_NTS,
+                                                                                       (UCHAR *) TableName.GetData(), SQL_NTS,
                                                                                        NULL, 0);                                                                               // All columns
                        }
                        if (retcode != SQL_SUCCESS)
@@ -1369,13 +1639,10 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                DispAllErrors(henv, hdbc, hstmt);
                                if (colInf)
                                        delete [] colInf;
-                               SQLFreeStmt(hstmt, SQL_UNBIND);
                                SQLFreeStmt(hstmt, SQL_CLOSE);
                                return(0);
                        }
-                       SQLBindCol(hstmt, 3, SQL_C_CHAR,   (UCHAR*) tblName,      DB_MAX_TABLE_NAME_LEN+1,  &cb);
-                       SQLBindCol(hstmt, 4, SQL_C_CHAR,   (UCHAR*) colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
-                       SQLBindCol(hstmt, 5, SQL_C_SSHORT, (UCHAR*) &sqlDataType, 0,                        &cb);
+
                        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
                        {
                                if (pass == 1)  // First pass, just add up the number of columns
@@ -1384,9 +1651,31 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                {
                                        if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
                                        {
-                                               strcpy(colInf[colNo].tableName, tblName);
-                                               strcpy(colInf[colNo].colName, colName);
-                                               colInf[colNo].sqlDataType = sqlDataType;
+                                               // 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_SLONG,  (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);
+
+                                               // 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 = 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))
+                                                       colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;
+
                                                colNo++;
                                        }
                                }
@@ -1396,24 +1685,447 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                DispAllErrors(henv, hdbc, hstmt);
                                if (colInf)
                                        delete [] colInf;
-                               SQLFreeStmt(hstmt, SQL_UNBIND);
                                SQLFreeStmt(hstmt, SQL_CLOSE);
                                return(0);
                        }
                }
        }
 
-       SQLFreeStmt(hstmt, SQL_UNBIND);
        SQLFreeStmt(hstmt, SQL_CLOSE);
        return colInf;
 
 }  // 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.
+ */
+{
+       int      noCols = 0;
+       int      colNo  = 0;
+       wxColInf *colInf = 0;
+
+       RETCODE  retcode;
+       SDWORD   cb;
+
+       wxString UserID;
+       wxString TableName;
+
+       if (userID)
+       {
+               if (!wxStrlen(userID))
+                       UserID = uid;
+               else
+                       UserID = userID;
+       }
+       else
+               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 
+       // 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
+       //                              the array with the column information.
+       int pass;
+       for (pass = 1; pass <= 2; pass++)
+       {
+               if (pass == 2)
+               {
+                       if (noCols == 0)  // Probably a bogus table name(s)
+                               break;
+                       // Allocate n wxColInf objects to hold the column information
+                       colInf = new wxColInf[noCols+1];
+                       if (!colInf)
+                               break;
+                       // Mark the end of the array
+                       wxStrcpy(colInf[noCols].tableName, "");
+                       wxStrcpy(colInf[noCols].colName, "");
+                       colInf[noCols].sqlDataType = 0;
+               }
+
+               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();
+
+               SQLFreeStmt(hstmt, SQL_CLOSE);
+
+               // MySQL 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.GetData(),"") &&
+                        Dbms() != dbmsMY_SQL &&
+                        Dbms() != dbmsACCESS)
+               {
+                       retcode = SQLColumns(hstmt,
+                                                                               NULL, 0,                                                                                        // All qualifiers
+                                                                               (UCHAR *) UserID.GetData(), SQL_NTS,    // Owner
+                                                                               (UCHAR *) TableName.GetData(), SQL_NTS,
+                                                                               NULL, 0);                                                                               // All columns
+               }
+               else
+               {
+                       retcode = SQLColumns(hstmt,
+                                                                               NULL, 0,                                                                                        // All qualifiers
+                                                                               NULL, 0,                                                                                        // Owner
+                                                                               (UCHAR *) TableName.GetData(), 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);
+                       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);
+                    // 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( 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
+
+                                       // 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 = 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))
+                                               colInf[colNo].dbDataType = DB_DATA_TYPE_DATE;
+
+                                       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 Foriegn Keys
+    GetKeyFields(tableName,colInf,noCols);
+
+    if (numCols)
+               *numCols = noCols;
+       return colInf;
+
+}  // wxDB::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 = "";
+
+       // 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 
+       // the name to uppercase
+       if (Dbms() == dbmsORACLE)
+               UserID = UserID.Upper();
+
+       {
+               // Loop through each table name
+               {
+                       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();
+
+                       SQLFreeStmt(hstmt, SQL_CLOSE);
+
+                       // MySQL 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.GetData(),"") &&
+                                Dbms() != dbmsMY_SQL &&
+                                Dbms() != dbmsACCESS)
+                       {
+                               retcode = SQLColumns(hstmt,
+                                                                                       NULL, 0,                                                                                        // All qualifiers
+                                                                                       (UCHAR *) UserID.GetData(), SQL_NTS,    // Owner
+                                                                                       (UCHAR *) TableName.GetData(), SQL_NTS,
+                                                                                       NULL, 0);                                                                               // All columns
+                       }
+                       else
+                       {
+                               retcode = SQLColumns(hstmt,
+                                                                                       NULL, 0,                                                                                        // All qualifiers
+                                                                                       NULL, 0,                                                                                        // Owner
+                                                                                       (UCHAR *) TableName.GetData(), SQL_NTS,
+                                                                                       NULL, 0);                                                                               // All columns
+                       }
+                       if (retcode != SQL_SUCCESS)
+                       {  // Error occured, abort
+                               DispAllErrors(henv, hdbc, hstmt);
+                               SQLFreeStmt(hstmt, SQL_CLOSE);
+                               return(-1);
+                       }
+
+                       // Count the columns
+                       while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
+                               noCols++;
+
+                       if (retcode != SQL_NO_DATA_FOUND)
+                       {  // Error occured, abort
+                               DispAllErrors(henv, hdbc, hstmt);
+                               SQLFreeStmt(hstmt, SQL_CLOSE);
+                               return(-1);
+                       }
+               }
+       }
+
+       SQLFreeStmt(hstmt, SQL_CLOSE);
+       return noCols;
+
+}  // wxDB::GetColumnCount()
+
+
+/********** wxDB::GetCatalog() *******/
+wxDbInf *wxDB::GetCatalog(char *userID)
+/*
+ * ---------------------------------------------------------------------
+ * -- 19991203 : mj10777@gmx.net : Create                         ------
+ * --          : Creates a wxDbInf with Tables / Cols Array       ------
+ * --          : uses SQLTables and fills pTableInf;              ------
+ * --          : pColInf is set to NULL and numCols to 0;         ------
+ * --          : returns pDbInf (wxDbInf)                         ------
+ * --            - if unsuccesfull (pDbInf == NULL)               ------
+ * --          : pColInf can be filled with GetColumns(..);       ------
+ * --          : numCols   can be filled with GetColumnCount(..); ------
+ * ---------------------------------------------------------------------
+ *
+ * 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.
+ */
+{
+       wxDbInf *pDbInf = NULL; // Array of catalog entries
+       int      noTab = 0;     // Counter while filling table entries
+       int      pass;
+       RETCODE  retcode;
+       SDWORD   cb;
+       char     tblNameSave[DB_MAX_TABLE_NAME_LEN+1];
+
+       wxString UserID;
+
+       if (userID)
+       {
+               if (!wxStrlen(userID))
+                       UserID = uid;
+               else
+                       UserID = userID;
+       }
+       else
+               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 
+       // 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
+       //-------------------------------------------------------------
+       for (pass = 1; pass <= 2; pass++)
+       {
+               SQLFreeStmt(hstmt, SQL_CLOSE);   // Close if Open
+               strcpy(tblNameSave,"");
+
+               if (wxStrcmp(UserID.GetData(),"") &&
+                        Dbms() != dbmsMY_SQL &&
+                        Dbms() != dbmsACCESS)
+               {
+                       retcode = SQLTables(hstmt,
+                                NULL, 0,                             // All qualifiers
+                                (UCHAR *) UserID.GetData(), SQL_NTS, // User specified
+                                NULL, 0,                             // All tables
+                                NULL, 0);                            // All columns
+               }
+               else
+               {
+                       retcode = SQLTables(hstmt,
+                                        NULL, 0,           // All qualifiers
+                                        NULL, 0,           // User specified
+                                        NULL, 0,           // All tables
+                                        NULL, 0);          // All columns
+               }
+               if (retcode != SQL_SUCCESS)
+               {
+                       DispAllErrors(henv, hdbc, hstmt);
+                       pDbInf = NULL;
+                       SQLFreeStmt(hstmt, SQL_CLOSE);
+                       return pDbInf;
+               }
+
+               while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)   // Table Information
+               {
+                       if (pass == 1)  // First pass, just count the Tables
+                       {
+                               if (pDbInf->numTables == 0)
+                               {
+                                       GetData( 1, SQL_C_CHAR,   (UCHAR*)  pDbInf->catalog,  128+1, &cb);
+                                       GetData( 2, SQL_C_CHAR,   (UCHAR*)  pDbInf->schema,   128+1, &cb);
+                                }
+                                pDbInf->numTables++;      // Counter for Tables
+                       }  // if (pass == 1)
+                       if (pass == 2) // Create and fill the Table entries
+                       {
+                               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;
+                                       }
+                                       noTab = 0;
+                               } // 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);
+                               noTab++;
+                       }  // if (pass == 2)  We now know the amount of Tables
+               }   // while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
+       }    // for (pass = 1; pass <= 2; pass++)
+       SQLFreeStmt(hstmt, SQL_CLOSE);
+
+       // Query how many columns are in each table
+       for (noTab=0;noTab<pDbInf->numTables;noTab++)
+       {
+               (pDbInf->pTableInf+noTab)->numCols = GetColumnCount((pDbInf->pTableInf+noTab)->tableName,UserID);
+       }
+       return pDbInf;
+}  // wxDB::GetCatalog()
+
+
 /********** wxDB::Catalog() **********/
-bool wxDB::Catalog(char *userID, char *fileName)
+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
+ * in 'userID'
+ *
+ * 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.
+ */
 {
-       assert(fileName && strlen(fileName));
+       assert(fileName && wxStrlen(fileName));
 
        RETCODE retcode;
        SDWORD  cb;
@@ -1424,32 +2136,40 @@ bool wxDB::Catalog(char *userID, char *fileName)
        char            typeName[30+1];
        SWORD           precision, length;
 
+       wxString UserID;
+
        FILE *fp = fopen(fileName,"wt");
        if (fp == NULL)
                return(FALSE);
 
        SQLFreeStmt(hstmt, SQL_CLOSE);
 
-       if (!userID || !strlen(userID))
-               userID = uid;
+       if (userID)
+       {
+               if (!wxStrlen(userID))
+                       UserID = uid;
+               else
+                       UserID = userID;
+       }
+       else
+               UserID = "";
+
+       // dBase does not use user names, and some drivers fail if you try to pass one
+       if (Dbms() == dbmsDBASE)
+               UserID = "";
 
-       char userIdUC[80+1];
        // Oracle user names may only be in uppercase, so force 
        // the name to uppercase
        if (Dbms() == dbmsORACLE)
-       {
-               int i = 0;
-               for (char *p = userID; *p; p++)
-                       userIdUC[i++] = toupper(*p);
-               userIdUC[i] = 0;
-               userID = userIdUC;
-       }
+               UserID = UserID.Upper();
 
-       if (strcmp(userID,""))
+       if (wxStrcmp(UserID.GetData(),"") &&
+                Dbms() != dbmsMY_SQL &&
+                Dbms() != dbmsACCESS)
        {
                retcode = SQLColumns(hstmt,
                                                                        NULL, 0,                                                                                        // All qualifiers
-                                                                       (UCHAR *) userID, SQL_NTS,                                      // User specified
+                                                                       (UCHAR *) UserID.GetData(), SQL_NTS,    // User specified
                                                                        NULL, 0,                                                                                        // All tables
                                                                        NULL, 0);                                                                               // All columns
        }
@@ -1468,20 +2188,13 @@ bool wxDB::Catalog(char *userID, char *fileName)
                return(FALSE);
        }
 
-       SQLBindCol(hstmt, 3, SQL_C_CHAR,   (UCHAR*)  tblName,     DB_MAX_TABLE_NAME_LEN+1,  &cb);
-       SQLBindCol(hstmt, 4, SQL_C_CHAR,   (UCHAR*)  colName,     DB_MAX_COLUMN_NAME_LEN+1, &cb);
-       SQLBindCol(hstmt, 5, SQL_C_SSHORT, (UCHAR*) &sqlDataType, 0,                        &cb);
-       SQLBindCol(hstmt, 6, SQL_C_CHAR,          (UCHAR*)  typeName,    sizeof(typeName),         &cb);
-       SQLBindCol(hstmt, 7, SQL_C_SSHORT, (UCHAR*) &precision,  0,                        &cb);
-       SQLBindCol(hstmt, 8, SQL_C_SSHORT, (UCHAR*) &length,     0,                        &cb);
-
-       char outStr[256];
-       strcpy(tblNameSave,"");
+       wxString outStr;
+       wxStrcpy(tblNameSave,"");
        int cnt = 0;
 
        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
        {
-               if (strcmp(tblName,tblNameSave))
+               if (wxStrcmp(tblName,tblNameSave))
                {
                        if (cnt)
                                fputs("\n", fp);
@@ -1490,21 +2203,28 @@ bool wxDB::Catalog(char *userID, char *fileName)
                        fputs("===================== ", fp);
                        fputs("========= ", fp);
                        fputs("=========\n", fp);
-                       sprintf(outStr, "%-32s %-32s %-21s %9s %9s\n",
+                       outStr.sprintf("%-32s %-32s %-21s %9s %9s\n",
                                "TABLE NAME", "COLUMN NAME", "DATA TYPE", "PRECISION", "LENGTH");
-                       fputs(outStr, fp);
+                       fputs(outStr.GetData(), fp);
                        fputs("================================ ", fp);
                        fputs("================================ ", fp);
                        fputs("===================== ", fp);
                        fputs("========= ", fp);
                        fputs("=========\n", fp);
-                       strcpy(tblNameSave,tblName);
+                       wxStrcpy(tblNameSave,tblName);
                }
-               sprintf(outStr, "%-32s %-32s (%04d)%-15s %9d %9d\n",
+
+      GetData(3,SQL_C_CHAR,  (UCHAR *)tblName,     DB_MAX_TABLE_NAME_LEN+1, &cb);
+      GetData(4,SQL_C_CHAR,  (UCHAR *)colName,     DB_MAX_COLUMN_NAME_LEN+1,&cb);
+      GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType,0,                       &cb);
+      GetData(6,SQL_C_CHAR,  (UCHAR *)typeName,    sizeof(typeName),        &cb);
+      GetData(7,SQL_C_SSHORT,(UCHAR *)&precision,  0,                       &cb);
+      GetData(8,SQL_C_SSHORT,(UCHAR *)&length,     0,                       &cb);
+
+               outStr.sprintf("%-32s %-32s (%04d)%-15s %9d %9d\n",
                        tblName, colName, sqlDataType, typeName, precision, length);
-               if (fputs(outStr, fp) == EOF)
+               if (fputs(outStr.GetData(), fp) == EOF)
                {
-                       SQLFreeStmt(hstmt, SQL_UNBIND);
                        SQLFreeStmt(hstmt, SQL_CLOSE);
                        fclose(fp);
                        return(FALSE);
@@ -1515,7 +2235,6 @@ bool wxDB::Catalog(char *userID, char *fileName)
        if (retcode != SQL_NO_DATA_FOUND)
                DispAllErrors(henv, hdbc, hstmt);
 
-       SQLFreeStmt(hstmt, SQL_UNBIND);
        SQLFreeStmt(hstmt, SQL_CLOSE);
 
        fclose(fp);
@@ -1524,76 +2243,80 @@ bool wxDB::Catalog(char *userID, char *fileName)
 }  // wxDB::Catalog()
 
 
-// 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
-// whether or not the user has privleges to query or perform other functions
-// on the table.
-bool wxDB::TableExists(char *tableName, char *userID, 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
+ * whether or not the user has privleges to query or perform other functions
+ * on the table.
+ *
+ * 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'
+ */
 {
-       assert(tableName && strlen(tableName));
+       wxString UserID;
+       wxString TableName;
+
+       assert(tableName && wxStrlen(tableName));
 
        if (Dbms() == dbmsDBASE)
        {
                wxString dbName;
-               if (tablePath && strlen(tablePath))
+               if (tablePath && wxStrlen(tablePath))
                        dbName.sprintf("%s/%s.dbf",tablePath,tableName);
                else
                        dbName.sprintf("%s.dbf",tableName);
-               bool glt;
-               glt = wxFileExists(dbName.GetData());
-               return glt;
+
+               bool exists;
+               exists = wxFileExists(dbName.GetData());
+               return exists;
        }
 
-       if (!userID || !strlen(userID))
-               userID = uid;
+       if (userID)
+       {
+               if (!wxStrlen(userID))
+                       UserID = uid;
+               else
+                       UserID = userID;
+       }
+       else
+               UserID = "";
 
-       char userIdUC[80+1];
        // Oracle user names may only be in uppercase, so force 
        // the name to uppercase
        if (Dbms() == dbmsORACLE)
-       {
-               int i = 0;
-               for (char *p = userID; *p; p++)
-                       userIdUC[i++] = toupper(*p);
-               userIdUC[i] = 0;
-               userID = userIdUC;
-       }
+               UserID = UserID.Upper();
 
-       char tableNameUC[DB_MAX_TABLE_NAME_LEN+1];
+       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)
-       {
-               int i = 0;
-               for (char *p = tableName; *p; p++)
-                       tableNameUC[i++] = toupper(*p);
-               tableNameUC[i] = 0;
-       }
-       else
-               sprintf(tableNameUC,tableName);
+               TableName = TableName.Upper();
 
        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
-       if (strcmp(userID,"") &&
+       if (wxStrcmp(UserID,"") &&
                 Dbms() != dbmsMY_SQL &&
                 Dbms() != dbmsACCESS)
        {
                retcode = SQLTables(hstmt,
-                                                                 NULL, 0,                                                                              // All qualifiers
-                                                                 (UCHAR *) userID, SQL_NTS,                            // All owners
-                                                                 (UCHAR FAR *)tableNameUC, SQL_NTS,
-                                                                 NULL, 0);                                                                             // All table types
+                                                                 NULL, 0,                                                                                              // All qualifiers
+                                                                 (UCHAR *) UserID.GetData(), SQL_NTS,                  // All owners
+                                                                 (UCHAR FAR *)TableName.GetData(), SQL_NTS,
+                                                                 NULL, 0);                                                                                             // All table types
        }
        else
        {
                retcode = SQLTables(hstmt,
-                                                                 NULL, 0,                                                                              // All qualifiers
-                                                                 NULL, 0,                                                                              // All owners
-                                                                 (UCHAR FAR *)tableNameUC, SQL_NTS,
-                                                                 NULL, 0);                                                                             // All table types
+                                                                 NULL, 0,                                                                                              // All qualifiers
+                                                                 NULL, 0,                                                                                              // All owners
+                                                                 (UCHAR FAR *)TableName.GetData(), SQL_NTS,
+                                                                 NULL, 0);                                                                                             // All table types
        }
        if (retcode != SQL_SUCCESS)
                return(DispAllErrors(henv, hdbc, hstmt));
@@ -1612,7 +2335,7 @@ bool wxDB::TableExists(char *tableName, char *userID, char *tablePath)
 
 
 /********** wxDB::SqlLog() **********/
-bool wxDB::SqlLog(enum sqlLog state, char *filename, bool append)
+bool wxDB::SqlLog(enum sqlLog state, const char *filename, bool append)
 {
        assert(state == sqlLogON  || state == sqlLogOFF);
        assert(state == sqlLogOFF || filename);
@@ -1643,7 +2366,7 @@ bool wxDB::SqlLog(enum sqlLog state, char *filename, bool append)
 
 
 /********** wxDB::WriteSqlLog() **********/
-bool wxDB::WriteSqlLog(char *logMsg)
+bool wxDB::WriteSqlLog(const char *logMsg)
 {
        assert(logMsg);
 
@@ -1660,6 +2383,7 @@ bool wxDB::WriteSqlLog(char *logMsg)
 
 
 /********** wxDB::Dbms() **********/
+DBMS 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.
@@ -1703,31 +2427,43 @@ bool wxDB::WriteSqlLog(char *logMsg)
  *
  *
  */
-DBMS wxDB::Dbms(void)
 {
-       if (!strnicmp(dbInf.dbmsName,"Oracle",6))
-               return(dbmsORACLE);
-       if (!stricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
+       wxChar baseName[25+1];
+
+       wxStrncpy(baseName,dbInf.dbmsName,25);
+       if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
                return(dbmsSYBASE_ASA);
-       if (!stricmp(dbInf.dbmsName,"SQL Server"))  // Sybase Adaptive Server Enterprise
+       if (!wxStricmp(dbInf.dbmsName,"SQL Server"))  // Sybase Adaptive Server 
                return(dbmsSYBASE_ASE);
-       if (!stricmp(dbInf.dbmsName,"Microsoft SQL Server"))
+       if (!wxStricmp(dbInf.dbmsName,"Microsoft SQL Server"))
                return(dbmsMS_SQL_SERVER);
-       if (!stricmp(dbInf.dbmsName,"MySQL"))
+       if (!wxStricmp(dbInf.dbmsName,"MySQL"))
                return(dbmsMY_SQL);
-       if (!stricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
+       if (!wxStricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
                return(dbmsPOSTGRES);
-       if (!stricmp(dbInf.dbmsName,"ACCESS"))
+
+       baseName[8] = 0;
+       if (!wxStricmp(baseName,"Informix"))
+               return(dbmsINFORMIX);
+
+       baseName[6] = 0;
+       if (!wxStricmp(baseName,"Oracle"))
+               return(dbmsORACLE);
+       if (!wxStricmp(dbInf.dbmsName,"ACCESS"))
                return(dbmsACCESS);
-       if (!strnicmp(dbInf.dbmsName,"DBASE",5))
+       if (!wxStricmp(dbInf.dbmsName,"MySQL"))
+               return(dbmsMY_SQL);
+
+       baseName[5] = 0;
+       if (!wxStricmp(baseName,"DBASE"))
                return(dbmsDBASE);
-       return(dbmsUNIDENTIFIED);
 
+       return(dbmsUNIDENTIFIED);
 }  // wxDB::Dbms()
 
 
 /********** GetDbConnection() **********/
-wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)
+wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
 {
        DbList *pList;
 
@@ -1737,7 +2473,7 @@ wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)
        {
                // The database connection must be for the same datasource
                // name and must currently not be in use.
-               if (pList->Free && (! strcmp(pDbStuff->Dsn, pList->Dsn)))  // Found a free connection
+               if (pList->Free && (! wxStrcmp(pDbStuff->Dsn, pList->Dsn)))  // Found a free connection
                {
                        pList->Free = FALSE;
                        return(pList->PtrDb);
@@ -1765,8 +2501,8 @@ wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)
        // Initialize new node in the linked list
        pList->PtrNext = 0;
        pList->Free = FALSE;
-       strcpy(pList->Dsn, pDbStuff->Dsn);
-       pList->PtrDb = new wxDB(pDbStuff->Henv);
+       wxStrcpy(pList->Dsn, pDbStuff->Dsn);
+       pList->PtrDb = new wxDB(pDbStuff->Henv,FwdOnlyCursors);
 
        // Connect to the datasource
        if (pList->PtrDb->Open(pDbStuff->Dsn, pDbStuff->Uid, pDbStuff->AuthStr))
@@ -1789,6 +2525,7 @@ wxDB* WXDLLEXPORT GetDbConnection(DbStuff *pDbStuff)
 
 }  // GetDbConnection()
 
+
 /********** FreeDbConnection() **********/
 bool WXDLLEXPORT FreeDbConnection(wxDB *pDb)
 {
@@ -1806,6 +2543,7 @@ bool WXDLLEXPORT FreeDbConnection(wxDB *pDb)
 
 }  // FreeDbConnection()
 
+
 /********** CloseDbConnections() **********/
 void WXDLLEXPORT CloseDbConnections(void)
 {
@@ -1826,6 +2564,7 @@ void WXDLLEXPORT CloseDbConnections(void)
 
 }  // CloseDbConnections()
 
+
 /********** NumberDbConnectionsInUse() **********/
 int WXDLLEXPORT NumberDbConnectionsInUse(void)
 {
@@ -1843,6 +2582,7 @@ int WXDLLEXPORT NumberDbConnectionsInUse(void)
 
 }  // NumberDbConnectionsInUse()
 
+
 /********** SqlLog() **********/
 bool SqlLog(enum sqlLog state, char *filename)
 {
@@ -1857,21 +2597,29 @@ bool SqlLog(enum sqlLog state, char *filename)
        }
 
        SQLLOGstate = state;
-       strcpy(SQLLOGfn,filename);
+       wxStrcpy(SQLLOGfn,filename);
 
        return(TRUE);
 
 }  // SqlLog()
 
+
 /********** GetDataSource() **********/
 bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
                                                 UWORD direction)
+/*
+ * Dsn and DsDesc will contain the data source name and data source
+ * description upon return
+ */
 {
        SWORD cb;
 
        if (SQLDataSources(henv, direction, (UCHAR FAR *) Dsn, DsnMax, &cb,
                                                         (UCHAR FAR *) DsDesc, DsDescMax, &cb) == SQL_SUCCESS)
+       {
+               DsDesc[cb+1] = 0;  // Set the terminating character for the string
                return(TRUE);
+       }
        else
                return(FALSE);