X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d47631c8f54fdd78c51de318d4128461a841cf57..b068c4e8a1f4919360329c345eae36ff95ab5a10:/src/common/db.cpp?ds=sidebyside

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 1c2c703f42..073e09d252 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -5,11 +5,19 @@
 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by:
+// Mods:        Dec, 1998: 
+//                -Added support for SQL statement logging and database cataloging
+// Mods:        April, 1999
+//						-Added QUERY_ONLY mode support to reduce default number of cursors
+//						-Added additional SQL logging code
+//                -Added DEBUG-ONLY tracking of wxTable objects to detect orphaned DB connections
+//						-Set ODBC option to only read committed writes to the DB so all
+//                   databases operate the same in that respect
 // Created:     9.96
 // RCS-ID:      $Id$
 // Copyright:   (c) 1996 Remstar International, Inc.
 // Licence:     wxWindows licence, plus:
-// Notice:		This class library and its intellectual design are free of charge for use,
+// Notice:		 This class library and its intellectual design are free of charge for use,
 //              modification, enhancement, debugging under the following conditions:
 //              1) These classes may only be used as part of the implementation of a
 //                 wxWindows-based application
@@ -25,40 +33,91 @@
 // SYNOPSIS STOP
 */
 
-#ifdef __GNUG__
-#pragma implementation "db.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__
+	#pragma implementation "db.h"
+	#endif
 #endif
 
-/*
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 	#include <iostream.h>
 #endif
-*/
-
-#include  "wx/wxprec.h"
 
 #ifdef    __BORLANDC__
-  #pragma hdrstop
+	#pragma hdrstop
 #endif  //__BORLANDC__
 
-#ifndef WX_PRECOMP
-  #include  <wx/wx.h>
-#endif //WX_PRECOMP
+#if wxMAJOR_VERSION == 2
+	#ifndef WX_PRECOMP
+		#include  "wx/string.h"
+	#endif //WX_PRECOMP
+	#include "wx/filefn.h"
+#endif
 
-#if wxUSE_ODBC
+#if wxMAJOR_VERSION == 1
+#	if defined(wx_msw) || defined(wx_x)
+#		ifdef WX_PRECOMP
+#			include "wx_prec.h"
+#		else
+#			include "wx.h"
+#		endif
+#	endif
+#	define wxUSE_ODBC 1
+#endif
 
-#include <wx/db.h>
+#if wxUSE_ODBC
 
 #include <stdio.h>
 #include <string.h>
 #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;
+
+#if __WXDEBUG__ > 0
+        #if   wxMAJOR_VERSION == 2
+                #include "wx/object.h"
+                #include "wx/list.h"
+                #include "wx/utils.h"
+                #include "wx/msgdlg.h"
+	#endif
+	extern wxList TablesInUse;
+#endif
+
+// SQL Log defaults to be used by GetDbConnection
+enum sqlLog SQLLOGstate				= sqlLogOFF;
+
+char SQLLOGfn[DB_PATH_MAX+1] = "sqllog.txt";
 
