X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47d67540a017101b3e46abe9ef0f55914d8de37e..48c8a76b8173aad9c89f9272449c0cccc4fbddaa:/src/common/db.cpp?ds=sidebyside
diff --git a/src/common/db.cpp b/src/common/db.cpp
index ea5baaed3c..4063cdc163 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,65 +33,118 @@
// SYNOPSIS STOP
*/
-#pragma implementation "db.h"
+#include "wx/wxprec.h"
-/*
-#ifdef _CONSOLE
- #include <iostream.h>
+// Use this line for wxWindows v1.x
+//#include "wx_ver.h"
+// Use this line for wxWindows v2.x
+#include "wx/version.h"
+
+#if wxMAJOR_VERSION == 2
+ #ifdef __GNUG__
+ #pragma implementation "db.h"
+ #endif
#endif
-*/
-#include "wx/wxprec.h"
+#ifdef DBDEBUG_CONSOLE
+ #include <iostream.h>
+#endif
#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"
+ #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
+# 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
#if wxUSE_ODBC
-#include <wx/db.h>
-
#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;
+
+#ifdef __WXDEBUG__
+ extern wxList TablesInUse;
+#endif
-DbList *PtrBegDbList = 0;
+// SQL Log defaults to be used by GetDbConnection
+enum sqlLog SQLLOGstate = sqlLogOFF;
+
+char SQLLOGfn[DB_PATH_MAX+1] = "sqllog.txt";
+
+// 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)
+wxDB::wxDB(HENV &aHenv, bool FwdOnlyCursors)
{
int i;
+
+ fpSqlLog = 0; // Sql Log file pointer
+ 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;
@@ -94,6 +155,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)
@@ -110,34 +172,43 @@ wxDB::wxDB(HENV &aHenv)
/********** wxDB::Open() **********/
bool wxDB::Open(char *Dsn, char *Uid, char *AuthStr)
{
- assert(Dsn);
+ assert(Dsn && wxStrlen(Dsn));
dsn = Dsn;
uid = Uid;
authStr = AuthStr;
-#ifndef FWD_ONLY_CURSORS
-
RETCODE retcode;
- // 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 _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
- 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;
@@ -233,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;
@@ -260,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;
@@ -301,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;
@@ -610,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
@@ -619,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;
@@ -645,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)
{
@@ -660,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);
+
+#ifdef __WXDEBUG__
+ 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++)
+ wxStrcpy(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);
@@ -697,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()
@@ -731,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;
@@ -741,208 +875,212 @@ 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;
if (++pLast == DB_MAX_ERROR_HISTORY)
{
- for (int i = 0; i < DB_MAX_ERROR_HISTORY; i++)
- strcpy(errorList[i], errorList[i+1]);
+ int i;
+ for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
+ 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;
+ // Add the errmsg to the sql log
+ WriteSqlLog(errMsg);
+
} // 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
@@ -951,97 +1089,83 @@ int wxDB::TranslateSqlState(char *SQLState)
} // 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 _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(const char *viewName, const char *colList, const 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 ");
- 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);
-#ifdef _CONSOLE
+#ifdef DBDEBUG_CONSOLE
cout << sqlStmt << endl;
#endif
@@ -1049,9 +1173,54 @@ bool wxDB::CreateView(char *viewName, char *colList, char *pSqlStmt)
} // wxDB::CreateView()
+/********** wxDB::DropView() **********/
+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
+
+ 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 (wxStrcmp(sqlState,"S0002")) // "Base table not found"
+ {
+ // Check for product specific error codes
+ if (!((Dbms() == dbmsSYBASE_ASA && !wxStrcmp(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)
+bool wxDB::ExecSql(const char *pSqlStmt)
{
+ SQLFreeStmt(hstmt, SQL_CLOSE);
if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS)
return(TRUE);
else
@@ -1062,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).
@@ -1071,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
@@ -1080,21 +1278,40 @@ bool wxDB::ExecSql(char *pSqlStmt)
* delete [] colInf;
* }
*/
-CcolInf *wxDB::GetColumns(char *tableName[])
+CcolInf *wxDB::GetColumns(char *tableName[], const char *userID)
{
- UINT noCols = 0;
- UINT colNo = 0;
+ 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;
+
+ 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)
+ 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 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)
{
@@ -1105,29 +1322,54 @@ CcolInf *wxDB::GetColumns(char *tableName[])
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
- for (int tbl = 0; tableName[tbl]; tbl++)
+ 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)
+ TableName = TableName.Upper();
+
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 (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_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
@@ -1136,8 +1378,8 @@ CcolInf *wxDB::GetColumns(char *tableName[])
{
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++;
}
@@ -1148,35 +1390,199 @@ 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(const char *userID, const char *fileName)
+{
+ assert(fileName && wxStrlen(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;
+
+ wxString UserID;
+
+ FILE *fp = fopen(fileName,"wt");
+ if (fp == NULL)
+ return(FALSE);
+
+ SQLFreeStmt(hstmt, SQL_CLOSE);
+
+ if (!userID || !wxStrlen(userID))
+ UserID = uid;
+ else
+ UserID = userID;
+
+ // Oracle user names may only be in uppercase, so force
+ // the name to uppercase
+ if (Dbms() == dbmsORACLE)
+ UserID = UserID.Upper();
+
+ if (wxStrcmp(UserID.GetData(),""))
+ {
+ retcode = SQLColumns(hstmt,
+ NULL, 0, // All qualifiers
+ (UCHAR *) UserID.GetData(), 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];
+ wxStrcpy(tblNameSave,"");
+ int cnt = 0;
+
+ while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
+ {
+ if (wxStrcmp(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);
+ wxStrcpy(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(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 (tablePath && wxStrlen(tablePath))
+ dbName.sprintf("%s/%s.dbf",tablePath,tableName);
+ else
+ dbName.sprintf("%s.dbf",tableName);
+
+ bool exists;
+ exists = wxFileExists(dbName.GetData());
+ return exists;
+ }
+
+ if (!userID || !wxStrlen(userID))
+ UserID = uid;
+ else
+ UserID = userID;
+
+ // Oracle user names may only be in uppercase, so force
+ // the name to uppercase
+ if (Dbms() == dbmsORACLE)
+ UserID = UserID.Upper();
+
+ 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);
- 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 (wxStrcmp(UserID,"") &&
+ Dbms() != dbmsMY_SQL &&
+ Dbms() != dbmsACCESS)
+ {
+ retcode = SQLTables(hstmt,
+ NULL, 0, // All qualifiers
+ (UCHAR *) UserID.GetData(), SQL_NTS, // All owners
+ (UCHAR FAR *)TableName.GetData(), SQL_NTS,
+ NULL, 0); // All table types
+ }
+ else
+ {
+ retcode = SQLTables(hstmt,
+ 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 (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));
@@ -1188,8 +1594,136 @@ bool wxDB::TableExists(char *tableName)
} // wxDB::TableExists()
+/********** wxDB::SqlLog() **********/
+bool wxDB::SqlLog(enum sqlLog state, const 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(const 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)
+{
+ wxChar baseName[25+1];
+
+ wxStrncpy(baseName,dbInf.dbmsName,25);
+ if (!wxStricmp(dbInf.dbmsName,"Adaptive Server Anywhere"))
+ return(dbmsSYBASE_ASA);
+ if (!wxStricmp(dbInf.dbmsName,"SQL Server")) // Sybase Adaptive Server
+ return(dbmsSYBASE_ASE);
+ if (!wxStricmp(dbInf.dbmsName,"Microsoft SQL Server"))
+ return(dbmsMS_SQL_SERVER);
+ if (!wxStricmp(dbInf.dbmsName,"MySQL"))
+ 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,"MySQL"))
+ return(dbmsMY_SQL);
+
+ baseName[5] = 0;
+ if (!wxStricmp(baseName,"DBASE"))
+ return(dbmsDBASE);
+
+ return(dbmsUNIDENTIFIED);
+} // wxDB::Dbms()
+
+
/********** GetDbConnection() **********/
-wxDB *GetDbConnection(DbStuff *pDbStuff)
+wxDB WXDLLEXPORT *GetDbConnection(DbStuff *pDbStuff, bool FwdOnlyCursors)
{
DbList *pList;
@@ -1199,7 +1733,7 @@ wxDB *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);
@@ -1227,12 +1761,15 @@ wxDB *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))
+ {
+ pList->PtrDb->SqlLog(SQLLOGstate,SQLLOGfn,TRUE);
return(pList->PtrDb);
+ }
else // Unable to connect, destroy list item
{
if (pList->PtrPrev)
@@ -1249,7 +1786,7 @@ wxDB *GetDbConnection(DbStuff *pDbStuff)
} // GetDbConnection()
/********** FreeDbConnection() **********/
-bool FreeDbConnection(wxDB *pDb)
+bool WXDLLEXPORT FreeDbConnection(wxDB *pDb)
{
DbList *pList;
@@ -1266,7 +1803,7 @@ bool FreeDbConnection(wxDB *pDb)
} // FreeDbConnection()
/********** CloseDbConnections() **********/
-void CloseDbConnections(void)
+void WXDLLEXPORT CloseDbConnections(void)
{
DbList *pList, *pNext;
@@ -1286,7 +1823,7 @@ void CloseDbConnections(void)
} // CloseDbConnections()
/********** NumberDbConnectionsInUse() **********/
-int NumberDbConnectionsInUse(void)
+int WXDLLEXPORT NumberDbConnectionsInUse(void)
{
DbList *pList;
int cnt = 0;
@@ -1302,8 +1839,28 @@ 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;
+ wxStrcpy(SQLLOGfn,filename);
+
+ 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;
@@ -1317,4 +1874,5 @@ bool GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDes
} // GetDataSource()
#endif
- // wxUSE_ODBC
+ // wxUSE_ODBC
+