compile fix

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

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 3842b2cb11929ab98d2061faeda900fb82a0cab0..4063cdc163f7f3bc4a172f5768e40deb82c5eaf4 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -63,6 +63,7 @@
                 #include "wx/msgdlg.h"
        #endif
        #include "wx/filefn.h"
                 #include "wx/msgdlg.h"
        #endif
        #include "wx/filefn.h"

+       #include "wx/wxchar.h"

 #endif
 
 #if wxMAJOR_VERSION == 1
 #endif
 
 #if wxMAJOR_VERSION == 1


@@ -91,7 +92,7 @@
 
 DbList WXDLLEXPORT *PtrBegDbList = 0;
 
 
 DbList WXDLLEXPORT *PtrBegDbList = 0;
 

-#if __WXDEBUG__ > 0
+#ifdef __WXDEBUG__

        extern wxList TablesInUse;
 #endif
 
        extern wxList TablesInUse;
 #endif
 


@@ -110,7 +111,7 @@ char SQLLOGfn[DB_PATH_MAX+1] = "sqllog.txt";
 char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 /********** wxDB Constructor **********/
 char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 /********** wxDB Constructor **********/

-wxDB::wxDB(HENV &aHenv)
+wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)

 {
        int i;
 
 {
        int i;
 


@@ -118,32 +119,32 @@ wxDB::wxDB(HENV &aHenv)
        sqlLogState = sqlLogOFF;        // By default, logging is turned off
        nTables         = 0;
        
        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++)
        nativeError = cbErrorMsg = 0;
        for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)

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

 
        // Init typeInf structures
 
        // Init typeInf structures

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

        typeInfVarchar.FsqlType = 0;
        typeInfVarchar.Precision = 0;
        typeInfVarchar.CaseSensitive = 0;
        typeInfVarchar.MaximumScale = 0;
 
        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;
 
        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;
 
        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;
        typeInfDate.FsqlType = 0;
        typeInfDate.Precision = 0;
        typeInfDate.CaseSensitive = 0;


@@ -154,6 +155,7 @@ wxDB::wxDB(HENV &aHenv)
        
        // Copy the HENV into the db class
        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)
 
        // Allocate a data source connection handle
        if (SQLAllocConnect(henv, &hdbc) != SQL_SUCCESS)


@@ -170,27 +172,26 @@ wxDB::wxDB(HENV &aHenv)
 /********** wxDB::Open() **********/
 bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 {
 /********** 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;
 
        dsn             = Dsn;
        uid             = Uid;
        authStr = AuthStr;
 
        RETCODE retcode;
 

-#if wxODBC_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;
                if (retcode == SQL_SUCCESS)
                        cout << "SQLSetConnectOption(CURSOR_LIB) successful" << endl;
                else
                        cout << "SQLSetConnectOption(CURSOR_LIB) failed" << endl;

-       #endif
-

 #endif
 #endif

+       }

 
        // Connect to the data source
        retcode = SQLConnect(hdbc, (UCHAR FAR *) Dsn,           SQL_NTS,
 
        // Connect to the data source
        retcode = SQLConnect(hdbc, (UCHAR FAR *) Dsn,           SQL_NTS,


@@ -762,7 +763,7 @@ void wxDB::Close(void)
        // There should be zero Ctable objects still connected to this db object
        assert(nTables == 0);
 
        // 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();
        CstructTablesInUse *tiu;
        wxNode *pNode;
        pNode = TablesInUse.First();


@@ -784,7 +785,7 @@ void wxDB::Close(void)
        // Copy the error messages to a global variable
        int i;
        for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
        // Copy the error messages to a global variable
        int i;
        for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)

-               strcpy(DBerrorList[i],errorList[i]);
+               wxStrcpy(DBerrorList[i],errorList[i]);

 
 } // wxDB::Close()
 
 
 } // wxDB::Close()
 


@@ -874,9 +875,9 @@ void wxDB::DispNextError(void)
 } // wxDB::DispNextError()
 
 /********** wxDB::logError() **********/
 } // 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;
 
        static int pLast = -1;
        int dbStatus;


@@ -885,13 +886,13 @@ void wxDB::logError(char *errMsg, char *SQLState)
        {
                int i;
                for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
        {
                int i;
                for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)

-                       strcpy(errorList[i], errorList[i+1]);
+                       wxStrcpy(errorList[i], errorList[i+1]);

                pLast--;
        }
 
                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;
 
                if ((dbStatus = TranslateSqlState(SQLState)) != DB_ERR_FUNCTION_SEQUENCE_ERROR)
                        DB_STATUS = dbStatus;
 