-DbList *PtrBegDbList = 0;
+// The wxDB::errorList is copied to this variable when the wxDB object
+// is closed.  This way, the error list is still available after the
+// database object is closed.  This is necessary if the database 
+// connection fails so the calling application can show the operator
+// why the connection failed.  Note: as each wxDB object is closed, it
+// will overwrite the errors of the previously destroyed wxDB object in 
+// this variable.
+char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
 
 /********** wxDB Constructor **********/
 wxDB::wxDB(HENV &aHenv)
 {
 	int i;
+
+	fpSqlLog		= 0;				// Sql Log file pointer
+	sqlLogState = sqlLogOFF;	// By default, logging is turned off
+	nTables		= 0;
 	
 	strcpy(sqlState,"");
 	strcpy(errorMsg,"");
@@ -112,20 +171,20 @@ wxDB::wxDB(HENV &aHenv)
 /********** wxDB::Open() **********/
 bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 {
-	assert(Dsn);
+	assert(Dsn && strlen(Dsn));
 	dsn		= Dsn;
 	uid		= Uid;
 	authStr	= AuthStr;
 
-#ifndef FWD_ONLY_CURSORS
-
 	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);
 
-	#ifdef _CONSOLE
+	#ifdef DBDEBUG_CONSOLE
 		if (retcode == SQL_SUCCESS)
 			cout << "SQLSetConnectOption(CURSOR_LIB) successful" << endl;
 		else
@@ -135,11 +194,21 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 #endif
 
 	// Connect to the data source
-	if (SQLConnect(hdbc, (UCHAR FAR *) Dsn,		SQL_NTS,
-								(UCHAR FAR *) Uid,		SQL_NTS,
-								(UCHAR FAR *) AuthStr,	SQL_NTS) != SQL_SUCCESS)
+	retcode = SQLConnect(hdbc, (UCHAR FAR *) Dsn,		SQL_NTS,
+									   (UCHAR FAR *) Uid,		SQL_NTS,
+										(UCHAR FAR *) AuthStr,SQL_NTS);
+	if (retcode == SQL_SUCCESS_WITH_INFO)
+		DispAllErrors(henv, hdbc);
+	else if (retcode != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
+/*
+	If using Intersolv branded ODBC drivers, this is the place where you would substitute
+	your branded driver license information
+
+	SQLSetConnectOption(hdbc, 1041, (UDWORD) "");
+	SQLSetConnectOption(hdbc, 1042, (UDWORD) "");
+*/
 	// Mark database as open
 	dbIsOpen = TRUE;
 
@@ -235,12 +304,22 @@ bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
 		typeInfInteger.FsqlType = SQL_INTEGER;
 
 	// Date/Time
-	if (! getDataTypeInfo(SQL_TIMESTAMP, typeInfDate))
-		return(FALSE);
+	if (Dbms() != dbmsDBASE)
+   {
+		if (! getDataTypeInfo(SQL_TIMESTAMP, typeInfDate))
+			return(FALSE);
+		else
+			typeInfDate.FsqlType = SQL_TIMESTAMP;
+	}
 	else
-		typeInfDate.FsqlType = SQL_TIMESTAMP;
+	{
+		if (! getDataTypeInfo(SQL_DATE, typeInfDate))
+			return(FALSE);
+		else
+			typeInfDate.FsqlType = SQL_DATE;
+	}
 
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 	cout << "VARCHAR DATA TYPE: " << typeInfVarchar.TypeName << endl;
 	cout << "INTEGER DATA TYPE: " << typeInfInteger.TypeName << endl;
 	cout << "FLOAT   DATA TYPE: " << typeInfFloat.TypeName << endl;
@@ -262,7 +341,7 @@ bool wxDB::setConnectionOptions(void)
 	SQLSetConnectOption(hdbc, SQL_OPT_TRACE, SQL_OPT_TRACE_OFF);
 
 	// Display the connection options to verify them
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 	long l;
 	cout << ">>>>> CONNECTION OPTIONS <<<<<<" << endl;
 	
@@ -303,98 +382,104 @@ bool wxDB::setConnectionOptions(void)
 bool wxDB::getDbInfo(void)
 {
 	SWORD cb;
+	RETCODE retcode;
 
-	if (SQLGetInfo(hdbc, SQL_SERVER_NAME, dbInf.serverName, 40, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_SERVER_NAME, (UCHAR*) dbInf.serverName, 80, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DATABASE_NAME, dbInf.databaseName, 128, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_DATABASE_NAME, (UCHAR*) dbInf.databaseName, 128, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DBMS_NAME, dbInf.dbmsName, 40, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_DBMS_NAME, (UCHAR*) dbInf.dbmsName, 40, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DBMS_VER, dbInf.dbmsVer, 20, &cb) != SQL_SUCCESS)
+	// 16-Mar-1999
+	// After upgrading to MSVC6, the original 20 char buffer below was insufficient,
+	// causing database connectivity to fail in some cases.
+   retcode = SQLGetInfo(hdbc, SQL_DBMS_VER, (UCHAR*) dbInf.dbmsVer, 64, &cb);
+	if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO )
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ACTIVE_CONNECTIONS, &dbInf.maxConnections, sizeof(dbInf.maxConnections), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_ACTIVE_CONNECTIONS, (UCHAR*) &dbInf.maxConnections, sizeof(dbInf.maxConnections), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ACTIVE_STATEMENTS, &dbInf.maxStmts, sizeof(dbInf.maxStmts), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_ACTIVE_STATEMENTS, (UCHAR*) &dbInf.maxStmts, sizeof(dbInf.maxStmts), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DRIVER_NAME, dbInf.driverName, 40, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_DRIVER_NAME, (UCHAR*) dbInf.driverName, 40, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DRIVER_ODBC_VER, dbInf.odbcVer, 20, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_DRIVER_ODBC_VER, (UCHAR*) dbInf.odbcVer, 60, &cb) == SQL_ERROR)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ODBC_VER, dbInf.drvMgrOdbcVer, 20, &cb) != SQL_SUCCESS)
+	retcode = SQLGetInfo(hdbc, SQL_ODBC_VER, (UCHAR*) dbInf.drvMgrOdbcVer, 60, &cb);
+	if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DRIVER_VER, dbInf.driverVer, 40, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_DRIVER_VER, (UCHAR*) dbInf.driverVer, 60, &cb) == SQL_ERROR)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ODBC_API_CONFORMANCE, &dbInf.apiConfLvl, sizeof(dbInf.apiConfLvl), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_ODBC_API_CONFORMANCE, (UCHAR*) &dbInf.apiConfLvl, sizeof(dbInf.apiConfLvl), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_ODBC_SAG_CLI_CONFORMANCE, (UCHAR*) &dbInf.cliConfLvl, sizeof(dbInf.cliConfLvl), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_ODBC_SQL_CONFORMANCE, (UCHAR*) &dbInf.sqlConfLvl, sizeof(dbInf.sqlConfLvl), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_OUTER_JOINS, dbInf.outerJoins, 2, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_OUTER_JOINS, (UCHAR*) dbInf.outerJoins, 2, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_PROCEDURES, dbInf.procedureSupport, 2, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_PROCEDURES, (UCHAR*) dbInf.procedureSupport, 2, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_CURSOR_COMMIT_BEHAVIOR, (UCHAR*) &dbInf.cursorCommitBehavior, sizeof(dbInf.cursorCommitBehavior), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_CURSOR_ROLLBACK_BEHAVIOR, &dbInf.cursorRollbackBehavior, sizeof(dbInf.cursorRollbackBehavior), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_CURSOR_ROLLBACK_BEHAVIOR, (UCHAR*) &dbInf.cursorRollbackBehavior, sizeof(dbInf.cursorRollbackBehavior), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_NON_NULLABLE_COLUMNS, &dbInf.supportNotNullClause, sizeof(dbInf.supportNotNullClause), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_NON_NULLABLE_COLUMNS, (UCHAR*) &dbInf.supportNotNullClause, sizeof(dbInf.supportNotNullClause), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_ODBC_SQL_OPT_IEF, dbInf.supportIEF, 2, &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_ODBC_SQL_OPT_IEF, (UCHAR*) dbInf.supportIEF, 2, &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, &dbInf.txnIsolation, sizeof(dbInf.txnIsolation), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_DEFAULT_TXN_ISOLATION, (UCHAR*) &dbInf.txnIsolation, sizeof(dbInf.txnIsolation), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_TXN_ISOLATION_OPTION, &dbInf.txnIsolationOptions, sizeof(dbInf.txnIsolationOptions), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_TXN_ISOLATION_OPTION, (UCHAR*) &dbInf.txnIsolationOptions, sizeof(dbInf.txnIsolationOptions), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_FETCH_DIRECTION, &dbInf.fetchDirections, sizeof(dbInf.fetchDirections), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_FETCH_DIRECTION, (UCHAR*) &dbInf.fetchDirections, sizeof(dbInf.fetchDirections), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_LOCK_TYPES, &dbInf.lockTypes, sizeof(dbInf.lockTypes), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_LOCK_TYPES, (UCHAR*) &dbInf.lockTypes, sizeof(dbInf.lockTypes), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_POS_OPERATIONS, &dbInf.posOperations, sizeof(dbInf.posOperations), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_POS_OPERATIONS, (UCHAR*) &dbInf.posOperations, sizeof(dbInf.posOperations), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_POSITIONED_STATEMENTS, &dbInf.posStmts, sizeof(dbInf.posStmts), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_POSITIONED_STATEMENTS, (UCHAR*) &dbInf.posStmts, sizeof(dbInf.posStmts), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_SCROLL_CONCURRENCY, &dbInf.scrollConcurrency, sizeof(dbInf.scrollConcurrency), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_SCROLL_CONCURRENCY, (UCHAR*) &dbInf.scrollConcurrency, sizeof(dbInf.scrollConcurrency), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_SCROLL_OPTIONS, &dbInf.scrollOptions, sizeof(dbInf.scrollOptions), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_SCROLL_OPTIONS, (UCHAR*) &dbInf.scrollOptions, sizeof(dbInf.scrollOptions), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_STATIC_SENSITIVITY, &dbInf.staticSensitivity, sizeof(dbInf.staticSensitivity), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_STATIC_SENSITIVITY, (UCHAR*) &dbInf.staticSensitivity, sizeof(dbInf.staticSensitivity), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_TXN_CAPABLE, &dbInf.txnCapable, sizeof(dbInf.txnCapable), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_TXN_CAPABLE, (UCHAR*) &dbInf.txnCapable, sizeof(dbInf.txnCapable), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-	if (SQLGetInfo(hdbc, SQL_LOGIN_TIMEOUT, &dbInf.loginTimeout, sizeof(dbInf.loginTimeout), &cb) != SQL_SUCCESS)
+	if (SQLGetInfo(hdbc, SQL_LOGIN_TIMEOUT, (UCHAR*) &dbInf.loginTimeout, sizeof(dbInf.loginTimeout), &cb) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc));
 
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 	cout << ">>>>> DATA SOURCE INFORMATION <<<<<" << endl;
 	cout << "SERVER Name: " << dbInf.serverName << endl;
 	cout << "DBMS Name: " << dbInf.dbmsName << "; DBMS Version: " << dbInf.dbmsVer << endl;
