X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eedb15434a5f0350f4e1a11faaab3391b900cb5b..a4353f07c6b37712634d4b2d86527b647a08044f:/src/common/db.cpp diff --git a/src/common/db.cpp b/src/common/db.cpp index 963f6e3497..085e6cad5c 100644 --- a/src/common/db.cpp +++ b/src/common/db.cpp @@ -34,53 +34,32 @@ // SYNOPSIS START // SYNOPSIS STOP */ +#ifdef __GNUG__ + #pragma implementation "db.h" +#endif #include "wx/wxprec.h" - -// Use this line for wxWindows v1.x -//#include "wx_ver.h" -// Use this line for wxWindows v2.x -#include "wx/version.h" - -#if wxMAJOR_VERSION == 2 - #ifdef __GNUG__ - #pragma implementation "db.h" - #endif +#ifdef __BORLANDC__ + #pragma hdrstop #endif #ifdef DBDEBUG_CONSOLE #include "wx/ioswrap.h" #endif -#ifdef __BORLANDC__ - #pragma hdrstop -#endif //__BORLANDC__ - -#if wxMAJOR_VERSION == 2 - #ifndef WX_PRECOMP - #include "wx/string.h" - #include "wx/object.h" - #include "wx/list.h" - #include "wx/utils.h" +#ifndef WX_PRECOMP + #include "wx/string.h" + #include "wx/object.h" + #include "wx/list.h" + #include "wx/utils.h" + #if wxUSE_GUI #include "wx/msgdlg.h" - #include "wx/log.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 + #include "wx/log.h" #endif +#include "wx/filefn.h" +#include "wx/wxchar.h" #if wxUSE_ODBC @@ -90,17 +69,13 @@ #include #include -#if wxMAJOR_VERSION == 1 - #include "db.h" -#elif wxMAJOR_VERSION == 2 - #include "wx/db.h" -#endif +#include "wx/db.h" WXDLLEXPORT_DATA(wxDbList*) PtrBegDbList = 0; -char const *SQL_LOG_FILENAME = "sqllog.txt"; -char const *SQL_CATALOG_FILENAME = "catalog.txt"; +wxChar const *SQL_LOG_FILENAME = wxT("sqllog.txt"); +wxChar const *SQL_CATALOG_FILENAME = wxT("catalog.txt"); #ifdef __WXDEBUG__ extern wxList TablesInUse; @@ -109,8 +84,6 @@ char const *SQL_CATALOG_FILENAME = "catalog.txt"; // SQL Log defaults to be used by GetDbConnection wxDbSqlLogState SQLLOGstate = sqlLogOFF; -//char SQLLOGfn[wxDB_PATH_MAX+1] = SQL_LOG_FILENAME; -//wxChar *SQLLOGfn = (wxChar*) SQL_LOG_FILENAME; static wxString SQLLOGfn = SQL_LOG_FILENAME; // The wxDb::errorList is copied to this variable when the wxDb object @@ -121,7 +94,8 @@ static wxString SQLLOGfn = SQL_LOG_FILENAME; // will overwrite the errors of the previously destroyed wxDb object in // this variable. NOTE: This occurs during a CLOSE, not a FREEing of the // connection -char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; +wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; + // This type defines the return row-struct form // SQLTablePrivileges, and is used by wxDB::TablePrivileges. @@ -137,104 +111,160 @@ typedef struct } wxDbTablePrivilegeInfo; -/********** wxDbColFor Constructor **********/ -wxDbColFor::wxDbColFor() +/********** wxDbConnectInf Constructor - form 1 **********/ +wxDbConnectInf::wxDbConnectInf() { - s_Field = ""; - int i; - for (i=0;i<7;i++) + Henv = 0; + freeHenvOnDestroy = FALSE; + + Initialize(); +} // Constructor + + +/********** wxDbConnectInf Constructor - form 2 **********/ +wxDbConnectInf::wxDbConnectInf(HENV henv, const wxString &dsn, const wxString &userID, + const wxString &password, const wxString &defaultDir, + const wxString &fileType, const wxString &description) +{ + Henv = 0; + freeHenvOnDestroy = FALSE; + + Initialize(); + + if (henv) + SetHenv(henv); + else + AllocHenv(); + + SetDsn(dsn); + SetUserID(userID); + SetPassword(password); + SetDescription(description); + SetFileType(fileType); + SetDefaultDir(defaultDir); +} // wxDbConnectInf Constructor + + +wxDbConnectInf::~wxDbConnectInf() +{ + if (freeHenvOnDestroy) { - s_Format[i] = ""; - s_Amount[i] = ""; - i_Amount[i] = 0; + FreeHenv(); } - i_Nation = 0; // 0=EU, 1=UK, 2=International, 3=US - i_dbDataType = 0; - i_sqlDataType = 0; - Format(1,DB_DATA_TYPE_VARCHAR,0,0,0); // the Function that does the work -} // wxDbColFor::wxDbColFor() +} // wxDbConnectInf Destructor -wxDbColFor::~wxDbColFor() + +/********** wxDbConnectInf::Initialize() **********/ +bool wxDbConnectInf::Initialize() { -} // wxDbColFor::~wxDbColFor() + freeHenvOnDestroy = FALSE; + if (freeHenvOnDestroy && Henv) + FreeHenv(); -/********** wxDbColInf Con / Destructor **********/ -wxDbColInf::wxDbColInf() + Henv = 0; + Dsn[0] = 0; + Uid[0] = 0; + AuthStr[0] = 0; + Description.Empty(); + FileType.Empty(); + DefaultDir.Empty(); + + return TRUE; +} // wxDbConnectInf::Initialize() + + +/********** wxDbConnectInf::AllocHenv() **********/ +bool wxDbConnectInf::AllocHenv() { - catalog[0] = 0; - schema[0] = 0; - tableName[0] = 0; - colName[0] = 0; - sqlDataType = 0; - typeName[0] = 0; - columnSize = 0; - bufferLength = 0; - decimalDigits = 0; - numPrecRadix = 0; - nullable = 0; - remarks[0] = 0; - dbDataType = 0; - PkCol = 0; - PkTableName[0] = 0; - FkCol = 0; - FkTableName[0] = 0; - pColFor = NULL; -} // wxDbColInf::wxDbColFor() + // This is here to help trap if you are getting a new henv + // without releasing an existing henv + wxASSERT(!Henv); + + // Initialize the ODBC Environment for Database Operations + if (SQLAllocEnv(&Henv) != SQL_SUCCESS) + { + wxLogDebug(wxT("A problem occured while trying to get a connection to the data source")); + return FALSE; + } + freeHenvOnDestroy = TRUE; -wxDbColInf::~wxDbColInf() + return TRUE; +} // wxDbConnectInf::AllocHenv() + + +void wxDbConnectInf::FreeHenv() { - if (pColFor) - delete pColFor; - pColFor = NULL; -} // wxDbColInf::~wxDbColInf() + wxASSERT(Henv); + if (Henv) + SQLFreeEnv(Henv); -/********** wxDbTableInf Constructor ********/ -wxDbTableInf::wxDbTableInf() + Henv = 0; + freeHenvOnDestroy = FALSE; + +} // wxDbConnectInf::FreeHenv() + + +void wxDbConnectInf::SetDsn(const wxString &dsn) { - tableName[0] = 0; - tableType[0] = 0; - tableRemarks[0] = 0; - numCols = 0; - pColInf = NULL; -} // wxDbTableInf::wxDbTableFor() + wxASSERT(dsn.Length() < sizeof(Dsn)); + wxStrcpy(Dsn,dsn); +} // wxDbConnectInf::SetDsn() -/********** wxDbTableInf Constructor ********/ -wxDbTableInf::~wxDbTableInf() + +void wxDbConnectInf::SetUserID(const wxString &uid) { - if (pColInf) - delete [] pColInf; - pColInf = NULL; -} // wxDbTableInf::~wxDbTableInf() + wxASSERT(uid.Length() < sizeof(Uid)); + wxStrcpy(Uid,uid); +} // wxDbConnectInf::SetUserID() -/********** wxDbInf Constructor *************/ -wxDbInf::wxDbInf() +void wxDbConnectInf::SetPassword(const wxString &password) { - catalog[0] = 0; - schema[0] = 0; - numTables = 0; - pTableInf = NULL; -} // wxDbInf::wxDbFor() + wxASSERT(password.Length() < sizeof(AuthStr)); + wxStrcpy(AuthStr,password); +} // wxDbConnectInf::SetPassword() -/********** wxDbInf Destructor *************/ -wxDbInf::~wxDbInf() + + +/********** wxDbColFor Constructor **********/ +wxDbColFor::wxDbColFor() { - if (pTableInf) - delete [] pTableInf; - pTableInf = NULL; -} // wxDbInf::~wxDbInf() + Initialize(); +} // wxDbColFor::wxDbColFor() -/*************************************************/ +wxDbColFor::~wxDbColFor() +{ +} // wxDbColFor::~wxDbColFor() -int wxDbColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnSize,short decimalDigits) +/********** wxDbColFor::Initialize() **********/ +void wxDbColFor::Initialize() +{ + s_Field.Empty(); + int i; + for (i=0; i<7; i++) + { + s_Format[i].Empty(); + s_Amount[i].Empty(); + i_Amount[i] = 0; + } + i_Nation = 0; // 0=EU, 1=UK, 2=International, 3=US + i_dbDataType = 0; + i_sqlDataType = 0; + Format(1,DB_DATA_TYPE_VARCHAR,0,0,0); // the Function that does the work +} // wxDbColFor::Initialize() + + +/********** wxDbColFor::Format() **********/ +int wxDbColFor::Format(int Nation, int dbDataType, SWORD sqlDataType, + short columnSize, short decimalDigits) { // ---------------------------------------------------------------------------------------- // -- 19991224 : mj10777 : Create @@ -248,16 +278,17 @@ int wxDbColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnS // ---------------------------------------------------------------------------------------- // There should also be a function to scan in a string to fill the variable // ---------------------------------------------------------------------------------------- - wxString Temp0; + wxString tempStr; i_Nation = Nation; // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US i_dbDataType = dbDataType; i_sqlDataType = sqlDataType; s_Field.Printf(wxT("%s%d"),s_Amount[1].c_str(),i_Amount[1]); // OK for VARCHAR, INTEGER and FLOAT + if (i_dbDataType == 0) // Filter unsupported dbDataTypes { if ((i_sqlDataType == SQL_VARCHAR) || (i_sqlDataType == SQL_LONGVARCHAR)) i_dbDataType = DB_DATA_TYPE_VARCHAR; - if (i_sqlDataType == SQL_C_DATE) + if ((i_sqlDataType == SQL_C_DATE) || (i_sqlDataType == SQL_C_TIMESTAMP)) i_dbDataType = DB_DATA_TYPE_DATE; if (i_sqlDataType == SQL_C_BIT) i_dbDataType = DB_DATA_TYPE_INTEGER; @@ -265,48 +296,55 @@ int wxDbColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnS i_dbDataType = DB_DATA_TYPE_VARCHAR; if (i_sqlDataType == SQL_REAL) i_dbDataType = DB_DATA_TYPE_FLOAT; + if (i_sqlDataType == SQL_C_BINARY) + i_dbDataType = DB_DATA_TYPE_BLOB; } + if ((i_dbDataType == DB_DATA_TYPE_INTEGER) && (i_sqlDataType == SQL_C_DOUBLE)) { // DBASE Numeric i_dbDataType = DB_DATA_TYPE_FLOAT; } - switch(i_dbDataType) // -A-> Still a lot of proper formatting to do + + switch(i_dbDataType) // TBD: Still a lot of proper formatting to do { case DB_DATA_TYPE_VARCHAR: - s_Field = "%s"; + s_Field = wxT("%s"); break; case DB_DATA_TYPE_INTEGER: - s_Field = "%d"; + s_Field = wxT("%d"); break; case DB_DATA_TYPE_FLOAT: if (decimalDigits == 0) decimalDigits = 2; - Temp0 = "%"; - Temp0.Printf(wxT("%s%d.%d"),Temp0.c_str(),columnSize,decimalDigits); - s_Field.Printf(wxT("%sf"),Temp0.c_str()); + tempStr = wxT("%"); + tempStr.Printf(wxT("%s%d.%d"),tempStr.c_str(),columnSize,decimalDigits); + s_Field.Printf(wxT("%sf"),tempStr.c_str()); break; case DB_DATA_TYPE_DATE: if (i_Nation == 0) // timestamp YYYY-MM-DD HH:MM:SS.SSS (tested for SYBASE) { - s_Field = "%04d-%02d-%02d %02d:%02d:%02d.%03d"; + s_Field = wxT("%04d-%02d-%02d %02d:%02d:%02d.%03d"); } if (i_Nation == 1) // European DD.MM.YYYY HH:MM:SS.SSS { - s_Field = "%02d.%02d.%04d %02d:%02d:%02d.%03d"; + s_Field = wxT("%02d.%02d.%04d %02d:%02d:%02d.%03d"); } if (i_Nation == 2) // UK DD/MM/YYYY HH:MM:SS.SSS { - s_Field = "%02d/%02d/%04d %02d:%02d:%02d.%03d"; + s_Field = wxT("%02d/%02d/%04d %02d:%02d:%02d.%03d"); } if (i_Nation == 3) // International YYYY-MM-DD HH:MM:SS.SSS { - s_Field = "%04d-%02d-%02d %02d:%02d:%02d.%03d"; + s_Field = wxT("%04d-%02d-%02d %02d:%02d:%02d.%03d"); } if (i_Nation == 4) // US MM/DD/YYYY HH:MM:SS.SSS { - s_Field = "%02d/%02d/%04d %02d:%02d:%02d.%03d"; + s_Field = wxT("%02d/%02d/%04d %02d:%02d:%02d.%03d"); } break; + case DB_DATA_TYPE_BLOB: + s_Field.Printf(wxT("Unable to format(%d)-SQL(%d)"),dbDataType,sqlDataType); // + break; default: s_Field.Printf(wxT("Unknown Format(%d)-SQL(%d)"),dbDataType,sqlDataType); // break; @@ -315,16 +353,130 @@ int wxDbColFor::Format(int Nation,int dbDataType,SWORD sqlDataType,short columnS } // wxDbColFor::Format() -/********** wxDb Constructors **********/ -wxDb::wxDb(HENV &aHenv, bool FwdOnlyCursors) + +/********** wxDbColInf Constructor **********/ +wxDbColInf::wxDbColInf() +{ + Initialize(); +} // wxDbColInf::wxDbColInf() + + +/********** wxDbColInf Destructor ********/ +wxDbColInf::~wxDbColInf() +{ + if (pColFor) + delete pColFor; + pColFor = NULL; +} // wxDbColInf::~wxDbColInf() + + +bool wxDbColInf::Initialize() +{ + catalog[0] = 0; + schema[0] = 0; + tableName[0] = 0; + colName[0] = 0; + sqlDataType = 0; + typeName[0] = 0; + columnSize = 0; + bufferLength = 0; + decimalDigits = 0; + numPrecRadix = 0; + nullable = 0; + remarks[0] = 0; + dbDataType = 0; + PkCol = 0; + PkTableName[0] = 0; + FkCol = 0; + FkTableName[0] = 0; + pColFor = NULL; + + return TRUE; +} // wxDbColInf::Initialize() + + +/********** wxDbTableInf Constructor ********/ +wxDbTableInf::wxDbTableInf() +{ + Initialize(); +} // wxDbTableInf::wxDbTableInf() + + +/********** wxDbTableInf Constructor ********/ +wxDbTableInf::~wxDbTableInf() +{ + if (pColInf) + delete [] pColInf; + pColInf = NULL; +} // wxDbTableInf::~wxDbTableInf() + + +bool wxDbTableInf::Initialize() +{ + tableName[0] = 0; + tableType[0] = 0; + tableRemarks[0] = 0; + numCols = 0; + pColInf = NULL; + + return TRUE; +} // wxDbTableInf::Initialize() + + +/********** wxDbInf Constructor *************/ +wxDbInf::wxDbInf() +{ + Initialize(); +} // wxDbInf::wxDbInf() + + +/********** wxDbInf Destructor *************/ +wxDbInf::~wxDbInf() +{ + if (pTableInf) + delete [] pTableInf; + pTableInf = NULL; +} // wxDbInf::~wxDbInf() + + +/********** wxDbInf::Initialize() *************/ +bool wxDbInf::Initialize() +{ + catalog[0] = 0; + schema[0] = 0; + numTables = 0; + pTableInf = NULL; + + return TRUE; +} // wxDbInf::Initialize() + + +/********** wxDb Constructor **********/ +wxDb::wxDb(const HENV &aHenv, bool FwdOnlyCursors) { // Copy the HENV into the db class henv = aHenv; fwdOnlyCursors = FwdOnlyCursors; + initialize(); } // wxDb::wxDb() +/********** wxDb Destructor **********/ +wxDb::~wxDb() +{ + wxASSERT_MSG(!IsCached(),wxT("Cached connections must not be manually deleted, use\nwxDbFreeConnection() or wxDbCloseConnections().")); + + if (IsOpen()) + { + Close(); + } +} // wxDb destructor + + + +/********** PRIVATE! wxDb::initialize PRIVATE! **********/ +/********** wxDb::initialize() **********/ void wxDb::initialize() /* * Private member function that sets all wxDb member variables to @@ -338,37 +490,43 @@ void wxDb::initialize() nTables = 0; dbmsType = dbmsUNIDENTIFIED; - wxStrcpy(sqlState,wxT("")); - wxStrcpy(errorMsg,wxT("")); + wxStrcpy(sqlState,wxEmptyString); + wxStrcpy(errorMsg,wxEmptyString); nativeError = cbErrorMsg = 0; for (i = 0; i < DB_MAX_ERROR_HISTORY; i++) - wxStrcpy(errorList[i], wxT("")); + wxStrcpy(errorList[i], wxEmptyString); // Init typeInf structures - wxStrcpy(typeInfVarchar.TypeName,wxT("")); + typeInfVarchar.TypeName.Empty(); typeInfVarchar.FsqlType = 0; typeInfVarchar.Precision = 0; typeInfVarchar.CaseSensitive = 0; typeInfVarchar.MaximumScale = 0; - wxStrcpy(typeInfInteger.TypeName,wxT("")); + typeInfInteger.TypeName.Empty(); typeInfInteger.FsqlType = 0; typeInfInteger.Precision = 0; typeInfInteger.CaseSensitive = 0; typeInfInteger.MaximumScale = 0; - wxStrcpy(typeInfFloat.TypeName,wxT("")); + typeInfFloat.TypeName.Empty(); typeInfFloat.FsqlType = 0; typeInfFloat.Precision = 0; typeInfFloat.CaseSensitive = 0; typeInfFloat.MaximumScale = 0; - wxStrcpy(typeInfDate.TypeName,wxT("")); + typeInfDate.TypeName.Empty(); typeInfDate.FsqlType = 0; typeInfDate.Precision = 0; typeInfDate.CaseSensitive = 0; typeInfDate.MaximumScale = 0; + typeInfBlob.TypeName.Empty(); + typeInfBlob.FsqlType = 0; + typeInfBlob.Precision = 0; + typeInfBlob.CaseSensitive = 0; + typeInfBlob.MaximumScale = 0; + // Error reporting is turned OFF by default silent = TRUE; @@ -381,13 +539,46 @@ void wxDb::initialize() // Mark database as not open as of yet dbIsOpen = FALSE; + dbIsCached = FALSE; } // wxDb::initialize() +/********** PRIVATE! wxDb::convertUserID PRIVATE! **********/ +// +// NOTE: Return value from this function MUST be copied +// immediately, as the value is not good after +// this function has left scope. +// +const wxChar *wxDb::convertUserID(const wxChar *userID, wxString &UserID) +{ + if (userID) + { + if (!wxStrlen(userID)) + UserID = uid; + else + UserID = userID; + } + else + UserID.Empty(); + + // dBase does not use user names, and some drivers fail if you try to pass one + if ( Dbms() == dbmsDBASE + || Dbms() == dbmsXBASE_SEQUITER ) + UserID.Empty(); + + // Oracle user names may only be in uppercase, so force + // the name to uppercase + if (Dbms() == dbmsORACLE) + UserID = UserID.Upper(); + + return UserID.c_str(); +} // wxDb::convertUserID() + + /********** wxDb::Open() **********/ -bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) +bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr, bool failOnDataTypeUnsupported) { - assert(Dsn && wxStrlen(Dsn)); + wxASSERT(Dsn.Length()); dsn = Dsn; uid = Uid; authStr = AuthStr; @@ -402,36 +593,27 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) #ifdef DBDEBUG_CONSOLE if (retcode == SQL_SUCCESS) - cout << "SQLSetConnectOption(CURSOR_LIB) successful" << endl; + cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl; else - cout << "SQLSetConnectOption(CURSOR_LIB) failed" << endl; + cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl; #endif } // Connect to the data source - retcode = SQLConnect(hdbc, (UCHAR FAR *) dsn, SQL_NTS, - (UCHAR FAR *) uid, SQL_NTS, - (UCHAR FAR *) authStr,SQL_NTS); + retcode = SQLConnect(hdbc, (UCHAR FAR *) dsn.c_str(), SQL_NTS, + (UCHAR FAR *) uid.c_str(), SQL_NTS, + (UCHAR FAR *) authStr.c_str(), SQL_NTS); -/* - if (retcode == SQL_SUCCESS_WITH_INFO) - DispAllErrors(henv, hdbc); - else if (retcode != SQL_SUCCESS) - return(DispAllErrors(henv, hdbc)); - - if (retcode == SQL_ERROR) - return(DispAllErrors(henv, hdbc)); -*/ - if ((retcode != SQL_SUCCESS) && + if ((retcode != SQL_SUCCESS) && (retcode != SQL_SUCCESS_WITH_INFO)) - return(DispAllErrors(henv, hdbc)); + 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) ""); + SQLSetConnectOption(hdbc, 1041, (UDWORD) wxEmptyString); + SQLSetConnectOption(hdbc, 1042, (UDWORD) wxEmptyString); */ // Mark database as open @@ -452,7 +634,7 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) // Query the data source regarding data type information // - // The way I determined which SQL data types to use was by calling SQLGetInfo + // The way it was determined which SQL data types to use was by calling SQLGetInfo // for all of the possible SQL data types to see which ones were supported. If // a type is not supported, the SQLFetch() that's called from getDataTypeInfo() // fails with SQL_NO_DATA_FOUND. This is ugly because I'm sure the three SQL data @@ -501,12 +683,14 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) // Float if (!getDataTypeInfo(SQL_DOUBLE,typeInfFloat)) - if (!getDataTypeInfo(SQL_REAL,typeInfFloat)) if (!getDataTypeInfo(SQL_FLOAT,typeInfFloat)) if (!getDataTypeInfo(SQL_DECIMAL,typeInfFloat)) if (!getDataTypeInfo(SQL_NUMERIC,typeInfFloat)) - return(FALSE); + { + if (failOnDataTypeUnsupported) + return(FALSE); + } else typeInfFloat.FsqlType = SQL_NUMERIC; else @@ -524,7 +708,10 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) // If SQL_INTEGER is not supported, use the floating point // data type to store integers as well as floats if (!getDataTypeInfo(typeInfFloat.FsqlType, typeInfInteger)) - return(FALSE); + { + if (failOnDataTypeUnsupported) + return(FALSE); + } else typeInfInteger.FsqlType = typeInfFloat.FsqlType; } @@ -532,26 +719,50 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) typeInfInteger.FsqlType = SQL_INTEGER; // Date/Time - if (Dbms() != dbmsDBASE) + if (!getDataTypeInfo(SQL_TIMESTAMP,typeInfDate)) { - if (! getDataTypeInfo(SQL_TIMESTAMP,typeInfDate)) - return(FALSE); + if (!getDataTypeInfo(SQL_DATE,typeInfDate)) + { +#ifdef SQL_DATETIME + if (getDataTypeInfo(SQL_DATETIME,typeInfDate)) + { + typeInfDate.FsqlType = SQL_TIME; + } + else +#endif // SQL_DATETIME defined + { + if (failOnDataTypeUnsupported) + return(FALSE); + } + } else - typeInfDate.FsqlType = SQL_TIMESTAMP; + typeInfDate.FsqlType = SQL_DATE; } else + typeInfDate.FsqlType = SQL_TIMESTAMP; + + + if (!getDataTypeInfo(SQL_LONGVARBINARY, typeInfBlob)) { - if (!getDataTypeInfo(SQL_DATE,typeInfDate)) - return(FALSE); + if (!getDataTypeInfo(SQL_VARBINARY,typeInfBlob)) + { + if (failOnDataTypeUnsupported) + return(FALSE); + } else - typeInfDate.FsqlType = SQL_DATE; + typeInfBlob.FsqlType = SQL_VARBINARY; } + else + typeInfBlob.FsqlType = SQL_LONGVARBINARY; + +//typeInfBlob.TypeName = "BLOB"; #ifdef DBDEBUG_CONSOLE - cout << "VARCHAR DATA TYPE: " << typeInfVarchar.TypeName << endl; - cout << "INTEGER DATA TYPE: " << typeInfInteger.TypeName << endl; - cout << "FLOAT DATA TYPE: " << typeInfFloat.TypeName << endl; - cout << "DATE DATA TYPE: " << typeInfDate.TypeName << endl; + cout << wxT("VARCHAR DATA TYPE: ") << typeInfVarchar.TypeName << endl; + cout << wxT("INTEGER DATA TYPE: ") << typeInfInteger.TypeName << endl; + cout << wxT("FLOAT DATA TYPE: ") << typeInfFloat.TypeName << endl; + cout << wxT("DATE DATA TYPE: ") << typeInfDate.TypeName << endl; + cout << wxT("BLOB DATA TYPE: ") << typeInfBlob.TypeName << endl; cout << endl; #endif @@ -561,11 +772,18 @@ bool wxDb::Open(char *Dsn, char *Uid, char *AuthStr) } // wxDb::Open() +bool wxDb::Open(wxDbConnectInf *dbConnectInf) +{ + return Open(dbConnectInf->GetDsn(), dbConnectInf->GetUserID(), + dbConnectInf->GetPassword()); +} // wxDb::Open() + + bool wxDb::Open(wxDb *copyDb) { - dsn = (char *)copyDb->GetDatasourceName(); - uid = (char *)copyDb->GetUsername(); - authStr = (char *)copyDb->GetPassword(); + dsn = copyDb->GetDatasourceName(); + uid = copyDb->GetUsername(); + authStr = copyDb->GetPassword(); RETCODE retcode; @@ -577,26 +795,26 @@ bool wxDb::Open(wxDb *copyDb) #ifdef DBDEBUG_CONSOLE if (retcode == SQL_SUCCESS) - cout << "SQLSetConnectOption(CURSOR_LIB) successful" << endl; + cout << wxT("SQLSetConnectOption(CURSOR_LIB) successful") << endl; else - cout << "SQLSetConnectOption(CURSOR_LIB) failed" << endl; + cout << wxT("SQLSetConnectOption(CURSOR_LIB) failed") << endl; #endif } // Connect to the data source - retcode = SQLConnect(hdbc, (UCHAR FAR *) dsn, SQL_NTS, - (UCHAR FAR *) uid, SQL_NTS, - (UCHAR FAR *) authStr, SQL_NTS); + retcode = SQLConnect(hdbc, (UCHAR FAR *) dsn.c_str(), SQL_NTS, + (UCHAR FAR *) uid.c_str(), SQL_NTS, + (UCHAR FAR *) authStr.c_str(), SQL_NTS); - if (retcode == SQL_ERROR) - return(DispAllErrors(henv, hdbc)); + if (retcode == SQL_ERROR) + return(DispAllErrors(henv, hdbc)); /* If using Intersolv branded ODBC drivers, this is the place where you would substitute your branded driver license information - SQLSetConnectOption(hdbc, 1041, (UDWORD) ""); - SQLSetConnectOption(hdbc, 1042, (UDWORD) ""); + SQLSetConnectOption(hdbc, 1041, (UDWORD) wxEmptyString); + SQLSetConnectOption(hdbc, 1042, (UDWORD) wxEmptyString); */ // Mark database as open @@ -645,38 +863,46 @@ bool wxDb::Open(wxDb *copyDb) dbInf.loginTimeout = copyDb->dbInf.loginTimeout; // VARCHAR = Variable length character string - typeInfVarchar.FsqlType = copyDb->typeInfVarchar.FsqlType; - wxStrcpy(typeInfVarchar.TypeName, copyDb->typeInfVarchar.TypeName); + typeInfVarchar.FsqlType = copyDb->typeInfVarchar.FsqlType; + typeInfVarchar.TypeName = copyDb->typeInfVarchar.TypeName; typeInfVarchar.Precision = copyDb->typeInfVarchar.Precision; typeInfVarchar.CaseSensitive = copyDb->typeInfVarchar.CaseSensitive; typeInfVarchar.MaximumScale = copyDb->typeInfVarchar.MaximumScale; // Float - typeInfFloat.FsqlType = copyDb->typeInfFloat.FsqlType; - wxStrcpy(typeInfFloat.TypeName, copyDb->typeInfFloat.TypeName); + typeInfFloat.FsqlType = copyDb->typeInfFloat.FsqlType; + typeInfFloat.TypeName = copyDb->typeInfFloat.TypeName; typeInfFloat.Precision = copyDb->typeInfFloat.Precision; typeInfFloat.CaseSensitive = copyDb->typeInfFloat.CaseSensitive; typeInfFloat.MaximumScale = copyDb->typeInfFloat.MaximumScale; // Integer - typeInfInteger.FsqlType = copyDb->typeInfInteger.FsqlType; - wxStrcpy(typeInfInteger.TypeName, copyDb->typeInfInteger.TypeName); + typeInfInteger.FsqlType = copyDb->typeInfInteger.FsqlType; + typeInfInteger.TypeName = copyDb->typeInfInteger.TypeName; typeInfInteger.Precision = copyDb->typeInfInteger.Precision; typeInfInteger.CaseSensitive = copyDb->typeInfInteger.CaseSensitive; typeInfInteger.MaximumScale = copyDb->typeInfInteger.MaximumScale; // Date/Time - typeInfDate.FsqlType = copyDb->typeInfDate.FsqlType; - wxStrcpy(typeInfDate.TypeName, copyDb->typeInfDate.TypeName); + typeInfDate.FsqlType = copyDb->typeInfDate.FsqlType; + typeInfDate.TypeName = copyDb->typeInfDate.TypeName; typeInfDate.Precision = copyDb->typeInfDate.Precision; typeInfDate.CaseSensitive = copyDb->typeInfDate.CaseSensitive; typeInfDate.MaximumScale = copyDb->typeInfDate.MaximumScale; + // Blob + typeInfBlob.FsqlType = copyDb->typeInfBlob.FsqlType; + typeInfBlob.TypeName = copyDb->typeInfBlob.TypeName; + typeInfBlob.Precision = copyDb->typeInfBlob.Precision; + typeInfBlob.CaseSensitive = copyDb->typeInfBlob.CaseSensitive; + typeInfBlob.MaximumScale = copyDb->typeInfBlob.MaximumScale; + #ifdef DBDEBUG_CONSOLE - cout << "VARCHAR DATA TYPE: " << typeInfVarchar.TypeName << endl; - cout << "INTEGER DATA TYPE: " << typeInfInteger.TypeName << endl; - cout << "FLOAT DATA TYPE: " << typeInfFloat.TypeName << endl; - cout << "DATE DATA TYPE: " << typeInfDate.TypeName << endl; + cout << wxT("VARCHAR DATA TYPE: ") << typeInfVarchar.TypeName << endl; + cout << wxT("INTEGER DATA TYPE: ") << typeInfInteger.TypeName << endl; + cout << wxT("FLOAT DATA TYPE: ") << typeInfFloat.TypeName << endl; + cout << wxT("DATE DATA TYPE: ") << typeInfDate.TypeName << endl; + cout << wxT("BLOB DATA TYPE: ") << typeInfBlob.TypeName << endl; cout << endl; #endif @@ -700,7 +926,7 @@ bool wxDb::setConnectionOptions(void) SQLSetConnectOption(hdbc, SQL_AUTOCOMMIT, SQL_AUTOCOMMIT_OFF); SQLSetConnectOption(hdbc, SQL_OPT_TRACE, SQL_OPT_TRACE_OFF); -// SQLSetConnectOption(hdbc, SQL_TXN_ISOLATION, SQL_TXN_READ_COMMITTED); // No dirty reads +// SQLSetConnectOption(hdbc, SQL_TXN_ISOLATION, SQL_TXN_READ_COMMITTED); // No dirty reads // By default, MS Sql Server closes cursors on commit and rollback. The following // call to SQLSetConnectOption() is needed to force SQL Server to preserve cursors @@ -717,32 +943,32 @@ bool wxDb::setConnectionOptions(void) // Display the connection options to verify them #ifdef DBDEBUG_CONSOLE long l; - cout << "****** CONNECTION OPTIONS ******" << endl; + cout << wxT("****** CONNECTION OPTIONS ******") << endl; if (SQLGetConnectOption(hdbc, SQL_AUTOCOMMIT, &l) != SQL_SUCCESS) return(DispAllErrors(henv, hdbc)); - cout << "AUTOCOMMIT: " << (l == SQL_AUTOCOMMIT_OFF ? "OFF" : "ON") << endl; + cout << wxT("AUTOCOMMIT: ") << (l == SQL_AUTOCOMMIT_OFF ? "OFF" : "ON") << endl; if (SQLGetConnectOption(hdbc, SQL_ODBC_CURSORS, &l) != SQL_SUCCESS) return(DispAllErrors(henv, hdbc)); - cout << "ODBC CURSORS: "; + cout << wxT("ODBC CURSORS: "); switch(l) { case(SQL_CUR_USE_IF_NEEDED): - cout << "SQL_CUR_USE_IF_NEEDED"; + cout << wxT("SQL_CUR_USE_IF_NEEDED"); break; case(SQL_CUR_USE_ODBC): - cout << "SQL_CUR_USE_ODBC"; + cout << wxT("SQL_CUR_USE_ODBC"); break; case(SQL_CUR_USE_DRIVER): - cout << "SQL_CUR_USE_DRIVER"; + cout << wxT("SQL_CUR_USE_DRIVER"); break; } cout << endl; if (SQLGetConnectOption(hdbc, SQL_OPT_TRACE, &l) != SQL_SUCCESS) return(DispAllErrors(henv, hdbc)); - cout << "TRACING: " << (l == SQL_OPT_TRACE_OFF ? "OFF" : "ON") << endl; + cout << wxT("TRACING: ") << (l == SQL_OPT_TRACE_OFF ? wxT("OFF") : wxT("ON")) << endl; cout << endl; #endif @@ -863,194 +1089,194 @@ bool wxDb::getDbInfo(void) return(DispAllErrors(henv, hdbc)); #ifdef DBDEBUG_CONSOLE - cout << "***** DATA SOURCE INFORMATION *****" << endl; - cout << "SERVER Name: " << dbInf.serverName << endl; - cout << "DBMS Name: " << dbInf.dbmsName << "; DBMS Version: " << dbInf.dbmsVer << endl; - cout << "ODBC Version: " << dbInf.odbcVer << "; Driver Version: " << dbInf.driverVer << endl; + cout << wxT("***** DATA SOURCE INFORMATION *****") << endl; + cout << wxT(wxT("SERVER Name: ") << dbInf.serverName << endl; + cout << wxT("DBMS Name: ") << dbInf.dbmsName << wxT("; DBMS Version: ") << dbInf.dbmsVer << endl; + cout << wxT("ODBC Version: ") << dbInf.odbcVer << wxT("; Driver Version: ") << dbInf.driverVer << endl; - cout << "API Conf. Level: "; + cout << wxT("API Conf. Level: "); switch(dbInf.apiConfLvl) { - case SQL_OAC_NONE: cout << "None"; break; - case SQL_OAC_LEVEL1: cout << "Level 1"; break; - case SQL_OAC_LEVEL2: cout << "Level 2"; break; + case SQL_OAC_NONE: cout << wxT("None"); break; + case SQL_OAC_LEVEL1: cout << wxT("Level 1"); break; + case SQL_OAC_LEVEL2: cout << wxT("Level 2"); break; } cout << endl; - cout << "SAG CLI Conf. Level: "; + cout << wxT("SAG CLI Conf. Level: "); switch(dbInf.cliConfLvl) { - case SQL_OSCC_NOT_COMPLIANT: cout << "Not Compliant"; break; - case SQL_OSCC_COMPLIANT: cout << "Compliant"; break; + case SQL_OSCC_NOT_COMPLIANT: cout << wxT("Not Compliant"); break; + case SQL_OSCC_COMPLIANT: cout << wxT("Compliant"); break; } cout << endl; - cout << "SQL Conf. Level: "; + cout << wxT("SQL Conf. Level: "); switch(dbInf.sqlConfLvl) { - case SQL_OSC_MINIMUM: cout << "Minimum Grammar"; break; - case SQL_OSC_CORE: cout << "Core Grammar"; break; - case SQL_OSC_EXTENDED: cout << "Extended Grammar"; break; + case SQL_OSC_MINIMUM: cout << wxT("Minimum Grammar"); break; + case SQL_OSC_CORE: cout << wxT("Core Grammar"); break; + case SQL_OSC_EXTENDED: cout << wxT("Extended Grammar"); break; } cout << endl; - cout << "Max. Connections: " << dbInf.maxConnections << endl; - cout << "Outer Joins: " << dbInf.outerJoins << endl; - cout << "Support for Procedures: " << dbInf.procedureSupport << endl; - cout << "All tables accessible : " << dbInf.accessibleTables << endl; - cout << "Cursor COMMIT Behavior: "; + cout << wxT("Max. Connections: ") << dbInf.maxConnections << endl; + cout << wxT("Outer Joins: ") << dbInf.outerJoins << endl; + cout << wxT("Support for Procedures: ") << dbInf.procedureSupport << endl; + cout << wxT("All tables accessible : ") << dbInf.accessibleTables << endl; + cout << wxT("Cursor COMMIT Behavior: "); switch(dbInf.cursorCommitBehavior) { - case SQL_CB_DELETE: cout << "Delete cursors"; break; - case SQL_CB_CLOSE: cout << "Close cursors"; break; - case SQL_CB_PRESERVE: cout << "Preserve cursors"; break; + case SQL_CB_DELETE: cout << wxT("Delete cursors"); break; + case SQL_CB_CLOSE: cout << wxT("Close cursors"); break; + case SQL_CB_PRESERVE: cout << wxT("Preserve cursors"); break; } cout << endl; - cout << "Cursor ROLLBACK Behavior: "; + cout << wxT("Cursor ROLLBACK Behavior: "); switch(dbInf.cursorRollbackBehavior) { - case SQL_CB_DELETE: cout << "Delete cursors"; break; - case SQL_CB_CLOSE: cout << "Close cursors"; break; - case SQL_CB_PRESERVE: cout << "Preserve cursors"; break; + case SQL_CB_DELETE: cout << wxT("Delete cursors"); break; + case SQL_CB_CLOSE: cout << wxT("Close cursors"); break; + case SQL_CB_PRESERVE: cout << wxT("Preserve cursors"); break; } cout << endl; - cout << "Support NOT NULL clause: "; + cout << wxT("Support NOT NULL clause: "); switch(dbInf.supportNotNullClause) { - case SQL_NNC_NULL: cout << "No"; break; - case SQL_NNC_NON_NULL: cout << "Yes"; break; + case SQL_NNC_NULL: cout << wxT("No"); break; + case SQL_NNC_NON_NULL: cout << wxT("Yes"); break; } cout << endl; - cout << "Support IEF (Ref. Integrity): " << dbInf.supportIEF << endl; - cout << "Login Timeout: " << dbInf.loginTimeout << endl; + cout << wxT("Support IEF (Ref. Integrity): ") << dbInf.supportIEF << endl; + cout << wxT("Login Timeout: ") << dbInf.loginTimeout << endl; - cout << endl << endl << "more ..." << endl; + cout << endl << endl << wxT("more ...") << endl; getchar(); - cout << "Default Transaction Isolation: "; + cout << wxT("Default Transaction Isolation: "; switch(dbInf.txnIsolation) { - case SQL_TXN_READ_UNCOMMITTED: cout << "Read Uncommitted"; break; - case SQL_TXN_READ_COMMITTED: cout << "Read Committed"; break; - case SQL_TXN_REPEATABLE_READ: cout << "Repeatable Read"; break; - case SQL_TXN_SERIALIZABLE: cout << "Serializable"; break; + case SQL_TXN_READ_UNCOMMITTED: cout << wxT("Read Uncommitted"); break; + case SQL_TXN_READ_COMMITTED: cout << wxT("Read Committed"); break; + case SQL_TXN_REPEATABLE_READ: cout << wxT("Repeatable Read"); break; + case SQL_TXN_SERIALIZABLE: cout << wxT("Serializable"); break; #ifdef ODBC_V20 - case SQL_TXN_VERSIONING: cout << "Versioning"; break; + case SQL_TXN_VERSIONING: cout << wxT("Versioning"); break; #endif } cout << endl; - cout << "Transaction Isolation Options: "; + cout << wxT("Transaction Isolation Options: "); if (dbInf.txnIsolationOptions & SQL_TXN_READ_UNCOMMITTED) - cout << "Read Uncommitted, "; + cout << wxT("Read Uncommitted, "); if (dbInf.txnIsolationOptions & SQL_TXN_READ_COMMITTED) - cout << "Read Committed, "; + cout << wxT("Read Committed, "); if (dbInf.txnIsolationOptions & SQL_TXN_REPEATABLE_READ) - cout << "Repeatable Read, "; + cout << wxT("Repeatable Read, "); if (dbInf.txnIsolationOptions & SQL_TXN_SERIALIZABLE) - cout << "Serializable, "; + cout << wxT("Serializable, "); #ifdef ODBC_V20 if (dbInf.txnIsolationOptions & SQL_TXN_VERSIONING) - cout << "Versioning"; + cout << wxT("Versioning"); #endif cout << endl; - cout << "Fetch Directions Supported:" << endl << " "; + cout << wxT("Fetch Directions Supported:") << endl << wxT(" "); if (dbInf.fetchDirections & SQL_FD_FETCH_NEXT) - cout << "Next, "; + cout << wxT("Next, "); if (dbInf.fetchDirections & SQL_FD_FETCH_PRIOR) - cout << "Prev, "; + cout << wxT("Prev, "); if (dbInf.fetchDirections & SQL_FD_FETCH_FIRST) - cout << "First, "; + cout << wxT("First, "); if (dbInf.fetchDirections & SQL_FD_FETCH_LAST) - cout << "Last, "; + cout << wxT("Last, "); if (dbInf.fetchDirections & SQL_FD_FETCH_ABSOLUTE) - cout << "Absolute, "; + cout << wxT("Absolute, "); if (dbInf.fetchDirections & SQL_FD_FETCH_RELATIVE) - cout << "Relative, "; + cout << wxT("Relative, "); #ifdef ODBC_V20 if (dbInf.fetchDirections & SQL_FD_FETCH_RESUME) - cout << "Resume, "; + cout << wxT("Resume, "); #endif if (dbInf.fetchDirections & SQL_FD_FETCH_BOOKMARK) - cout << "Bookmark"; + cout << wxT("Bookmark"); cout << endl; - cout << "Lock Types Supported (SQLSetPos): "; + cout << wxT("Lock Types Supported (SQLSetPos): "); if (dbInf.lockTypes & SQL_LCK_NO_CHANGE) - cout << "No Change, "; + cout << wxT("No Change, "); if (dbInf.lockTypes & SQL_LCK_EXCLUSIVE) - cout << "Exclusive, "; + cout << wxT("Exclusive, "); if (dbInf.lockTypes & SQL_LCK_UNLOCK) - cout << "UnLock"; + cout << wxT("UnLock"); cout << endl; - cout << "Position Operations Supported (SQLSetPos): "; + cout << wxT("Position Operations Supported (SQLSetPos): "); if (dbInf.posOperations & SQL_POS_POSITION) - cout << "Position, "; + cout << wxT("Position, "); if (dbInf.posOperations & SQL_POS_REFRESH) - cout << "Refresh, "; + cout << wxT("Refresh, "); if (dbInf.posOperations & SQL_POS_UPDATE) - cout << "Upd, "; + cout << wxT("Upd, ")); if (dbInf.posOperations & SQL_POS_DELETE) - cout << "Del, "; + cout << wxT("Del, "); if (dbInf.posOperations & SQL_POS_ADD) - cout << "Add"; + cout << wxT("Add"); cout << endl; - cout << "Positioned Statements Supported: "; + cout << wxT("Positioned Statements Supported: "); if (dbInf.posStmts & SQL_PS_POSITIONED_DELETE) - cout << "Pos delete, "; + cout << wxT("Pos delete, "); if (dbInf.posStmts & SQL_PS_POSITIONED_UPDATE) - cout << "Pos update, "; + cout << wxT("Pos update, "); if (dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE) - cout << "Select for update"; + cout << wxT("Select for update"); cout << endl; - cout << "Scroll Concurrency: "; + cout << wxT("Scroll Concurrency: "); if (dbInf.scrollConcurrency & SQL_SCCO_READ_ONLY) - cout << "Read Only, "; + cout << wxT("Read Only, "); if (dbInf.scrollConcurrency & SQL_SCCO_LOCK) - cout << "Lock, "; + cout << wxT("Lock, "); if (dbInf.scrollConcurrency & SQL_SCCO_OPT_ROWVER) - cout << "Opt. Rowver, "; + cout << wxT("Opt. Rowver, "); if (dbInf.scrollConcurrency & SQL_SCCO_OPT_VALUES) - cout << "Opt. Values"; + cout << wxT("Opt. Values"); cout << endl; - cout << "Scroll Options: "; + cout << wxT("Scroll Options: "); if (dbInf.scrollOptions & SQL_SO_FORWARD_ONLY) - cout << "Fwd Only, "; + cout << wxT("Fwd Only, "); if (dbInf.scrollOptions & SQL_SO_STATIC) - cout << "Static, "; + cout << wxT("Static, "); if (dbInf.scrollOptions & SQL_SO_KEYSET_DRIVEN) - cout << "Keyset Driven, "; + cout << wxT("Keyset Driven, "); if (dbInf.scrollOptions & SQL_SO_DYNAMIC) - cout << "Dynamic, "; + cout << wxT("Dynamic, "); if (dbInf.scrollOptions & SQL_SO_MIXED) - cout << "Mixed"; + cout << wxT("Mixed"); cout << endl; - cout << "Static Sensitivity: "; + cout << wxT("Static Sensitivity: "); if (dbInf.staticSensitivity & SQL_SS_ADDITIONS) - cout << "Additions, "; + cout << wxT("Additions, "); if (dbInf.staticSensitivity & SQL_SS_DELETIONS) - cout << "Deletions, "; + cout << wxT("Deletions, "); if (dbInf.staticSensitivity & SQL_SS_UPDATES) - cout << "Updates"; + cout << wxT("Updates"); cout << endl; - cout << "Transaction Capable?: "; + cout << wxT("Transaction Capable?: "); switch(dbInf.txnCapable) { - case SQL_TC_NONE: cout << "No"; break; - case SQL_TC_DML: cout << "DML Only"; break; - case SQL_TC_DDL_COMMIT: cout << "DDL Commit"; break; - case SQL_TC_DDL_IGNORE: cout << "DDL Ignore"; break; - case SQL_TC_ALL: cout << "DDL & DML"; break; + case SQL_TC_NONE: cout << wxT("No"); break; + case SQL_TC_DML: cout << wxT("DML Only"); break; + case SQL_TC_DDL_COMMIT: cout << wxT("DDL Commit"); break; + case SQL_TC_DDL_IGNORE: cout << wxT("DDL Ignore"); break; + case SQL_TC_ALL: cout << wxT("DDL & DML"); break; } cout << endl; @@ -1078,40 +1304,53 @@ bool wxDb::getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo) // Get information about the data type specified if (SQLGetTypeInfo(hstmt, fSqlType) != SQL_SUCCESS) return(DispAllErrors(henv, hdbc, hstmt)); + // Fetch the record - if ((retcode = SQLFetch(hstmt)) != SQL_SUCCESS) + retcode = SQLFetch(hstmt); + if (retcode != SQL_SUCCESS) { #ifdef DBDEBUG_CONSOLE if (retcode == SQL_NO_DATA_FOUND) - cout << "SQL_NO_DATA_FOUND fetching inf. about data type." << endl; + cout << wxT("SQL_NO_DATA_FOUND fetching inf. about data type.") << endl; #endif DispAllErrors(henv, hdbc, hstmt); SQLFreeStmt(hstmt, SQL_CLOSE); return(FALSE); } + + wxChar typeName[DB_TYPE_NAME_LEN+1]; + // Obtain columns from the record - if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) structSQLTypeInfo.TypeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS) + if (SQLGetData(hstmt, 1, SQL_C_CHAR, (UCHAR*) typeName, DB_TYPE_NAME_LEN, &cbRet) != SQL_SUCCESS) return(DispAllErrors(henv, hdbc, hstmt)); + structSQLTypeInfo.TypeName = typeName; + // BJO 20000503: no more needed with new GetColumns... #if OLD_GETCOLUMNS // BJO 991209 if (Dbms() == dbmsMY_SQL) { - if (!wxStrcmp(structSQLTypeInfo.TypeName, "middleint")) wxStrcpy(structSQLTypeInfo.TypeName, "mediumint"); - if (!wxStrcmp(structSQLTypeInfo.TypeName, "middleint unsigned")) wxStrcpy(structSQLTypeInfo.TypeName, "mediumint unsigned"); - if (!wxStrcmp(structSQLTypeInfo.TypeName, "integer")) wxStrcpy(structSQLTypeInfo.TypeName, "int"); - if (!wxStrcmp(structSQLTypeInfo.TypeName, "integer unsigned")) wxStrcpy(structSQLTypeInfo.TypeName, "int unsigned"); - if (!wxStrcmp(structSQLTypeInfo.TypeName, "middleint")) wxStrcpy(structSQLTypeInfo.TypeName, "mediumint"); - if (!wxStrcmp(structSQLTypeInfo.TypeName, "varchar")) wxStrcpy(structSQLTypeInfo.TypeName, "char"); + if (structSQLTypeInfo.TypeName == wxT("middleint")) + structSQLTypeInfo.TypeName = wxT("mediumint"); + else if (structSQLTypeInfo.TypeName == wxT("middleint unsigned")) + structSQLTypeInfo.TypeName = wxT("mediumint unsigned"); + else if (structSQLTypeInfo.TypeName == wxT("integer")) + structSQLTypeInfo.TypeName = wxT("int"); + else if (structSQLTypeInfo.TypeName == wxT("integer unsigned")) + structSQLTypeInfo.TypeName = wxT("int unsigned"); + else if (structSQLTypeInfo.TypeName == wxT("middleint")) + structSQLTypeInfo.TypeName = wxT("mediumint"); + else if (structSQLTypeInfo.TypeName == wxT("varchar")) + structSQLTypeInfo.TypeName = wxT("char"); } // BJO 20000427 : OpenLink driver - if (!wxStrncmp(dbInf.driverName, "oplodbc", 7) || - !wxStrncmp(dbInf.driverName, "OLOD", 4)) + if (!wxStrncmp(dbInf.driverName, wxT("oplodbc"), 7) || + !wxStrncmp(dbInf.driverName, wxT("OLOD"), 4)) { - if (!wxStrcmp(structSQLTypeInfo.TypeName, "double precision")) - wxStrcpy(structSQLTypeInfo.TypeName, "real"); + if (structSQLTypeInfo.TypeName == wxT("double precision")) + structSQLTypeInfo.TypeName = wxT("real"); } #endif @@ -1164,7 +1403,7 @@ void wxDb::Close(void) DispAllErrors(henv, hdbc); // There should be zero Ctable objects still connected to this db object - assert(nTables == 0); + wxASSERT(nTables == 0); #ifdef __WXDEBUG__ wxTablesInUse *tiu; @@ -1176,8 +1415,8 @@ void wxDb::Close(void) tiu = (wxTablesInUse *)pNode->Data(); if (tiu->pDb == this) { - s.sprintf(wxT("(%-20s) tableID:[%6lu] pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb); - s2.sprintf(wxT("Orphaned found using pDb:[%p]"),this); + s.Printf(wxT("(%-20s) tableID:[%6lu] pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb); + s2.Printf(wxT("Orphaned found using pDb:[%p]"),this); wxLogDebug (s.c_str(),s2.c_str()); } pNode = pNode->Next(); @@ -1187,9 +1426,9 @@ void wxDb::Close(void) // Copy the error messages to a global variable int i; for (i = 0; i < DB_MAX_ERROR_HISTORY; i++) - wxStrcpy(DBerrorList[i],errorList[i]); + wxStrcpy(DBerrorList[i], errorList[i]); - dbmsType = dbmsUNIDENTIFIED; + dbmsType = dbmsUNIDENTIFIED; dbIsOpen = FALSE; } // wxDb::Close() @@ -1232,7 +1471,7 @@ bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt) * actual error(s) that just occured on the previous request of the datasource. * * The function will retrieve each error condition from the datasource and - * sprintf the codes/text values into a string which it then logs via logError(). + * Printf the codes/text values into a string which it then logs via logError(). * If in DBDEBUG_CONSOLE mode, the constructed string will be displayed in the console * window and program execution will be paused until the user presses a key. * @@ -1245,24 +1484,24 @@ bool wxDb::DispAllErrors(HENV aHenv, HDBC aHdbc, HSTMT aHstmt) while (SQLError(aHenv, aHdbc, aHstmt, (UCHAR FAR *) sqlState, &nativeError, (UCHAR FAR *) errorMsg, SQL_MAX_MESSAGE_LENGTH - 1, &cbErrorMsg) == SQL_SUCCESS) { - odbcErrMsg.sprintf("SQL State = %s\nNative Error Code = %li\nError Message = %s\n", sqlState, nativeError, errorMsg); - logError(odbcErrMsg.c_str(), sqlState); + odbcErrMsg.Printf(wxT("SQL State = %s\nNative Error Code = %li\nError Message = %s\n"), sqlState, nativeError, errorMsg); + logError(odbcErrMsg, sqlState); if (!silent) { #ifdef DBDEBUG_CONSOLE // When run in console mode, use standard out to display errors. cout << odbcErrMsg.c_str() << endl; - cout << "Press any key to continue..." << endl; + cout << wxT("Press any key to continue...") << endl; getchar(); #endif #ifdef __WXDEBUG__ - wxLogDebug(odbcErrMsg.c_str(),wxT("ODBC DEBUG MESSAGE from DispAllErrors()")); + wxLogDebug(odbcErrMsg,wxT("ODBC DEBUG MESSAGE from DispAllErrors()")); #endif } } - return(FALSE); // This function always returns false. + return(FALSE); // This function always returns FALSE. } // wxDb::DispAllErrors() @@ -1283,8 +1522,8 @@ void wxDb::DispNextError(void) { wxString odbcErrMsg; - odbcErrMsg.sprintf("SQL State = %s\nNative Error Code = %li\nError Message = %s\n", sqlState, nativeError, errorMsg); - logError(odbcErrMsg.c_str(), sqlState); + odbcErrMsg.Printf(wxT("SQL State = %s\nNative Error Code = %li\nError Message = %s\n"), sqlState, nativeError, errorMsg); + logError(odbcErrMsg, sqlState); if (silent) return; @@ -1292,7 +1531,7 @@ void wxDb::DispNextError(void) #ifdef DBDEBUG_CONSOLE // When run in console mode, use standard out to display errors. cout << odbcErrMsg.c_str() << endl; - cout << "Press any key to continue..." << endl; + cout << wxT("Press any key to continue...") << endl; getchar(); #endif @@ -1304,9 +1543,9 @@ void wxDb::DispNextError(void) /********** wxDb::logError() **********/ -void wxDb::logError(const char *errMsg, const char *SQLState) +void wxDb::logError(const wxString &errMsg, const wxString &SQLState) { - assert(errMsg && wxStrlen(errMsg)); + wxASSERT(errMsg.Length()); static int pLast = -1; int dbStatus; @@ -1321,7 +1560,7 @@ void wxDb::logError(const char *errMsg, const char *SQLState) wxStrcpy(errorList[pLast], errMsg); - if (SQLState && wxStrlen(SQLState)) + if (SQLState.Length()) if ((dbStatus = TranslateSqlState(SQLState)) != DB_ERR_FUNCTION_SEQUENCE_ERROR) DB_STATUS = dbStatus; @@ -1332,7 +1571,7 @@ void wxDb::logError(const char *errMsg, const char *SQLState) /**********wxDb::TranslateSqlState() **********/ -int wxDb::TranslateSqlState(const wxChar *SQLState) +int wxDb::TranslateSqlState(const wxString &SQLState) { if (!wxStrcmp(SQLState, wxT("01000"))) return(DB_ERR_GENERAL_WARNING); @@ -1520,60 +1759,61 @@ int wxDb::TranslateSqlState(const wxChar *SQLState) /********** wxDb::Grant() **********/ -bool wxDb::Grant(int privileges, const char *tableName, const char *userList) +bool wxDb::Grant(int privileges, const wxString &tableName, const wxString &userList) { wxString sqlStmt; // Build the grant statement - sqlStmt = "GRANT "; + sqlStmt = wxT("GRANT "); if (privileges == DB_GRANT_ALL) - sqlStmt += "ALL"; + sqlStmt += wxT("ALL"); else { int c = 0; if (privileges & DB_GRANT_SELECT) { - sqlStmt += "SELECT"; + sqlStmt += wxT("SELECT"); c++; } if (privileges & DB_GRANT_INSERT) { if (c++) - sqlStmt += ", "; - sqlStmt += "INSERT"; + sqlStmt += wxT(", "); + sqlStmt += wxT("INSERT"); } if (privileges & DB_GRANT_UPDATE) { if (c++) - sqlStmt += ", "; - sqlStmt += "UPDATE"; + sqlStmt += wxT(", "); + sqlStmt += wxT("UPDATE"); } if (privileges & DB_GRANT_DELETE) { if (c++) - sqlStmt += ", "; - sqlStmt += "DELETE"; + sqlStmt += wxT(", "); + sqlStmt += wxT("DELETE"); } } - sqlStmt += " ON "; - sqlStmt += tableName; - sqlStmt += " TO "; + sqlStmt += wxT(" ON "); + sqlStmt += SQLTableName(tableName); + sqlStmt += wxT(" TO "); sqlStmt += userList; #ifdef DBDEBUG_CONSOLE cout << endl << sqlStmt.c_str() << endl; #endif - WriteSqlLog(sqlStmt.c_str()); + WriteSqlLog(sqlStmt); - return(ExecSql(sqlStmt.c_str())); + return(ExecSql(sqlStmt)); } // wxDb::Grant() /********** wxDb::CreateView() **********/ -bool wxDb::CreateView(const char *viewName, const char *colList, const char *pSqlStmt, bool attemptDrop) +bool wxDb::CreateView(const wxString &viewName, const wxString &colList, + const wxString &pSqlStmt, bool attemptDrop) { wxString sqlStmt; @@ -1582,32 +1822,32 @@ bool wxDb::CreateView(const char *viewName, const char *colList, const char *pSq return FALSE; // Build the create view statement - sqlStmt = "CREATE VIEW "; + sqlStmt = wxT("CREATE VIEW "); sqlStmt += viewName; - if (wxStrlen(colList)) + if (colList.Length()) { - sqlStmt += " ("; + sqlStmt += wxT(" ("); sqlStmt += colList; - sqlStmt += ")"; + sqlStmt += wxT(")"); } - sqlStmt += " AS "; + sqlStmt += wxT(" AS "); sqlStmt += pSqlStmt; - WriteSqlLog(sqlStmt.c_str()); + WriteSqlLog(sqlStmt); #ifdef DBDEBUG_CONSOLE cout << sqlStmt.c_str() << endl; #endif - return(ExecSql(sqlStmt.c_str())); + return(ExecSql(sqlStmt)); } // wxDb::CreateView() /********** wxDb::DropView() **********/ -bool wxDb::DropView(const char *viewName) +bool wxDb::DropView(const wxString &viewName) { /* * NOTE: This function returns TRUE if the View does not exist, but @@ -1615,12 +1855,11 @@ bool wxDb::DropView(const char *viewName) * below for any other databases when those databases are defined * to handle this situation consistently */ -// char sqlStmt[DB_MAX_STATEMENT_LEN]; wxString sqlStmt; - sqlStmt.sprintf("DROP VIEW %s", viewName); + sqlStmt.Printf(wxT("DROP VIEW %s"), viewName.c_str()); - WriteSqlLog(sqlStmt.c_str()); + WriteSqlLog(sqlStmt); #ifdef DBDEBUG_CONSOLE cout << endl << sqlStmt.c_str() << endl; @@ -1644,7 +1883,7 @@ bool wxDb::DropView(const char *viewName) } // Commit the transaction - if (! CommitTrans()) + if (!CommitTrans()) return(FALSE); return TRUE; @@ -1653,11 +1892,18 @@ bool wxDb::DropView(const char *viewName) /********** wxDb::ExecSql() **********/ -bool wxDb::ExecSql(const char *pSqlStmt) +bool wxDb::ExecSql(const wxString &pSqlStmt) { + RETCODE retcode; + SQLFreeStmt(hstmt, SQL_CLOSE); - if (SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt, SQL_NTS) == SQL_SUCCESS) + + retcode = SQLExecDirect(hstmt, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS); + if (retcode == SQL_SUCCESS || + (Dbms() == dbmsDB2 && (retcode == SQL_SUCCESS_WITH_INFO || retcode == SQL_NO_DATA_FOUND))) + { return(TRUE); + } else { DispAllErrors(henv, hdbc, hstmt); @@ -1684,8 +1930,8 @@ bool wxDb::GetNext(void) /********** wxDb::GetData() **********/ bool wxDb::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned) { - assert(pData); - assert(cbReturned); + wxASSERT(pData); + wxASSERT(cbReturned); if (SQLGetData(hstmt, colNo, cType, pData, maxLen, cbReturned) == SQL_SUCCESS) return(TRUE); @@ -1699,38 +1945,38 @@ bool wxDb::GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FA /********** wxDb::GetKeyFields() **********/ -int wxDb::GetKeyFields(char *tableName, wxDbColInf* colInf, int noCols) +int wxDb::GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCols) { - char szPkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Primary key table name */ - char szFkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Foreign key table name */ + wxChar szPkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Primary key table name */ + wxChar szFkTable[DB_MAX_TABLE_NAME_LEN+1]; /* Foreign key table name */ short iKeySeq; // SQLSMALLINT iKeySeq; - char szPkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Primary key column */ - char szFkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Foreign key column */ + wxChar szPkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Primary key column */ + wxChar szFkCol[DB_MAX_COLUMN_NAME_LEN+1]; /* Foreign key column */ SQLRETURN retcode; SDWORD cb; - int i; - wxString Temp0; + SWORD i; + wxString tempStr; /* - * --------------------------------------------------------------------- - * -- 19991224 : mj10777 : Create ------ - * -- : Three things are done and stored here : ------ - * -- : 1) which Column(s) is/are Primary Key(s) ------ - * -- : 2) which tables use this Key as a Foreign Key ------ - * -- : 3) which columns are Foreign Key and the name ------ - * -- : of the Table where the Key is the Primary Key ----- - * -- : Called from GetColumns(char *tableName, ------ - * -- int *numCols,const char *userID ) ------ - * --------------------------------------------------------------------- + * ----------------------------------------------------------------------- + * -- 19991224 : mj10777 : Create ------ + * -- : Three things are done and stored here : ------ + * -- : 1) which Column(s) is/are Primary Key(s) ------ + * -- : 2) which tables use this Key as a Foreign Key ------ + * -- : 3) which columns are Foreign Key and the name ------ + * -- : of the Table where the Key is the Primary Key ----- + * -- : Called from GetColumns(const wxString &tableName, ------ + * -- int *numCols,const wxChar *userID ) ------ + * ----------------------------------------------------------------------- */ /*---------------------------------------------------------------------*/ /* Get the names of the columns in the primary key. */ /*---------------------------------------------------------------------*/ retcode = SQLPrimaryKeys(hstmt, - NULL, 0, /* Catalog name */ - NULL, 0, /* Schema name */ - (UCHAR *) tableName, SQL_NTS); /* Table name */ + NULL, 0, /* Catalog name */ + NULL, 0, /* Schema name */ + (UCHAR FAR *) tableName.c_str(), SQL_NTS); /* Table name */ /*---------------------------------------------------------------------*/ /* Fetch and display the result set. This will be a list of the */ @@ -1755,18 +2001,18 @@ int wxDb::GetKeyFields(char *tableName, wxDbColInf* colInf, int noCols) /* Get all the foreign keys that refer to tableName primary key. */ /*---------------------------------------------------------------------*/ retcode = SQLForeignKeys(hstmt, - NULL, 0, /* Primary catalog */ - NULL, 0, /* Primary schema */ - (UCHAR *)tableName, SQL_NTS, /* Primary table */ - NULL, 0, /* Foreign catalog */ - NULL, 0, /* Foreign schema */ - NULL, 0); /* Foreign table */ + NULL, 0, /* Primary catalog */ + NULL, 0, /* Primary schema */ + (UCHAR FAR *)tableName.c_str(), SQL_NTS,/* Primary table */ + NULL, 0, /* Foreign catalog */ + NULL, 0, /* Foreign schema */ + NULL, 0); /* Foreign table */ /*---------------------------------------------------------------------*/ /* Fetch and display the result set. This will be all of the foreign */ /* keys in other tables that refer to the tableName primary key. */ /*---------------------------------------------------------------------*/ - Temp0.Empty(); + tempStr.Empty(); szPkCol[0] = 0; while ((retcode == SQL_SUCCESS) || (retcode == SQL_SUCCESS_WITH_INFO)) { @@ -1778,30 +2024,32 @@ int wxDb::GetKeyFields(char *tableName, wxDbColInf* colInf, int noCols) GetData( 5, SQL_C_SSHORT, &iKeySeq, 0, &cb); GetData( 7, SQL_C_CHAR, szFkTable, DB_MAX_TABLE_NAME_LEN+1, &cb); GetData( 8, SQL_C_CHAR, szFkCol, DB_MAX_COLUMN_NAME_LEN+1, &cb); - Temp0.Printf(wxT("%s[%s] "),Temp0.c_str(),szFkTable); // [ ] in case there is a blank in the Table name + tempStr.Printf(wxT("%s[%s] "),tempStr.c_str(),szFkTable); // [ ] in case there is a blank in the Table name } // if } // while - Temp0.Trim(); // Get rid of any unneeded blanks - if (Temp0 != wxT("")) + + tempStr.Trim(); // Get rid of any unneeded blanks + if (!tempStr.IsEmpty()) { - for (i=0;i 0) || + dataType != DB_DATA_TYPE_VARCHAR); + + // Must specify a columnLength if modifying a VARCHAR type column + if (dataType == DB_DATA_TYPE_VARCHAR && !columnLength) + return FALSE; + + wxString dataTypeName; + wxString sqlStmt; + wxString alterSlashModify; + + switch(dataType) + { + case DB_DATA_TYPE_VARCHAR : + dataTypeName = typeInfVarchar.TypeName; + break; + case DB_DATA_TYPE_INTEGER : + dataTypeName = typeInfInteger.TypeName; + break; + case DB_DATA_TYPE_FLOAT : + dataTypeName = typeInfFloat.TypeName; + break; + case DB_DATA_TYPE_DATE : + dataTypeName = typeInfDate.TypeName; + break; + case DB_DATA_TYPE_BLOB : + dataTypeName = typeInfBlob.TypeName; + break; + default: + return FALSE; + } + + // Set the modify or alter syntax depending on the type of database connected to + switch (Dbms()) + { + case dbmsORACLE : + alterSlashModify = "MODIFY"; + break; + case dbmsMS_SQL_SERVER : + alterSlashModify = "ALTER COLUMN"; + break; + case dbmsUNIDENTIFIED : + return FALSE; + case dbmsSYBASE_ASA : + case dbmsSYBASE_ASE : + case dbmsMY_SQL : + case dbmsPOSTGRES : + case dbmsACCESS : + case dbmsDBASE : + case dbmsXBASE_SEQUITER : + default : + alterSlashModify = "MODIFY"; + break; + } + + // create the SQL statement + sqlStmt.Printf(wxT("ALTER TABLE \"%s\" \"%s\" \"%s\" %s"), tableName.c_str(), alterSlashModify.c_str(), + columnName.c_str(), dataTypeName.c_str()); + + // For varchars only, append the size of the column + if (dataType == DB_DATA_TYPE_VARCHAR && + (Dbms() != dbmsMY_SQL || dataTypeName != "text")) + { + wxString s; + s.Printf(wxT("(%d)"), columnLength); + sqlStmt += s; + } + + // for passing things like "NOT NULL" + if (optionalParam.Length()) + { + sqlStmt += wxT(" "); + sqlStmt += optionalParam; + } + + return ExecSql(sqlStmt); + +} // wxDb::ModifyColumn() + + /********** wxDbGetConnection() **********/ wxDb WXDLLEXPORT *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCursors) { @@ -3346,15 +3620,15 @@ wxDb WXDLLEXPORT *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCurso // name and must currently not be in use. if (pList->Free && (pList->PtrDb->FwdOnlyCursors() == FwdOnlyCursors) && - (!wxStrcmp(pDbConfig->Dsn, pList->Dsn))) // Found a free connection + (!wxStrcmp(pDbConfig->GetDsn(), pList->Dsn))) // Found a free connection { pList->Free = FALSE; return(pList->PtrDb); } - if (!wxStrcmp(pDbConfig->Dsn, pList->Dsn) && - !wxStrcmp(pDbConfig->Uid, pList->Uid) && - !wxStrcmp(pDbConfig->AuthStr, pList->AuthStr)) + if (!wxStrcmp(pDbConfig->GetDsn(), pList->Dsn) && + !wxStrcmp(pDbConfig->GetUserID(), pList->Uid) && + !wxStrcmp(pDbConfig->GetPassword(), pList->AuthStr)) matchingDbConnection = pList->PtrDb; } @@ -3377,24 +3651,25 @@ wxDb WXDLLEXPORT *wxDbGetConnection(wxDbConnectInf *pDbConfig, bool FwdOnlyCurso } // Initialize new node in the linked list - pList->PtrNext = 0; - pList->Free = FALSE; - wxStrcpy(pList->Dsn, pDbConfig->Dsn); - wxStrcpy(pList->Uid, pDbConfig->Uid); - wxStrcpy(pList->AuthStr, pDbConfig->AuthStr); + pList->PtrNext = 0; + pList->Free = FALSE; + pList->Dsn = pDbConfig->GetDsn(); + pList->Uid = pDbConfig->GetUserID(); + pList->AuthStr = pDbConfig->GetPassword(); - pList->PtrDb = new wxDb(pDbConfig->Henv,FwdOnlyCursors); + pList->PtrDb = new wxDb(pDbConfig->GetHenv(), FwdOnlyCursors); bool opened = FALSE; if (!matchingDbConnection) - opened = pList->PtrDb->Open(pDbConfig->Dsn, pDbConfig->Uid, pDbConfig->AuthStr); + opened = pList->PtrDb->Open(pDbConfig->GetDsn(), pDbConfig->GetUserID(), pDbConfig->GetPassword()); else opened = pList->PtrDb->Open(matchingDbConnection); // Connect to the datasource if (opened) { + pList->PtrDb->setCached(TRUE); // Prevent a user from deleting a cached connection pList->PtrDb->SetSqlLogging(SQLLOGstate,SQLLOGfn,TRUE); return(pList->PtrDb); } @@ -3443,6 +3718,7 @@ void WXDLLEXPORT wxDbCloseConnections(void) pNext = pList->PtrNext; // Save the pointer to next pList->PtrDb->CommitTrans(); // Commit any open transactions on wxDb object pList->PtrDb->Close(); // Close the wxDb object + pList->PtrDb->setCached(FALSE); // Allows deletion of the wxDb instance delete pList->PtrDb; // Deletes the wxDb object delete pList; // Deletes the linked list object } @@ -3471,6 +3747,54 @@ int WXDLLEXPORT wxDbConnectionsInUse(void) } // wxDbConnectionsInUse() + +/********** wxDbLogExtendedErrorMsg() **********/ +// DEBUG ONLY function +const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, + wxDb *pDb, + const wxChar *ErrFile, + int ErrLine) +{ + static wxString msg; + msg = userText; + + wxString tStr; + + if (ErrFile || ErrLine) + { + msg += wxT("File: "); + msg += ErrFile; + msg += wxT(" Line: "); + tStr.Printf(wxT("%d"),ErrLine); + msg += tStr.c_str(); + msg += wxT("\n"); + } + + msg.Append (wxT("\nODBC errors:\n")); + msg += wxT("\n"); + + // Display errors for this connection + int i; + for (i = 0; i < DB_MAX_ERROR_HISTORY; i++) + { + if (pDb->errorList[i]) + { + msg.Append(pDb->errorList[i]); + if (wxStrcmp(pDb->errorList[i],wxT("")) != 0) + msg.Append(wxT("\n")); + // Clear the errmsg buffer so the next error will not + // end up showing the previous error that have occurred + wxStrcpy(pDb->errorList[i],wxT("")); + } + } + msg += wxT("\n"); + + wxLogDebug(msg.c_str()); + + return msg.c_str(); +} // wxDbLogExtendedErrorMsg() + + /********** wxDbSqlLog() **********/ bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename) { @@ -3494,8 +3818,8 @@ bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename) #if 0 /********** wxDbCreateDataSource() **********/ -int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *description, - bool sysDSN, const char *defDir, wxWindow *parent) +int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description, + bool sysDSN, const wxString &defDir, wxWindow *parent) /* * !!!! ONLY FUNCTIONAL UNDER MSW with VC6 !!!! * Very rudimentary creation of an ODBC data source. @@ -3518,7 +3842,7 @@ int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *de // NOTE: The decimal 2 is an invalid character in all keyword pairs // so that is why I used it, as wxString does not deal well with // embedded nulls in strings - setupStr.sprintf("DSN=%s%cDescription=%s%cDefaultDir=%s%c",dsn,2,description,2,defDir,2); + setupStr.Printf(wxT("DSN=%s%cDescription=%s%cDefaultDir=%s%c"),dsn,2,description,2,defDir,2); // Replace the separator from above with the '\0' seperator needed // by the SQLConfigDataSource() function @@ -3527,7 +3851,7 @@ int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *de { k = setupStr.Find((wxChar)2,TRUE); if (k != wxNOT_FOUND) - setupStr[(UINT)k] = '\0'; + setupStr[(UINT)k] = wxT('\0'); } while (k != wxNOT_FOUND); @@ -3540,7 +3864,7 @@ int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *de DWORD retcode = 0; WORD cb; wxChar errMsg[SQL_MAX_MESSAGE_LENGTH]; - errMsg[0] = '\0'; + errMsg[0] = wxT('\0'); // This function is only supported in ODBC drivers v3.0 compliant and above SQLInstallerError(1,&retcode,errMsg,SQL_MAX_MESSAGE_LENGTH-1,&cb); @@ -3564,7 +3888,7 @@ int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *de // Using iODBC/unixODBC or some other compiler which does not support the APIs // necessary to use this function, so this function is not supported #ifdef __WXDEBUG__ - wxLogDebug("wxDbCreateDataSource() not available except under VC++/MSW",wxT("ODBC DEBUG MESSAGE")); + wxLogDebug(wxT("wxDbCreateDataSource() not available except under VC++/MSW"),wxT("ODBC DEBUG MESSAGE")); #endif result = FALSE; #endif // __VISUALC__ @@ -3576,8 +3900,8 @@ int wxDbCreateDataSource(const char *driverName, const char *dsn, const char *de /********** wxDbGetDataSource() **********/ -bool wxDbGetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax, - UWORD direction) +bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc, + SWORD DsDescMax, UWORD direction) /* * Dsn and DsDesc will contain the data source name and data source * description upon return