@@ -901,7 +902,7 @@ void wxDB::logError(char *errMsg, char *SQLState)
 }  // wxDB::logError()
 
 /**********wxDB::TranslateSqlState()  **********/
 }  // wxDB::logError()
 
 /**********wxDB::TranslateSqlState()  **********/

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

 {
        if (!wxStrcmp(SQLState, "01000"))
                return(DB_ERR_GENERAL_WARNING);
 {
        if (!wxStrcmp(SQLState, "01000"))
                return(DB_ERR_GENERAL_WARNING);


@@ -1088,46 +1089,46 @@ int wxDB::TranslateSqlState(char *SQLState)
 }  // wxDB::TranslateSqlState()
        
 /**********  wxDB::Grant() **********/
 }  // 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
 {
        char sqlStmt[DB_MAX_STATEMENT_LEN];
 
        // Build the grant statement

-       strcpy(sqlStmt, "GRANT ");
+       wxStrcpy(sqlStmt, "GRANT ");

        if (privileges == DB_GRANT_ALL)
        if (privileges == DB_GRANT_ALL)

-               strcat(sqlStmt, "ALL");
+               wxStrcat(sqlStmt, "ALL");

        else
        {
                int c = 0;
                if (privileges & DB_GRANT_SELECT)
                {
        else
        {
                int c = 0;
                if (privileges & DB_GRANT_SELECT)
                {

-                       strcat(sqlStmt, "SELECT");
+                       wxStrcat(sqlStmt, "SELECT");

                        c++;
                }
                if (privileges & DB_GRANT_INSERT)
                {
                        if (c++)
                        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++)
                }
                if (privileges & DB_GRANT_UPDATE)
                {
                        if (c++)

-                               strcat(sqlStmt, ", ");
-                       strcat(sqlStmt, "UPDATE");
+                               wxStrcat(sqlStmt, ", ");
+                       wxStrcat(sqlStmt, "UPDATE");

                }
                if (privileges & DB_GRANT_DELETE)
                {
                        if (c++)
                }
                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;
 
 #ifdef DBDEBUG_CONSOLE
        cout << endl << sqlStmt << endl;


@@ -1140,7 +1141,7 @@ bool wxDB::Grant(int privileges, char *tableName, char *userList)
 }  // wxDB::Grant()
 
 /********** wxDB::CreateView() **********/
 }  // 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];
 
 {
        char sqlStmt[DB_MAX_STATEMENT_LEN];
 


@@ -1149,18 +1150,18 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemp
                return FALSE;
 
        // Build the create view statement
                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);
 
 
        WriteSqlLog(sqlStmt);
 


@@ -1173,7 +1174,7 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemp
 }  // wxDB::CreateView()
 
 /********** wxDB::DropView()  **********/
 }  // 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
 {
        // NOTE: This function returns TRUE if the View does not exist, but
        //       only for identified databases.  Code will need to be added


@@ -1217,7 +1218,7 @@ bool wxDB::DropView(char *viewName)
 
 
 /********** wxDB::ExecSql()  **********/
 
 
 /********** 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)
 {
        SQLFreeStmt(hstmt, SQL_CLOSE);
        if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)


@@ -1277,36 +1278,34 @@ bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FA
  *                             delete [] colInf;
  *                     }
  */
  *                             delete [] colInf;
  *                     }
  */

-CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
+CcolInf *wxDB::GetColumns(char *tableName[], const char *userID)

 {
 {

-       UINT noCols = 0;
-       UINT colNo = 0;
+       UINT     noCols = 0;
+       UINT     colNo  = 0;

        CcolInf *colInf = 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];

 
 

-       if (!userID || !strlen(userID))
-               userID = uid;
+       RETCODE  retcode;
+       SDWORD   cb;
+       char     tblName[DB_MAX_TABLE_NAME_LEN+1];
+       char     colName[DB_MAX_COLUMN_NAME_LEN+1];
+       SWORD    sqlDataType;
+
+       wxString UserID;
+       wxString TableName;
+
+       if (!userID || !wxStrlen(userID))
+               UserID = uid;
+       else
+               UserID = userID;

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

-               userID = "";
+               UserID = "";

 
        // Oracle user names may only be in uppercase, so force 
        // the name to uppercase
        if (Dbms() == dbmsORACLE)
 
        // 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 1 - Determine how many columns there are.
        // Pass 2 - Allocate the CcolInf array and fill in


@@ -1323,38 +1322,32 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                        if (!colInf)
                                break;
                        // Mark the end of the array
                        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++)
                {
                        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)
                        // 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
 
                        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,"") &&