@@ -612,7 +697,7 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
 	// Fetch the record
 	if ((retcode = SQLFetch(hstmt)) != SQL_SUCCESS)
 	{
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 		if (retcode == SQL_NO_DATA_FOUND)
 			cout << "SQL_NO_DATA_FOUND fetching inf. about data type." << endl;
 #endif
@@ -621,16 +706,22 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
 		return(FALSE);
 	}
 	// Obtain columns from the record
-	if (SQLGetData(hstmt, 1, SQL_C_CHAR, structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)
+	if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc, hstmt));
-	if (SQLGetData(hstmt, 3, SQL_C_LONG, &structSQLTypeInfo.Precision, 0, &cbRet) != SQL_SUCCESS)
+	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, &structSQLTypeInfo.CaseSensitive, 0, &cbRet) != SQL_SUCCESS)
+	if (SQLGetData(hstmt, 8, SQL_C_SHORT, (UCHAR*) &structSQLTypeInfo.CaseSensitive, 0, &cbRet) != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc, hstmt));
-//	if (SQLGetData(hstmt, 14, SQL_C_SHORT, &structSQLTypeInfo.MinimumScale, 0, &cbRet) != SQL_SUCCESS)
+//	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));
-	if (SQLGetData(hstmt, 15, SQL_C_SHORT, &structSQLTypeInfo.MaximumScale, 0, &cbRet) != SQL_SUCCESS)
+//#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;
@@ -647,6 +738,13 @@ bool wxDB::getDataTypeInfo(SWORD fSqlType, SqlTypeInfo &structSQLTypeInfo)
 /********** wxDB::Close() **********/
 void wxDB::Close(void)
 {
+	// Close the Sql Log file
+	if (fpSqlLog)
+	{
+		fclose(fpSqlLog);
+		fpSqlLog = 0;
+	}
+
 	// Free statement handle
 	if (dbIsOpen)
 	{
@@ -662,14 +760,44 @@ void wxDB::Close(void)
 	if (SQLFreeConnect(hdbc) != SQL_SUCCESS)
 		DispAllErrors(henv, hdbc);
 
+	// There should be zero Ctable objects still connected to this db object
+	assert(nTables == 0);
+
+#if __WXDEBUG__ > 0
+	CstructTablesInUse *tiu;
+	wxNode *pNode;
+	pNode = TablesInUse.First();
+	char s[80];
+	char s2[80];
+	while (pNode)
+	{
+		tiu = (CstructTablesInUse *)pNode->Data();
+		if (tiu->pDb == 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();
+	}
+#endif
+
+	// Copy the error messages to a global variable
+	int i;
+	for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
+		strcpy(DBerrorList[i],errorList[i]);
+
 } // wxDB::Close()
 
 /********** wxDB::CommitTrans() **********/
 bool wxDB::CommitTrans(void)
 {
-	// Commit the transaction
-	if (SQLTransact(henv, hdbc, SQL_COMMIT) != SQL_SUCCESS)
-		return(DispAllErrors(henv, hdbc));
+	if (this)
+	{
+		// Commit the transaction
+		if (SQLTransact(henv, hdbc, SQL_COMMIT) != SQL_SUCCESS)
+			return(DispAllErrors(henv, hdbc));
+	}
 
 	// Completed successfully
 	return(TRUE);
@@ -699,16 +827,20 @@ bool wxDB::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt)
 		logError(odbcErrMsg, sqlState);
 		if (!silent)
 		{
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 			// When run in console mode, use standard out to display errors.
 			cout << odbcErrMsg << endl;
 			cout << "Press any key to continue..." << endl;
 			getchar();
 #endif
 		}
+
+#ifdef __WXDEBUG__
+		wxMessageBox(odbcErrMsg);
+#endif
 	}
 
-	return(FALSE);  // This function alway's returns false.
+	return(FALSE);  // This function always returns false.
 
 } // wxDB::DispAllErrors()
 
@@ -733,7 +865,7 @@ void wxDB::DispNextError(void)
 	if (silent)
 		return;
 
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 	// When run in console mode, use standard out to display errors.
 	cout << odbcErrMsg << endl;
 	cout << "Press any key to continue..."  << endl;
@@ -752,7 +884,8 @@ void wxDB::logError(char *errMsg, char *SQLState)
 
 	if (++pLast == DB_MAX_ERROR_HISTORY)
 	{
-		for (int 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]);
 		pLast--;
 	}
@@ -763,6 +896,9 @@ void wxDB::logError(char *errMsg, char *SQLState)
 		if ((dbStatus = TranslateSqlState(SQLState)) != DB_ERR_FUNCTION_SEQUENCE_ERROR)
 			DB_STATUS = dbStatus;
 
+	// Add the errmsg to the sql log
+	WriteSqlLog(errMsg);
+
 }  // wxDB::logError()
 
 /**********wxDB::TranslateSqlState()  **********/
@@ -994,40 +1130,24 @@ bool wxDB::Grant(int privileges, char *tableName, char *userList)
 	strcat(sqlStmt, " TO ");
 	strcat(sqlStmt, userList);
 
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
 	cout << endl << sqlStmt << endl;
 #endif
 
+	WriteSqlLog(sqlStmt);
+
 	return(ExecSql(sqlStmt));
 
 }  // wxDB::Grant()
 
 /********** wxDB::CreateView() **********/
-bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt)
+bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt, bool attemptDrop)
 {
 	char sqlStmt[DB_MAX_STATEMENT_LEN];
 
 	// Drop the view first
-	sprintf(sqlStmt, "DROP VIEW %s", viewName);
-	if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt, SQL_NTS) != SQL_SUCCESS)
-	{
-		// Check for sqlState = S0002, "Table or view not found".
-		// Ignore this error, bomb out on any other error.
-		// SQL Sybase Anwhere v5.5 returns an access violation error here
-		// (sqlstate = 42000) rather than an S0002.
-		GetNextError(henv, hdbc, hstmt);
-		if (strcmp(sqlState, "S0002") && strcmp(sqlState, "42000"))
-		{
-			DispNextError();
-			DispAllErrors(henv, hdbc, hstmt);
-			RollbackTrans();
-			return(FALSE);
-		}
-	}
-
-#ifdef _CONSOLE
-	cout << endl << sqlStmt << endl;
-#endif
+	if (attemptDrop && !DropView(viewName))
+		return FALSE;
 
 	// Build the create view statement
 	strcpy(sqlStmt, "CREATE VIEW ");
@@ -1043,7 +1163,9 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt)
 	strcat(sqlStmt, " AS ");
 	strcat(sqlStmt, pSqlStmt);
 
-#ifdef _CONSOLE
+	WriteSqlLog(sqlStmt);
+
+#ifdef DBDEBUG_CONSOLE
 	cout << sqlStmt << endl;
 #endif
 
@@ -1051,9 +1173,54 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt)
 
 }  // wxDB::CreateView()
 
+/********** wxDB::DropView()  **********/
+bool wxDB::DropView(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
+
+	char sqlStmt[DB_MAX_STATEMENT_LEN];
+
+	sprintf(sqlStmt, "DROP VIEW %s", viewName);
+
+	WriteSqlLog(sqlStmt);
+
+#ifdef DBDEBUG_CONSOLE
+	cout << endl << sqlStmt << endl;
+#endif
+
+	if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt, SQL_NTS) != SQL_SUCCESS)
+	{
+		// Check for "Base table not found" error and ignore
+		GetNextError(henv, hdbc, hstmt);
+		if (strcmp(sqlState,"S0002"))  // "Base table not found"
+		{
+			// Check for product specific error codes
+			if (!((Dbms() == dbmsSYBASE_ASA	&& !strcmp(sqlState,"42000"))))  // 5.x (and lower?)
+			{
+				DispNextError();
+				DispAllErrors(henv, hdbc, hstmt);
+				RollbackTrans();
+				return(FALSE);
+			}
+		}
+	}
+
+	// Commit the transaction
+	if (! CommitTrans())
+		return(FALSE);
+
+	return TRUE;
+
+}  // wxDB::DropView()
+
+
 /********** wxDB::ExecSql()  **********/
 bool wxDB::ExecSql(char *pSqlStmt)
 {
+	SQLFreeStmt(hstmt, SQL_CLOSE);
 	if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)
 		return(TRUE);
 	else
@@ -1064,6 +1231,35 @@ bool wxDB::ExecSql(char *pSqlStmt)
 
 }  // wxDB::ExecSql()
 
+/********** wxDB::GetNext()  **********/
+bool wxDB::GetNext(void)
+{
+	if (SQLFetch(hstmt) == SQL_SUCCESS)
+		return(TRUE);
+	else
+	{
+		DispAllErrors(henv, hdbc, hstmt);
+		return(FALSE);
+	}
+
+}  // wxDB::GetNext()
+
+/********** wxDB::GetData()  **********/
+bool wxDB::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned)
+{
+	assert(pData);
+	assert(cbReturned);
+
+	if (SQLGetData(hstmt, colNo, cType, pData, maxLen, cbReturned) == SQL_SUCCESS)
+		return(TRUE);
+	else
+	{
+		DispAllErrors(henv, hdbc, hstmt);
+		return(FALSE);
+	}
+
+}  // wxDB::GetData()
+
 /********** wxDB::GetColumns() **********/
 /*
  *		1) The last array element of the tableName[] argument must be zero (null).
@@ -1073,7 +1269,7 @@ bool wxDB::ExecSql(char *pSqlStmt)
  *			CALLING FUNCTION IS RESPONSIBLE FOR DELETING THE MEMORY RETURNED WHEN IT
  *			IS FINISHED WITH IT.  i.e.
  *
- *			CcolInf *colInf = pDb->GetColumns(tableList);
+ *			CcolInf *colInf = pDb->GetColumns(tableList, userID);
  *			if (colInf)
  *			{
  *				// Use the column inf
@@ -1082,7 +1278,7 @@ bool wxDB::ExecSql(char *pSqlStmt)
  *				delete [] colInf;
  *			}
  */