+                       if (wxStrcmp(UserID.GetData(),"") &&

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

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

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


@@ -1362,7 +1355,7 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                retcode = SQLColumns(hstmt,
                                                                                        NULL, 0,                                                                                        // All qualifiers
                                                                                        NULL, 0,                                                                                        // Owner
                                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)
                                                                                        NULL, 0);                                                                               // All columns
                        }
                        if (retcode != SQL_SUCCESS)


@@ -1374,8 +1367,8 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                SQLFreeStmt(hstmt, SQL_CLOSE);
                                return(0);
                        }
                                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, 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)
                        {
                        SQLBindCol(hstmt, 5, SQL_C_SSHORT, (UCHAR*) &sqlDataType, 0,                        &cb);
                        while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
                        {


@@ -1385,8 +1378,8 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
                                {
                                        if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
                                        {
                                {
                                        if (colNo < noCols)  // Some extra error checking to prevent memory overwrites
                                        {

-                                               strcpy(colInf[colNo].tableName, tblName);
-                                               strcpy(colInf[colNo].colName, colName);
+                                               wxStrcpy(colInf[colNo].tableName, tblName);
+                                               wxStrcpy(colInf[colNo].colName, colName);

                                                colInf[colNo].sqlDataType = sqlDataType;
                                                colNo++;
                                        }
                                                colInf[colNo].sqlDataType = sqlDataType;
                                                colNo++;
                                        }


@@ -1412,9 +1405,9 @@ CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
 
 
 /********** wxDB::Catalog() **********/
 
 
 /********** wxDB::Catalog() **********/

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

 {
 {

-       assert(fileName && strlen(fileName));
+       assert(fileName && wxStrlen(fileName));

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


@@ -1425,32 +1418,29 @@ bool wxDB::Catalog(char *userID, char *fileName)
        char            typeName[30+1];
        SWORD           precision, length;
 
        char            typeName[30+1];
        SWORD           precision, length;
 

+       wxString UserID;
+

        FILE *fp = fopen(fileName,"wt");
        if (fp == NULL)
                return(FALSE);
 
        SQLFreeStmt(hstmt, SQL_CLOSE);
 
        FILE *fp = fopen(fileName,"wt");
        if (fp == NULL)
                return(FALSE);
 
        SQLFreeStmt(hstmt, SQL_CLOSE);
 

-       if (!userID || !strlen(userID))
-               userID = uid;
+       if (!userID || !wxStrlen(userID))
+               UserID = uid;
+       else
+               UserID = userID;

 
 

-       char userIdUC[80+1];

        // Oracle user names may only be in uppercase, so force 
        // the name to uppercase
        if (Dbms() == dbmsORACLE)
        // 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 (wxStrcmp(userID,""))
+       if (wxStrcmp(UserID.GetData(),""))

        {
                retcode = SQLColumns(hstmt,
                                                                        NULL, 0,                                                                                        // All qualifiers
        {
                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
        }
                                                                        NULL, 0,                                                                                        // All tables
                                                                        NULL, 0);                                                                               // All columns
        }


@@ -1477,7 +1467,7 @@ bool wxDB::Catalog(char *userID, char *fileName)
        SQLBindCol(hstmt, 8, SQL_C_SSHORT, (UCHAR*) &length,     0,                        &cb);
 
        char outStr[256];
        SQLBindCol(hstmt, 8, SQL_C_SSHORT, (UCHAR*) &length,     0,                        &cb);
 
        char outStr[256];

-       strcpy(tblNameSave,"");
+       wxStrcpy(tblNameSave,"");

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


@@ -1499,7 +1489,7 @@ bool wxDB::Catalog(char *userID, char *fileName)
                        fputs("===================== ", fp);
                        fputs("========= ", fp);
                        fputs("=========\n", fp);
                        fputs("===================== ", fp);
                        fputs("========= ", fp);
                        fputs("=========\n", fp);

-                       strcpy(tblNameSave,tblName);
+                       wxStrcpy(tblNameSave,tblName);

                }
                sprintf(outStr, "%-32s %-32s (%04d)%-15s %9d %9d\n",
                        tblName, colName, sqlDataType, typeName, precision, length);
                }
                sprintf(outStr, "%-32s %-32s (%04d)%-15s %9d %9d\n",
                        tblName, colName, sqlDataType, typeName, precision, length);


@@ -1529,72 +1519,64 @@ bool wxDB::Catalog(char *userID, char *fileName)
 // 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.
 // 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)

 {
 {

-       assert(tableName && strlen(tableName));
+       wxString UserID;
+       wxString TableName;
+
+       assert(tableName && wxStrlen(tableName));

 
        if (Dbms() == dbmsDBASE)
        {
                wxString dbName;
 
        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);
                        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 || !wxStrlen(userID))
+               UserID = uid;
+       else
+               UserID = userID;

 
 

-       char userIdUC[80+1];

        // Oracle user names may only be in uppercase, so force 
        // the name to uppercase
        if (Dbms() == dbmsORACLE)
        // 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)
        // 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
 
        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 (wxStrcmp(userID,"") &&
+       if (wxStrcmp(UserID,"") &&

                 Dbms() != dbmsMY_SQL &&
                 Dbms() != dbmsACCESS)
        {
                retcode = SQLTables(hstmt,
                 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,
        }
        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));
        }
        if (retcode != SQL_SUCCESS)
                return(DispAllErrors(henv, hdbc, hstmt));


@@ -1613,7 +1595,7 @@ bool wxDB::TableExists(char *tableName, char *userID, char *tablePath)
 
 
 /********** wxDB::SqlLog() **********/
 
 
 /********** 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);
 {
        assert(state == sqlLogON  || state == sqlLogOFF);
        assert(state == sqlLogOFF || filename);


@@ -1644,7 +1626,7 @@ bool wxDB::SqlLog(enum sqlLog state, char *filename, bool append)
 
 
 /********** wxDB::WriteSqlLog() **********/
 
 
 /********** wxDB::WriteSqlLog() **********/

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

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


@@ -1706,11 +1688,12 @@ bool wxDB::WriteSqlLog(char *logMsg)
  */
 DBMS wxDB::Dbms(void)
 {
  */
 DBMS wxDB::Dbms(void)
 {

-       if (!wxStrnicmp(dbInf.dbmsName,"Oracle",6))
-               return(dbmsORACLE);
+       wxChar baseName[25+1];
+
+       wxStrncpy(baseName,dbInf.dbmsName,25);

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

-       if (!wxStricmp(dbInf.dbmsName,"SQL Server"))  // Sybase Adaptive Server Enterprise
+       if (!wxStricmp(dbInf.dbmsName,"SQL Server"))  // Sybase Adaptive Server 

                return(dbmsSYBASE_ASE);
        if (!wxStricmp(dbInf.dbmsName,"Microsoft SQL Server"))
                return(dbmsMS_SQL_SERVER);
                return(dbmsSYBASE_ASE);
        if (!wxStricmp(dbInf.dbmsName,"Microsoft SQL Server"))
                return(dbmsMS_SQL_SERVER);


@@ -1718,17 +1701,29 @@ DBMS wxDB::Dbms(void)
                return(dbmsMY_SQL);
        if (!wxStricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
                return(dbmsPOSTGRES);
                return(dbmsMY_SQL);
        if (!wxStricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
                return(dbmsPOSTGRES);

+
+       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 (!wxStricmp(dbInf.dbmsName,"ACCESS"))
                return(dbmsACCESS);

-       if (!wxStrnicmp(dbInf.dbmsName,"DBASE",5))
+       if (!wxStricmp(dbInf.dbmsName,"MySQL"))
+               return(dbmsMY_SQL);
+
+       baseName[5] = 0;
+       if (!wxStricmp(baseName,"DBASE"))

                return(dbmsDBASE);
                return(dbmsDBASE);

-       return(dbmsUNIDENTIFIED);

 
 

+       return(dbmsUNIDENTIFIED);

 }  // wxDB::Dbms()
 
 
 /********** GetDbConnection() **********/
 }  // wxDB::Dbms()
 
 
 /********** GetDbConnection() **********/

-wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff)
+wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)

 {
        DbList *pList;
 
 {
        DbList *pList;
 


@@ -1766,8 +1761,8 @@ wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff)
        // Initialize new node in the linked list
        pList->PtrNext = 0;
        pList->Free = FALSE;
        // 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))
 
        // Connect to the datasource
        if (pList->PtrDb->Open(pDbStuff->Dsn, pDbStuff->Uid, pDbStuff->AuthStr))


@@ -1858,14 +1853,14 @@ bool SqlLog(enum sqlLog state, char *filename)
        }
 
        SQLLOGstate = state;
        }
 
        SQLLOGstate = state;

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

 
        return(TRUE);
 
 }  // SqlLog()
 
 /********** GetDataSource() **********/
 
        return(TRUE);
 
 }  // SqlLog()
 
 /********** GetDataSource() **********/

-bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
+bool GetDataSource(HENV henv, const char *Dsn, SWORD DsnMax, const char *DsDesc, SWORD DsDescMax,

                                                 UWORD direction)
 {
        SWORD cb;
                                                 UWORD direction)
 {
        SWORD cb;