-CcolInf *wxDB::GetColumns(char *tableName[])
+CcolInf *wxDB::GetColumns(char *tableName[], char *userID)
 {
 	UINT noCols = 0;
 	UINT colNo = 0;
@@ -1092,11 +1288,32 @@ CcolInf *wxDB::GetColumns(char *tableName[])
 	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;
+
+	// 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)
+	{
+		int i = 0;
+		for (char *p = userID; *p; p++)
+			userIdUC[i++] = toupper(*p);
+		userIdUC[i] = 0;
+		userID = userIdUC;
+	}
 
 	// Pass 1 - Determine how many columns there are.
 	// Pass 2 - Allocate the CcolInf array and fill in
 	//				the array with the column information.
-	for (int pass = 1; pass <= 2; pass++)
+	int pass;
+	for (pass = 1; pass <= 2; pass++)
 	{
 		if (pass == 2)
 		{
@@ -1112,24 +1329,55 @@ CcolInf *wxDB::GetColumns(char *tableName[])
 			colInf[noCols].sqlDataType = 0;
 		}
 		// Loop through each table name
-		for (int tbl = 0; tableName[tbl]; tbl++)
+		int tbl;
+		for (tbl = 0; tableName[tbl]; 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]);
+
 			SQLFreeStmt(hstmt, SQL_CLOSE);
-			retcode = SQLColumns(hstmt,
-										NULL, 0,											// All qualifiers
-										NULL, 0,											// All owners
-										(UCHAR *) tableName[tbl], SQL_NTS,
-										NULL, 0);										// All columns
+
+			// 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,"") &&
+				 Dbms() != dbmsMY_SQL &&
+				 Dbms() != dbmsACCESS)
+			{
+				retcode = SQLColumns(hstmt,
+											NULL, 0,											// All qualifiers
+											(UCHAR *) userID, SQL_NTS,					// Owner
+											(UCHAR *) tableNameUC, SQL_NTS,
+											NULL, 0);										// All columns
+			}
+			else
+			{
+				retcode = SQLColumns(hstmt,
+											NULL, 0,											// All qualifiers
+											NULL, 0,											// Owner
+											(UCHAR *) tableNameUC, SQL_NTS,
+											NULL, 0);										// All columns
+			}
 			if (retcode != SQL_SUCCESS)
 			{  // Error occured, abort
 				DispAllErrors(henv, hdbc, hstmt);
 				if (colInf)
 					delete [] colInf;
+				SQLFreeStmt(hstmt, SQL_UNBIND);
+				SQLFreeStmt(hstmt, SQL_CLOSE);
 				return(0);
 			}
-			SQLBindCol(hstmt, 3, SQL_C_CHAR,   tblName,      DB_MAX_TABLE_NAME_LEN+1,  &cb);
-			SQLBindCol(hstmt, 4, SQL_C_CHAR,   colName,      DB_MAX_COLUMN_NAME_LEN+1, &cb);
-			SQLBindCol(hstmt, 5, SQL_C_SSHORT, &sqlDataType, 0,                        &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)
 			{
 				if (pass == 1)  // First pass, just add up the number of columns
@@ -1150,35 +1398,210 @@ CcolInf *wxDB::GetColumns(char *tableName[])
 				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::Catalog() **********/
+bool wxDB::Catalog(char *userID, char *fileName)
+{
+	assert(fileName && strlen(fileName));
+
+	RETCODE	retcode;
+	SDWORD	cb;
+	char		tblName[DB_MAX_TABLE_NAME_LEN+1];
+	char		tblNameSave[DB_MAX_TABLE_NAME_LEN+1];
+	char		colName[DB_MAX_COLUMN_NAME_LEN+1];
+	SWORD		sqlDataType;
+	char		typeName[30+1];
+	SWORD		precision, length;
+
+	FILE *fp = fopen(fileName,"wt");
+	if (fp == NULL)
+		return(FALSE);
+
+	SQLFreeStmt(hstmt, SQL_CLOSE);
+
+	if (!userID || !strlen(userID))
+		userID = uid;
+
+	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;
+	}
+
+	if (strcmp(userID,""))
+	{
+		retcode = SQLColumns(hstmt,
+									NULL, 0,											// All qualifiers
+									(UCHAR *) userID, SQL_NTS,					// User specified
+									NULL, 0,											// All tables
+									NULL, 0);										// All columns
+	}
+	else
+	{
+		retcode = SQLColumns(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);
+		fclose(fp);
+		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,"");
+	int cnt = 0;
+
+	while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
+	{
+		if (strcmp(tblName,tblNameSave))
+		{
+			if (cnt)
+				fputs("\n", fp);
+			fputs("================================ ", fp);
+			fputs("================================ ", fp);
+			fputs("===================== ", fp);
+			fputs("========= ", fp);
+			fputs("=========\n", fp);
+			sprintf(outStr, "%-32s %-32s %-21s %9s %9s\n",
+				"TABLE NAME", "COLUMN NAME", "DATA TYPE", "PRECISION", "LENGTH");
+			fputs(outStr, fp);
+			fputs("================================ ", fp);
+			fputs("================================ ", fp);
+			fputs("===================== ", fp);
+			fputs("========= ", fp);
+			fputs("=========\n", fp);
+			strcpy(tblNameSave,tblName);
+		}
+		sprintf(outStr, "%-32s %-32s (%04d)%-15s %9d %9d\n",
+			tblName, colName, sqlDataType, typeName, precision, length);
+		if (fputs(outStr, fp) == EOF)
+		{
+			SQLFreeStmt(hstmt, SQL_UNBIND);
+			SQLFreeStmt(hstmt, SQL_CLOSE);
+			fclose(fp);
+			return(FALSE);
+		}
+		cnt++;
+	}
+
+	if (retcode != SQL_NO_DATA_FOUND)
+		DispAllErrors(henv, hdbc, hstmt);
+
+	SQLFreeStmt(hstmt, SQL_UNBIND);
+	SQLFreeStmt(hstmt, SQL_CLOSE);
+
+	fclose(fp);
+	return(retcode == SQL_NO_DATA_FOUND);
+
+}  // 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)
+bool wxDB::TableExists(char *tableName, char *userID, char *tablePath)
 {
 	assert(tableName && strlen(tableName));
 
+	if (Dbms() == dbmsDBASE)
+	{
+		wxString dbName;
+		if (tablePath && strlen(tablePath))
+			dbName.sprintf("%s/%s.dbf",tablePath,tableName);
+		else
+			dbName.sprintf("%s.dbf",tableName);
+		bool glt;
+		glt = wxFileExists(dbName.GetData());
+		return glt;
+	}
+
+	if (!userID || !strlen(userID))
+		userID = uid;
+
+	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;
+	}
+
+	char tableNameUC[DB_MAX_TABLE_NAME_LEN+1];
+	// 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);
+
 	SQLFreeStmt(hstmt, SQL_CLOSE);
-	RETCODE retcode = SQLTables(hstmt,
-										 NULL, 0,										// All qualifiers
-										 NULL, 0,										// All owners
-										 (UCHAR FAR *)tableName, SQL_NTS,
-										 NULL, 0);										// All table types
+	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,"") &&
+		 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
+	}
+	else
+	{
+		retcode = SQLTables(hstmt,
+								  NULL, 0,										// All qualifiers
+								  NULL, 0,										// All owners
+								  (UCHAR FAR *)tableNameUC, SQL_NTS,
+								  NULL, 0);										// All table types
+	}
 	if (retcode != SQL_SUCCESS)
 		return(DispAllErrors(henv, hdbc, hstmt));
 
-	if (SQLFetch(hstmt) != SQL_SUCCESS)
+	retcode = SQLFetch(hstmt);
+	if (retcode  != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
 	{
 		SQLFreeStmt(hstmt, SQL_CLOSE);
 		return(DispAllErrors(henv, hdbc, hstmt));
@@ -1190,8 +1613,123 @@ bool wxDB::TableExists(char *tableName)
 }  // wxDB::TableExists()
 
 
+/********** wxDB::SqlLog() **********/
+bool wxDB::SqlLog(enum sqlLog state, char *filename, bool append)
+{
+	assert(state == sqlLogON  || state == sqlLogOFF);
+	assert(state == sqlLogOFF || filename);
+
+	if (state == sqlLogON)
+	{
+		if (fpSqlLog == 0)
+		{
+			fpSqlLog = fopen(filename, (append ? "at" : "wt"));
+			if (fpSqlLog == NULL)
+				return(FALSE);
+		}
+	}
+	else  // sqlLogOFF
+	{
+		if (fpSqlLog)
+		{
+			if (fclose(fpSqlLog))
+				return(FALSE);
+			fpSqlLog = 0;
+		}
+	}
+
+	sqlLogState = state;
+	return(TRUE);
+
+}  // wxDB::SqlLog()
+
+
+/********** wxDB::WriteSqlLog() **********/
+bool wxDB::WriteSqlLog(char *logMsg)
+{
+	assert(logMsg);
+
+	if (fpSqlLog == 0 || sqlLogState == sqlLogOFF)
+		return(FALSE);
+
+	if (fputs("\n",   fpSqlLog) == EOF) return(FALSE);
+	if (fputs(logMsg, fpSqlLog) == EOF) return(FALSE);
+	if (fputs("\n",   fpSqlLog) == EOF) return(FALSE);
+
+	return(TRUE);
+
+}  // wxDB::WriteSqlLog()
+
+
+/********** wxDB::Dbms() **********/
+/*
+ * Be aware that not all database engines use the exact same syntax, and not
+ * every ODBC compliant database is compliant to the same level of compliancy.
+ * Some manufacturers support the minimum Level 1 compliancy, and others up
+ * through Level 3.  Others support subsets of features for levels above 1.
+ *
+ * If you find an inconsistency between the wxDB class and a specific database
+ * engine, and an identifier to this section, and special handle the database in
+ * the area where behavior is non-conforming with the other databases.
+ *
+ *
+ * NOTES ABOUT ISSUES SPECIFIC TO EACH DATABASE ENGINE
+ * ---------------------------------------------------
+ *
+ * ORACLE
+ *		- Currently the only database supported by the class to support VIEWS
+ *
+ * DBASE
+ *		- Does not support the SQL_TIMESTAMP structure
+ *		- Supports only one cursor and one connect (apparently? with Microsoft driver only?)
+ *    - Does not automatically create the primary index if the 'keyField' param of SetColDef
+ *      is TRUE.  The user must create ALL indexes from their program.
+ *		- Table names can only be 8 characters long
+ *		- Column names can only be 10 characters long
+ *
+ * SYBASE (all)
+ *		- To lock a record during QUERY functions, the reserved word 'HOLDLOCK' must be added
+ *			after every table name involved in the query/join if that tables matching record(s)
+ *			are to be locked
+ *		- Ignores the keywords 'FOR UPDATE'.  Use the HOLDLOCK functionality described above
+ *
+ * SYBASE (Enterprise)
+ *		- If a column is part of the Primary Key, the column cannot be NULL
+ *
+ * MY_SQL
+ *		- If a column is part of the Primary Key, the column cannot be NULL
+ *		- Cannot support selecting for update [::CanSelectForUpdate()].  Always returns FALSE
+ *
+ * POSTGRES
+ *		- Does not support the keywords 'ASC' or 'DESC' as of release v6.5.0 
+ *
+ *
+ */
+DBMS wxDB::Dbms(void)
+{
+	if (!strnicmp(dbInf.dbmsName,"Oracle",6))
+		return(dbmsORACLE);
+	if (!stricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
+		return(dbmsSYBASE_ASA);
+	if (!stricmp(dbInf.dbmsName,"SQL Server"))  // Sybase Adaptive Server Enterprise
+		return(dbmsSYBASE_ASE);
+	if (!stricmp(dbInf.dbmsName,"Microsoft SQL Server"))
+		return(dbmsMS_SQL_SERVER);
+	if (!stricmp(dbInf.dbmsName,"MySQL"))
+		return(dbmsMY_SQL);
+	if (!stricmp(dbInf.dbmsName,"PostgreSQL"))  // v6.5.0
+		return(dbmsPOSTGRES);
+	if (!stricmp(dbInf.dbmsName,"ACCESS"))
+		return(dbmsACCESS);
+	if (!strnicmp(dbInf.dbmsName,"DBASE",5))
+		return(dbmsDBASE);
+	return(dbmsUNIDENTIFIED);
+
+}  // wxDB::Dbms()
+
+
 /********** GetDbConnection() **********/
-wxDB *GetDbConnection(DbStuff *pDbStuff)
+wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff)
 {
 	DbList *pList;
 
@@ -1234,7 +1772,10 @@ wxDB *GetDbConnection(DbStuff *pDbStuff)
 
 	// Connect to the datasource
 	if (pList->PtrDb->Open(pDbStuff->Dsn, pDbStuff->Uid, pDbStuff->AuthStr))
+	{
+		pList->PtrDb->SqlLog(SQLLOGstate,SQLLOGfn,TRUE);
 		return(pList->PtrDb);
+	}
 	else  // Unable to connect, destroy list item
 	{
 		if (pList->PtrPrev)
@@ -1251,7 +1792,7 @@ wxDB *GetDbConnection(DbStuff *pDbStuff)
 }  // GetDbConnection()
 
 /********** FreeDbConnection() **********/
-bool FreeDbConnection(wxDB *pDb)
+bool WXDLLEXPORT FreeDbConnection(wxDB *pDb)
 {
 	DbList *pList;
 
@@ -1268,7 +1809,7 @@ bool FreeDbConnection(wxDB *pDb)
 }  // FreeDbConnection()
 
 /********** CloseDbConnections() **********/
-void CloseDbConnections(void)
+void WXDLLEXPORT CloseDbConnections(void)
 {
 	DbList *pList, *pNext;
 	
@@ -1288,7 +1829,7 @@ void CloseDbConnections(void)
 }  // CloseDbConnections()
 
 /********** NumberDbConnectionsInUse() **********/
-int NumberDbConnectionsInUse(void)
+int WXDLLEXPORT NumberDbConnectionsInUse(void)
 {
 	DbList *pList;
 	int cnt = 0;
@@ -1304,6 +1845,26 @@ int NumberDbConnectionsInUse(void)
 
 }  // NumberDbConnectionsInUse()
 
+/********** SqlLog() **********/
+bool SqlLog(enum sqlLog state, char *filename)
+{
+	bool append = FALSE;
+	DbList *pList;
+
+	for (pList = PtrBegDbList; pList; pList = pList->PtrNext)
+	{
+		if (!pList->PtrDb->SqlLog(state,filename,append))
+			return(FALSE);
+		append = TRUE;
+	}
+
+	SQLLOGstate = state;
+	strcpy(SQLLOGfn,filename);
+
+	return(TRUE);
+
+}  // SqlLog()
+
 /********** GetDataSource() **********/
 bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
 						 UWORD direction)
@@ -1319,4 +1880,5 @@ bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDes
 }  // GetDataSource()
 
 #endif
-    // wxUSE_ODBC
+ // wxUSE_ODBC
+