X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1fc5dd6f8eb590992150b3998266fb50dfaab227..678cd6de66095373ebaed01d8d013f256cac326b:/src/common/dbtable.cpp diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp index decce99426..f5bc7f5b29 100644 --- a/src/common/dbtable.cpp +++ b/src/common/dbtable.cpp @@ -2,12 +2,16 @@ // Name: dbtable.cpp // Purpose: Implementation of the wxTable class. // Author: Doug Card -// Modified by: +// Mods: April 1999 +// -Dynamic cursor support - Only one predefined cursor, as many others as +// you need may be created on demand +// -Reduced number of active cursors significantly +// -Query-Only wxTable objects // 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 @@ -18,39 +22,59 @@ // the wxWindows GUI development toolkit. /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dbtable.h" -#endif - /* // SYNOPSIS START // SYNOPSIS STOP */ -/* -#ifdef _CONSOLE - #include +// Use this line for wxWindows v1.x +//#include "wx_ver.h" +// Use this line for wxWindows v2.x +#include "wx/version.h" +#include "wx/wxprec.h" + +#if wxMAJOR_VERSION == 2 +# ifdef __GNUG__ +# pragma implementation "dbtable.h" +# endif #endif -*/ -#include "wx/wxprec.h" +#ifdef DBDEBUG_CONSOLE +# include +#endif #ifdef __BORLANDC__ #pragma hdrstop #endif //__BORLANDC__ -#ifndef WX_PRECOMP - #include -#endif //WX_PRECOMP +#if wxMAJOR_VERSION == 2 +# ifndef WX_PRECOMP +# include +# endif //WX_PRECOMP +#endif -#if wxUSE_ODBC +#if wxMAJOR_VERSION == 1 +# if defined(wx_msw) || defined(wx_x) +# ifdef WX_PRECOMP +# include "wx_prec.h" +# else +# include "wx.h" +# endif +# endif +# define wxUSE_ODBC 1 +#endif -#include +#if wxUSE_ODBC #include #include #include #include +#if wxMAJOR_VERSION == 1 + #include "table.h" +#elif wxMAJOR_VERSION == 2 + #include "wx/dbtable.h" +#endif #ifdef __UNIX__ // The HPUX preprocessor lines below were commented out on 8/20/97 @@ -63,27 +87,68 @@ # endif #endif +ULONG lastTableID = 0; + + +#if __WXDEBUG__ > 0 + wxList TablesInUse; +#endif + + /********** wxTable::wxTable() **********/ -wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols, const char *qryTblName) +wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols, + const char *qryTblName, bool qryOnly, char *tblPath) { - // Assign member variables - pDb = pwxDB; // Pointer to the wxDB object + pDb = pwxDB; // Pointer to the wxDB object + henv = 0; + hdbc = 0; + hstmt = 0; + hstmtDefault = 0; // Initialized below + hstmtCount = 0; // Initialized first time it is needed + hstmtInsert = 0; + hstmtDelete = 0; + hstmtUpdate = 0; + hstmtInternal = 0; + colDefs = 0; + tableID = 0; + noCols = nCols; // No. of cols in the table + where = 0; // Where clause + orderBy = 0; // Order By clause + from = 0; // From clause + selectForUpdate = FALSE; // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase + queryOnly = qryOnly; + + assert (tblName); strcpy(tableName, tblName); // Table Name + if (tblPath) + strcpy(tablePath, tblPath); // Table Path - used for dBase files + if (qryTblName) // Name of the table/view to query strcpy(queryTableName, qryTblName); else strcpy(queryTableName, tblName); - assert(pDb); // Assert is placed after table name is assigned for error reporting reasons +// assert(pDb); // Assert is placed after table name is assigned for error reporting reasons if (!pDb) return; - noCols = nCols; // No. of cols in the table - where = 0; // Where clause - orderBy = 0; // Order By clause - from = 0; // From clause - selectForUpdate = FALSE; // SELECT ... FOR UPDATE; Indicates whether to include the FOR UPDATE phrase + pDb->nTables++; + + char s[200]; + tableID = ++lastTableID; + sprintf(s, "wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb); + +#if __WXDEBUG__ > 0 + CstructTablesInUse *tableInUse; + tableInUse = new CstructTablesInUse(); + tableInUse->tableName = tblName; + tableInUse->tableID = tableID; + tableInUse->pDb = pDb; + TablesInUse.Append(tableInUse); +#endif + + pDb->WriteSqlLog(s); // Grab the HENV and HDBC from the wxDB object henv = pDb->henv; @@ -92,49 +157,38 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols, const char * // Allocate space for column definitions if (noCols) colDefs = new CcolDef[noCols]; // Points to the first column defintion - else - colDefs = 0; // Allocate statement handles for the table - if (SQLAllocStmt(hdbc, &c0) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLAllocStmt(hdbc, &c1) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLAllocStmt(hdbc, &c2) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); -// if (SQLAllocStmt(hdbc, &c3) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc); -// if (SQLAllocStmt(hdbc, &c4) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc); -// if (SQLAllocStmt(hdbc, &c5) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc); - // Allocate a separate statement handle for performing inserts - if (SQLAllocStmt(hdbc, &hstmtInsert) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - // Allocate a separate statement handle for performing deletes - if (SQLAllocStmt(hdbc, &hstmtDelete) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - // Allocate a separate statement handle for performing updates - if (SQLAllocStmt(hdbc, &hstmtUpdate) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - // Allocate a separate statement handle for performing count(*) function - if (SQLAllocStmt(hdbc, &hstmtCount) != SQL_SUCCESS) + if (!queryOnly) + { + // Allocate a separate statement handle for performing inserts + if (SQLAllocStmt(hdbc, &hstmtInsert) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + // Allocate a separate statement handle for performing deletes + if (SQLAllocStmt(hdbc, &hstmtDelete) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + // Allocate a separate statement handle for performing updates + if (SQLAllocStmt(hdbc, &hstmtUpdate) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + } + // Allocate a separate statement handle for internal use + if (SQLAllocStmt(hdbc, &hstmtInternal) != SQL_SUCCESS) pDb->DispAllErrors(henv, hdbc); // Set the cursor type for the statement handles - UDWORD cursorType = SQL_CURSOR_STATIC; - if (SQLSetStmtOption(c1, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) + cursorType = SQL_CURSOR_STATIC; + if (SQLSetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) { // Check to see if cursor type is supported - pDb->GetNextError(henv, hdbc, c1); + pDb->GetNextError(henv, hdbc, hstmtInternal); if (! strcmp(pDb->sqlState, "01S02")) // Option Value Changed { // Datasource does not support static cursors. Driver // will substitute a cursor type. Call SQLGetStmtOption() // to determine which cursor type was selected. - if (SQLGetStmtOption(c1, SQL_CURSOR_TYPE, &cursorType) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, c1); -#ifdef _CONSOLE + if (SQLGetStmtOption(hstmtInternal, SQL_CURSOR_TYPE, &cursorType) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc, hstmtInternal); +#ifdef DBDEBUG_CONSOLE cout << "Static cursor changed to: "; switch(cursorType) { @@ -153,72 +207,101 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols, const char * else { pDb->DispNextError(); - pDb->DispAllErrors(henv, hdbc, c1); + pDb->DispAllErrors(henv, hdbc, hstmtInternal); } } -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE else cout << "Cursor Type set to STATIC" << endl << endl; #endif - if (SQLSetStmtOption(c0, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, c0); - if (SQLSetStmtOption(c2, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, c2); -// if (SQLSetStmtOption(c3, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc, c3); -// if (SQLSetStmtOption(c4, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc, c4); -// if (SQLSetStmtOption(c5, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc, c5); - - // Set the cursor type for the INSERT statement handle - if (SQLSetStmtOption(hstmtInsert, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, hstmtInsert); - // Set the cursor type for the DELETE statement handle - if (SQLSetStmtOption(hstmtDelete, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, hstmtDelete); - // Set the cursor type for the UPDATE statement handle - if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, hstmtUpdate); - // Set the cursor type for the COUNT(*) statement handle - if (SQLSetStmtOption(hstmtCount, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, hstmtCount); - - // Copy cursor 1 to the default cursor - hstmt = c1; - currCursorNo = DB_CURSOR1; + if (!queryOnly) + { + // Set the cursor type for the INSERT statement handle + if (SQLSetStmtOption(hstmtInsert, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc, hstmtInsert); + // Set the cursor type for the DELETE statement handle + if (SQLSetStmtOption(hstmtDelete, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc, hstmtDelete); + // Set the cursor type for the UPDATE statement handle + if (SQLSetStmtOption(hstmtUpdate, SQL_CURSOR_TYPE, SQL_CURSOR_FORWARD_ONLY) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc, hstmtUpdate); + } + + // Make the default cursor the active cursor + hstmtDefault = NewCursor(FALSE,FALSE); + assert(hstmtDefault); + hstmt = *hstmtDefault; } // wxTable::wxTable() /********** wxTable::~wxTable() **********/ wxTable::~wxTable() { + char s[80]; + if (pDb) + { + sprintf(s, "wxTable destructor (%-20s) tableID:[%6lu] pDb:[%p]", tableName,tableID,pDb); + pDb->WriteSqlLog(s); + } + +#ifndef PROGRAM_FP4UPG +#if __WXDEBUG__ > 0 + if (tableID) + { + bool found = FALSE; + wxNode *pNode; + pNode = TablesInUse.First(); + while (pNode && !found) + { + if (((CstructTablesInUse *)pNode->Data())->tableID == tableID) + { + found = TRUE; + if (!TablesInUse.DeleteNode(pNode)) + wxMessageBox (s,"Unable to delete node!"); + } + else + pNode = pNode->Next(); + } + if (!found) + { + char msg[250]; + sprintf(msg,"Unable to find the tableID in the linked\nlist of tables in use.\n\n%s",s); + wxMessageBox (msg,"NOTICE..."); + } + } +#endif +#endif + // Decrement the wxDB table count + if (pDb) + pDb->nTables--; + // Delete memory allocated for column definitions if (colDefs) delete [] colDefs; // Free statement handles - if (SQLFreeStmt(c0, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLFreeStmt(c1, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLFreeStmt(c2, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); -// if (SQLFreeStmt(c3, SQL_DROP) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc); -// if (SQLFreeStmt(c4, SQL_DROP) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc); -// if (SQLFreeStmt(c5, SQL_DROP) != SQL_SUCCESS) -// pDb->DispAllErrors(henv, hdbc); - if (SQLFreeStmt(hstmtInsert, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLFreeStmt(hstmtDelete, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLFreeStmt(hstmtUpdate, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); - if (SQLFreeStmt(hstmtCount, SQL_DROP) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc); + if (!queryOnly) + { + if (hstmtInsert) + if (SQLFreeStmt(hstmtInsert, SQL_DROP) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + if (hstmtDelete) + if (SQLFreeStmt(hstmtDelete, SQL_DROP) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + if (hstmtUpdate) + if (SQLFreeStmt(hstmtUpdate, SQL_DROP) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + } + if (hstmtInternal) + if (SQLFreeStmt(hstmtInternal, SQL_DROP) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc); + + // Delete dynamically allocated cursors + if (hstmtDefault) + DeleteCursor(hstmtDefault); + if (hstmtCount) + DeleteCursor(hstmtCount); } // wxTable::~wxTable() @@ -232,7 +315,7 @@ bool wxTable::Open(void) char sqlStmt[DB_MAX_STATEMENT_LEN]; // Verify that the table exists in the database - if (!pDb->TableExists(tableName)) + if (!pDb->TableExists(tableName,NULL,tablePath)) { char s[128]; sprintf(s, "Error opening '%s', table/view does not exist in the database.", tableName); @@ -242,25 +325,23 @@ bool wxTable::Open(void) // Bind the member variables for field exchange between // the wxTable object and the ODBC record. - if(! bindInsertParams()) // Inserts - return(FALSE); - if(! bindUpdateParams()) // Updates - return(FALSE); - if(! bindCols(c0)) // Selects - return(FALSE); - if(! bindCols(c1)) + if (!queryOnly) + { + if (!bindInsertParams()) // Inserts + return(FALSE); + if (!bindUpdateParams()) // Updates + return(FALSE); + } + if (!bindCols(*hstmtDefault)) // Selects return(FALSE); - if(! bindCols(c2)) + if (!bindCols(hstmtInternal)) // Internal use only return(FALSE); -// if(! bindCols(c3)) -// return(FALSE); -// if(! bindCols(c4)) -// return(FALSE); -// if(! bindCols(c5)) -// return(FALSE); + /* + * Do NOT bind the hstmtCount cursor!!! + */ // Build an insert statement using parameter markers - if (noCols > 0) + if (!queryOnly && noCols > 0) { bool needComma = FALSE; sprintf(sqlStmt, "INSERT INTO %s (", tableName); @@ -286,7 +367,7 @@ bool wxTable::Open(void) } strcat(sqlStmt, ")"); - pDb->WriteSqlLog(sqlStmt); +// pDb->WriteSqlLog(sqlStmt); // Prepare the insert statement for execution if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt, SQL_NTS) != SQL_SUCCESS) @@ -355,8 +436,10 @@ bool wxTable::query(int queryType, bool forUpdate, bool distinct, char *pSqlStmt return(FALSE); // Execute the SQL SELECT statement - if (SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt : sqlStmt), - SQL_NTS) != SQL_SUCCESS) + int retcode; + + retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt : sqlStmt), SQL_NTS); + if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO) return(pDb->DispAllErrors(henv, hdbc, hstmt)); // Completed successfully @@ -385,7 +468,8 @@ void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct) appendFromClause = TRUE; // Add the column list - for (int i = 0; i < noCols; i++) + int i; + for (i = 0; i < noCols; i++) { // If joining tables, the base table column names must be qualified to avoid ambiguity if (appendFromClause) @@ -416,6 +500,15 @@ void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct) // Append the FROM tablename portion strcat(pSqlStmt, " FROM "); strcat(pSqlStmt, queryTableName); + + // Sybase uses the HOLDLOCK keyword to lock a record during query. + // The HOLDLOCK keyword follows the table name in the from clause. + // Each table in the from clause must specify HOLDLOCK or + // NOHOLDLOCK (the default). Note: The "FOR UPDATE" clause + // is parsed but ignored in SYBASE Transact-SQL. + if (selectForUpdate && (pDb->Dbms() == dbmsSYBASE_ASA || pDb->Dbms() == dbmsSYBASE_ASE)) + strcat(pSqlStmt, " HOLDLOCK"); + if (appendFromClause) strcat(pSqlStmt, from); @@ -455,7 +548,9 @@ void wxTable::GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct) strcat(pSqlStmt, orderBy); } - // SELECT FOR UPDATE if told to do so and the datasource is capable + // SELECT FOR UPDATE if told to do so and the datasource is capable. Sybase + // parses the FOR UPDATE clause but ignores it. See the comment above on the + // HOLDLOCK for Sybase. if (selectForUpdate && CanSelectForUpdate()) strcat(pSqlStmt, " FOR UPDATE"); @@ -477,11 +572,15 @@ bool wxTable::getRec(UWORD fetchType) return(pDb->DispAllErrors(henv, hdbc, hstmt)); #else // Fetch the next record from the record set - if ((retcode = SQLFetch(hstmt)) != SQL_SUCCESS) + + retcode = SQLFetch(hstmt); + if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO) + { if (retcode == SQL_NO_DATA_FOUND) return(FALSE); else return(pDb->DispAllErrors(henv, hdbc, hstmt)); + } #endif // Completed successfully @@ -494,7 +593,7 @@ UWORD wxTable::GetRowNum(void) { UDWORD rowNum; - if (SQLGetStmtOption(hstmt, SQL_ROW_NUMBER, &rowNum) != SQL_SUCCESS) + if (SQLGetStmtOption(hstmt, SQL_ROW_NUMBER, (UCHAR*) &rowNum) != SQL_SUCCESS) { pDb->DispAllErrors(henv, hdbc, hstmt); return(0); @@ -508,12 +607,17 @@ UWORD wxTable::GetRowNum(void) /********** wxTable::bindInsertParams() **********/ bool wxTable::bindInsertParams(void) { - SWORD fSqlType; - UDWORD precision; - SWORD scale; + assert(!queryOnly); + if (queryOnly) + return(FALSE); + + SWORD fSqlType = 0; + UDWORD precision = 0; + SWORD scale = 0; // Bind each column (that can be inserted) of the table to a parameter marker - for (int i = 0; i < noCols; i++) + int i; + for (i = 0; i < noCols; i++) { if (! colDefs[i].InsertAllowed) continue; @@ -549,8 +653,14 @@ bool wxTable::bindInsertParams(void) colDefs[i].CbValue = 0; break; } + // Null values + if (colDefs[i].Null) + { + colDefs[i].CbValue = SQL_NULL_DATA; + colDefs[i].Null = FALSE; + } if (SQLBindParameter(hstmtInsert, i+1, SQL_PARAM_INPUT, colDefs[i].SqlCtype, - fSqlType, precision, scale, colDefs[i].PtrDataObj, + fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, precision+1,&colDefs[i].CbValue) != SQL_SUCCESS) return(pDb->DispAllErrors(henv, hdbc, hstmtInsert)); } @@ -563,12 +673,17 @@ bool wxTable::bindInsertParams(void) /********** wxTable::bindUpdateParams() **********/ bool wxTable::bindUpdateParams(void) { - SWORD fSqlType; - UDWORD precision; - SWORD scale; + assert(!queryOnly); + if (queryOnly) + return(FALSE); + + SWORD fSqlType = 0; + UDWORD precision = 0; + SWORD scale = 0; // Bind each UPDATEABLE column of the table to a parameter marker - for (int i = 0, colNo = 1; i < noCols; i++) + int i,colNo; + for (i = 0, colNo = 1; i < noCols; i++) { if (! colDefs[i].Updateable) continue; @@ -605,7 +720,7 @@ bool wxTable::bindUpdateParams(void) break; } if (SQLBindParameter(hstmtUpdate, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype, - fSqlType, precision, scale, colDefs[i].PtrDataObj, + fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj, precision+1, &colDefs[i].CbValue) != SQL_SUCCESS) return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate)); } @@ -621,9 +736,10 @@ bool wxTable::bindCols(HSTMT cursor) static SDWORD cb; // Bind each column of the table to a memory address for fetching data - for (int i = 0; i < noCols; i++) + int i; + for (i = 0; i < noCols; i++) { - if (SQLBindCol(cursor, i+1, colDefs[i].SqlCtype, colDefs[i].PtrDataObj, + if (SQLBindCol(cursor, i+1, colDefs[i].SqlCtype, (UCHAR*) colDefs[i].PtrDataObj, colDefs[i].SzDataObj, &cb) != SQL_SUCCESS) return(pDb->DispAllErrors(henv, hdbc, cursor)); } @@ -645,7 +761,7 @@ bool wxTable::CloseCursor(HSTMT cursor) } // wxTable::CloseCursor() /********** wxTable::CreateTable() **********/ -bool wxTable::CreateTable(void) +bool wxTable::CreateTable(bool attemptDrop) { if (!pDb) return FALSE; @@ -653,39 +769,16 @@ bool wxTable::CreateTable(void) int i, j; char sqlStmt[DB_MAX_STATEMENT_LEN]; -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE cout << "Creating Table " << tableName << "..." << endl; #endif - // Drop the table first - sprintf(sqlStmt, "DROP TABLE %s", tableName); - 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. - pDb->GetNextError(henv, hdbc, hstmt); - if (strcmp(pDb->sqlState, "S0002") && strcmp(pDb->sqlState, "42000")) - { - pDb->DispNextError(); - pDb->DispAllErrors(henv, hdbc, hstmt); - pDb->RollbackTrans(); - CloseCursor(hstmt); - return(FALSE); - } - } - - pDb->WriteSqlLog(sqlStmt); - - // Commit the transaction and close the cursor - if (! pDb->CommitTrans()) - return(FALSE); - if (! CloseCursor(hstmt)) - return(FALSE); + // Drop table first + if (attemptDrop && !DropTable()) + return FALSE; // Create the table -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE for (i = 0; i < noCols; i++) { // Exclude derived columns since they are NOT part of the base table @@ -747,6 +840,15 @@ bool wxTable::CreateTable(void) sprintf(s, "(%d)", colDefs[i].SzDataObj); strcat(sqlStmt, s); } + + if (pDb->Dbms() == dbmsSYBASE_ASE || pDb->Dbms() == dbmsMY_SQL) + { + if (colDefs[i].KeyField) + { + strcat(sqlStmt, " NOT NULL"); + } + } + needComma = TRUE; } // If there is a primary key defined, include it in the create statement @@ -758,11 +860,20 @@ bool wxTable::CreateTable(void) break; } } - if (j) // Found a keyfield + if (j && pDb->Dbms() != dbmsDBASE) // Found a keyfield { - strcat(sqlStmt, ",CONSTRAINT "); - strcat(sqlStmt, tableName); - strcat(sqlStmt, "_PIDX PRIMARY KEY ("); + if (pDb->Dbms() != dbmsMY_SQL) + { + strcat(sqlStmt, ",CONSTRAINT "); + strcat(sqlStmt, tableName); + strcat(sqlStmt, "_PIDX PRIMARY KEY ("); + } + else + { + /* MySQL goes out on this one. We also declare the relevant key NON NULL above */ + strcat(sqlStmt, ", PRIMARY KEY ("); + } + // List column name(s) of column(s) comprising the primary key for (i = j = 0; i < noCols; i++) { @@ -780,7 +891,7 @@ bool wxTable::CreateTable(void) pDb->WriteSqlLog(sqlStmt); -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE cout << endl << sqlStmt << endl; #endif @@ -804,11 +915,62 @@ bool wxTable::CreateTable(void) } // wxTable::CreateTable() +/********** wxTable::DropTable() **********/ +bool wxTable::DropTable() +{ + // NOTE: This function returns TRUE if the Table 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 TABLE %s", tableName); + + pDb->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 + pDb->GetNextError(henv, hdbc, hstmt); + if (strcmp(pDb->sqlState,"S0002")) // "Base table not found" + { + // Check for product specific error codes + if (!((pDb->Dbms() == dbmsSYBASE_ASA && !strcmp(pDb->sqlState,"42000")) || // 5.x (and lower?) + (pDb->Dbms() == dbmsMY_SQL && !strcmp(pDb->sqlState,"S1000")) || // untested + (pDb->Dbms() == dbmsPOSTGRES && !strcmp(pDb->sqlState,"08S01")))) // untested + { + pDb->DispNextError(); + pDb->DispAllErrors(henv, hdbc, hstmt); + pDb->RollbackTrans(); + CloseCursor(hstmt); + return(FALSE); + } + } + } + + // Commit the transaction and close the cursor + if (! pDb->CommitTrans()) + return(FALSE); + if (! CloseCursor(hstmt)) + return(FALSE); + + return(TRUE); +} // wxTable::DropTable() + /********** wxTable::CreateIndex() **********/ -bool wxTable::CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs) +bool wxTable::CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop) { char sqlStmt[DB_MAX_STATEMENT_LEN]; + // Drop the index first + if (attemptDrop && !DropIndex(idxName)) + return (FALSE); + // Build a CREATE INDEX statement strcpy(sqlStmt, "CREATE "); if (unique) @@ -821,13 +983,19 @@ bool wxTable::CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *p strcat(sqlStmt, " ("); // Append list of columns making up index - for (int i = 0; i < noIdxCols; i++) + int i; + for (i = 0; i < noIdxCols; i++) { strcat(sqlStmt, pIdxDefs[i].ColName); - if (pIdxDefs[i].Ascending) - strcat(sqlStmt, " ASC"); - else - strcat(sqlStmt, " DESC"); + /* Postgres doesn't cope with ASC */ + if (pDb->Dbms() != dbmsPOSTGRES) + { + if (pIdxDefs[i].Ascending) + strcat(sqlStmt, " ASC"); + else + strcat(sqlStmt, " DESC"); + } + if ((i + 1) < noIdxCols) strcat(sqlStmt, ","); } @@ -837,7 +1005,7 @@ bool wxTable::CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *p pDb->WriteSqlLog(sqlStmt); -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE cout << endl << sqlStmt << endl << endl; #endif @@ -861,11 +1029,72 @@ bool wxTable::CreateIndex(char * idxName, bool unique, int noIdxCols, CidxDef *p } // wxTable::CreateIndex() +/********** wxTable::DropIndex() **********/ +bool wxTable::DropIndex(char * idxName) +{ + // NOTE: This function returns TRUE if the Index 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]; + + if (pDb->Dbms() == dbmsACCESS) + sprintf(sqlStmt, "DROP INDEX %s ON %s",idxName,tableName); + else if (pDb->Dbms() == dbmsSYBASE_ASE) + sprintf(sqlStmt, "DROP INDEX %s.%s",tableName,idxName); + else + sprintf(sqlStmt, "DROP INDEX %s",idxName); + + pDb->WriteSqlLog(sqlStmt); + +#ifdef DBDEBUG_CONSOLE + cout << endl << sqlStmt << endl; +#endif + + if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt, SQL_NTS) != SQL_SUCCESS) + { + // Check for "Index not found" error and ignore + pDb->GetNextError(henv, hdbc, hstmt); + if (strcmp(pDb->sqlState,"S0012")) // "Index not found" + { + // Check for product specific error codes + if (!((pDb->Dbms() == dbmsSYBASE_ASA && !strcmp(pDb->sqlState,"42000")) || // v5.x (and lower?) + (pDb->Dbms() == dbmsSYBASE_ASE && !strcmp(pDb->sqlState,"S0002")) || // Base table not found + (pDb->Dbms() == dbmsMY_SQL && !strcmp(pDb->sqlState,"42S02")) // untested + )) + { + pDb->DispNextError(); + pDb->DispAllErrors(henv, hdbc, hstmt); + pDb->RollbackTrans(); + CloseCursor(hstmt); + return(FALSE); + } + } + } + + // Commit the transaction and close the cursor + if (! pDb->CommitTrans()) + return(FALSE); + if (! CloseCursor(hstmt)) + return(FALSE); + + return(TRUE); +} // wxTable::DropIndex() + /********** wxTable::Insert() **********/ int wxTable::Insert(void) { + assert(!queryOnly); + if (queryOnly) + return(DB_FAILURE); + + bindInsertParams(); + // Insert the record by executing the already prepared insert statement - if (SQLExecute(hstmtInsert) != SQL_SUCCESS) + RETCODE retcode; + retcode=SQLExecute(hstmtInsert); + if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO) { // Check to see if integrity constraint was violated pDb->GetNextError(henv, hdbc, hstmtInsert); @@ -887,6 +1116,10 @@ int wxTable::Insert(void) /********** wxTable::Update(pSqlStmt) **********/ bool wxTable::Update(char *pSqlStmt) { + assert(!queryOnly); + if (queryOnly) + return(FALSE); + pDb->WriteSqlLog(pSqlStmt); return(execUpdate(pSqlStmt)); @@ -896,6 +1129,10 @@ bool wxTable::Update(char *pSqlStmt) /********** wxTable::Update() **********/ bool wxTable::Update(void) { + assert(!queryOnly); + if (queryOnly) + return(FALSE); + char sqlStmt[DB_MAX_STATEMENT_LEN]; // Build the SQL UPDATE statement @@ -903,7 +1140,7 @@ bool wxTable::Update(void) pDb->WriteSqlLog(sqlStmt); -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE cout << endl << sqlStmt << endl << endl; #endif @@ -915,6 +1152,10 @@ bool wxTable::Update(void) /********** wxTable::UpdateWhere() **********/ bool wxTable::UpdateWhere(char *pWhereClause) { + assert(!queryOnly); + if (queryOnly) + return(FALSE); + char sqlStmt[DB_MAX_STATEMENT_LEN]; // Build the SQL UPDATE statement @@ -922,7 +1163,7 @@ bool wxTable::UpdateWhere(char *pWhereClause) pDb->WriteSqlLog(sqlStmt); -#ifdef _CONSOLE +#ifdef DBDEBUG_CONSOLE cout << endl << sqlStmt << endl << endl; #endif @@ -934,6 +1175,10 @@ bool wxTable::UpdateWhere(char *pWhereClause) /********** wxTable::Delete() **********/ bool wxTable::Delete(void) { + assert(!queryOnly); + if (queryOnly) + return(FALSE); + char sqlStmt[DB_MAX_STATEMENT_LEN]; // Build the SQL DELETE statement @@ -949,6 +1194,10 @@ bool wxTable::Delete(void) /********** wxTable::DeleteWhere() **********/ bool wxTable::DeleteWhere(char *pWhereClause) { + assert(!queryOnly); + if (queryOnly) + return(FALSE); + char sqlStmt[DB_MAX_STATEMENT_LEN]; // Build the SQL DELETE statement @@ -964,6 +1213,10 @@ bool wxTable::DeleteWhere(char *pWhereClause) /********** wxTable::DeleteMatching() **********/ bool wxTable::DeleteMatching(void) { + assert(!queryOnly); + if (queryOnly) + return(FALSE); + char sqlStmt[DB_MAX_STATEMENT_LEN]; // Build the SQL DELETE statement @@ -1003,6 +1256,10 @@ bool wxTable::execUpdate(char *pSqlStmt) /********** wxTable::GetUpdateStmt() **********/ void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, char *pWhereClause) { + assert(!queryOnly); + if (queryOnly) + return; + char whereClause[DB_MAX_WHERE_CLAUSE_LEN]; bool firstColumn = TRUE; @@ -1010,7 +1267,8 @@ void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, char *pWhereClause) sprintf(pSqlStmt, "UPDATE %s SET ", tableName); // Append a list of columns to be updated - for (int i = 0; i < noCols; i++) + int i; + for (i = 0; i < noCols; i++) { // Only append Updateable columns if (colDefs[i].Updateable) @@ -1031,7 +1289,7 @@ void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, char *pWhereClause) case DB_UPD_KEYFIELDS: // If the datasource supports the ROWID column, build // the where on ROWID for efficiency purposes. - // e.g. UPDATE PARTS SET C1 = ?, C2 = ? WHERE ROWID = '111.222.333' + // e.g. UPDATE PARTS SET Col1 = ?, Col2 = ? WHERE ROWID = '111.222.333' if (CanUpdByROWID()) { SDWORD cb; @@ -1040,7 +1298,7 @@ void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, char *pWhereClause) // Get the ROWID value. If not successful retreiving the ROWID, // simply fall down through the code and build the WHERE clause // based on the key fields. - if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, rowid, ROWID_LEN, &cb) == SQL_SUCCESS) + if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, (UCHAR*) rowid, ROWID_LEN, &cb) == SQL_SUCCESS) { strcat(pSqlStmt, "ROWID = '"); strcat(pSqlStmt, rowid); @@ -1063,6 +1321,10 @@ void wxTable::GetUpdateStmt(char *pSqlStmt, int typeOfUpd, char *pWhereClause) /********** wxTable::GetDeleteStmt() **********/ void wxTable::GetDeleteStmt(char *pSqlStmt, int typeOfDel, char *pWhereClause) { + assert(!queryOnly); + if (queryOnly) + return; + char whereClause[DB_MAX_WHERE_CLAUSE_LEN]; whereClause[0] = 0; @@ -1092,7 +1354,7 @@ void wxTable::GetDeleteStmt(char *pSqlStmt, int typeOfDel, char *pWhereClause) // Get the ROWID value. If not successful retreiving the ROWID, // simply fall down through the code and build the WHERE clause // based on the key fields. - if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, rowid, ROWID_LEN, &cb) == SQL_SUCCESS) + if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, (UCHAR*) rowid, ROWID_LEN, &cb) == SQL_SUCCESS) { strcat(pSqlStmt, "ROWID = '"); strcat(pSqlStmt, rowid); @@ -1128,7 +1390,8 @@ void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere, char *qualTabl char colValue[255]; // Loop through the columns building a where clause as you go - for (int i = 0; i < noCols; i++) + int i; + for (i = 0; i < noCols; i++) { // Determine if this column should be included in the WHERE clause if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[i].KeyField) || @@ -1213,9 +1476,11 @@ bool wxTable::IsColNull(int colNo) } // wxTable::IsColNull() /********** wxTable::CanSelectForUpdate() **********/ - bool wxTable::CanSelectForUpdate(void) { + if (pDb->Dbms() == dbmsMY_SQL) + return FALSE; + if (pDb->dbInf.posStmts & SQL_PS_SELECT_FOR_UPDATE) return(TRUE); else @@ -1231,7 +1496,7 @@ bool wxTable::CanUpdByROWID(void) // as the ROWID is not getting updated correctly return FALSE; - if ((! strcmp(pDb->dbInf.dbmsName, "Oracle")) || (! strcmp(pDb->dbInf.dbmsName, "ORACLE"))) + if (pDb->Dbms() == dbmsORACLE) return(TRUE); else return(FALSE); @@ -1252,7 +1517,8 @@ bool wxTable::IsCursorClosedOnCommit(void) void wxTable::ClearMemberVars(void) { // Loop through the columns setting each member variable to zero - for (int i = 0; i < noCols; i++) + int i; + for (i = 0; i < noCols; i++) { switch(colDefs[i].SqlCtype) { @@ -1296,26 +1562,14 @@ void wxTable::ClearMemberVars(void) /********** wxTable::SetQueryTimeout() **********/ bool wxTable::SetQueryTimeout(UDWORD nSeconds) { - if (SQLSetStmtOption(c0, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) - return(pDb->DispAllErrors(henv, hdbc, c0)); - if (SQLSetStmtOption(c1, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) - return(pDb->DispAllErrors(henv, hdbc, c1)); - if (SQLSetStmtOption(c2, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) - return(pDb->DispAllErrors(henv, hdbc, c2)); -// if (SQLSetStmtOption(c3, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) -// return(pDb->DispAllErrors(henv, hdbc, c3)); -// if (SQLSetStmtOption(c4, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) -// return(pDb->DispAllErrors(henv, hdbc, c4)); -// if (SQLSetStmtOption(c5, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) -// return(pDb->DispAllErrors(henv, hdbc, c5)); if (SQLSetStmtOption(hstmtInsert, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) return(pDb->DispAllErrors(henv, hdbc, hstmtInsert)); if (SQLSetStmtOption(hstmtUpdate, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate)); if (SQLSetStmtOption(hstmtDelete, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) return(pDb->DispAllErrors(henv, hdbc, hstmtDelete)); - if (SQLSetStmtOption(hstmtCount, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) - return(pDb->DispAllErrors(henv, hdbc, hstmtCount)); + if (SQLSetStmtOption(hstmtInternal, SQL_QUERY_TIMEOUT, nSeconds) != SQL_SUCCESS) + return(pDb->DispAllErrors(henv, hdbc, hstmtInternal)); // Completed Successfully return(TRUE); @@ -1327,10 +1581,13 @@ void wxTable::SetColDefs (int index, char *fieldName, int dataType, void *pData, int cType, int size, bool keyField, bool upd, bool insAllow, bool derivedCol) { - if (strlen(fieldName) > DB_MAX_COLUMN_NAME_LEN) // glt 4/21/97 + if (!colDefs) // May happen if the database connection fails + return; + + if (strlen(fieldName) > (unsigned int) DB_MAX_COLUMN_NAME_LEN) { strncpy (colDefs[index].ColName, fieldName, DB_MAX_COLUMN_NAME_LEN); - colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0; // glt 10/23/97 + colDefs[index].ColName[DB_MAX_COLUMN_NAME_LEN] = 0; } else strcpy(colDefs[index].ColName, fieldName); @@ -1352,52 +1609,18 @@ void wxTable::SetColDefs (int index, char *fieldName, int dataType, void *pData, colDefs[index].Updateable = upd; colDefs[index].InsertAllowed = insAllow; } + + colDefs[index].Null = FALSE; } // wxTable::SetColDefs() /********** wxTable::SetCursor() **********/ -bool wxTable::SetCursor(int cursorNo) +void wxTable::SetCursor(HSTMT *hstmtActivate) { - switch(cursorNo) - { - case DB_CURSOR0: - hstmt = c0; - // currCursorNo doesn't change since Cursor0 is a temp cursor - break; - case DB_CURSOR1: - hstmt = c1; - currCursorNo = DB_CURSOR1; - break; - case DB_CURSOR2: - hstmt = c2; - currCursorNo = DB_CURSOR2; - break; -// case DB_CURSOR3: -// hstmt = c3; -// currCursorNo = DB_CURSOR3; -// break; -// case DB_CURSOR4: -// hstmt = c4; -// currCursorNo = DB_CURSOR4; -// break; -// case DB_CURSOR5: -// hstmt = c5; -// currCursorNo = DB_CURSOR5; -// break; - default: - return(FALSE); - } - - // Refresh the current record -#ifndef FWD_ONLY_CURSORS - UDWORD cRowsFetched; - UWORD rowStatus; - SQLExtendedFetch(hstmt, SQL_FETCH_NEXT, 0, &cRowsFetched, &rowStatus); - SQLExtendedFetch(hstmt, SQL_FETCH_PRIOR, 0, &cRowsFetched, &rowStatus); -#endif - - // Completed successfully - return(TRUE); + if (hstmtActivate == DEFAULT_CURSOR) + hstmt = *hstmtDefault; + else + hstmt = *hstmtActivate; } // wxTable::SetCursor() @@ -1424,30 +1647,39 @@ ULONG wxTable::Count(void) pDb->WriteSqlLog(sqlStmt); + // Initialize the Count cursor if it's not already initialized + if (!hstmtCount) + { + hstmtCount = NewCursor(FALSE,FALSE); + assert(hstmtCount); + if (!hstmtCount) + return(0); + } + // Execute the SQL statement - if (SQLExecDirect(hstmtCount, (UCHAR FAR *) sqlStmt, SQL_NTS) != SQL_SUCCESS) + if (SQLExecDirect(*hstmtCount, (UCHAR FAR *) sqlStmt, SQL_NTS) != SQL_SUCCESS) { - pDb->DispAllErrors(henv, hdbc, hstmtCount); + pDb->DispAllErrors(henv, hdbc, *hstmtCount); return(0); } // Fetch the record - if (SQLFetch(hstmtCount) != SQL_SUCCESS) + if (SQLFetch(*hstmtCount) != SQL_SUCCESS) { - pDb->DispAllErrors(henv, hdbc, hstmtCount); + pDb->DispAllErrors(henv, hdbc, *hstmtCount); return(0); } // Obtain the result - if (SQLGetData(hstmtCount, 1, SQL_C_ULONG, &l, sizeof(l), &cb) != SQL_SUCCESS) + if (SQLGetData(*hstmtCount, 1, SQL_C_ULONG, &l, sizeof(l), &cb) != SQL_SUCCESS) { - pDb->DispAllErrors(henv, hdbc, hstmtCount); + pDb->DispAllErrors(henv, hdbc, *hstmtCount); return(0); } // Free the cursor - if (SQLFreeStmt(hstmtCount, SQL_CLOSE) != SQL_SUCCESS) - pDb->DispAllErrors(henv, hdbc, hstmtCount); + if (SQLFreeStmt(*hstmtCount, SQL_CLOSE) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc, *hstmtCount); // Return the record count return(l); @@ -1459,10 +1691,9 @@ bool wxTable::Refresh(void) { bool result = TRUE; - // Switch to cursor 0 - int cursorNo = GetCursor(); - if (!SetCursor()) - return(FALSE); + // Switch to the internal cursor so any active cursors are not corrupted + HSTMT currCursor = GetCursor(); + hstmt = hstmtInternal; // Save the where and order by clauses char *saveWhere = where; @@ -1480,7 +1711,7 @@ bool wxTable::Refresh(void) // Get the ROWID value. If not successful retreiving the ROWID, // simply fall down through the code and build the WHERE clause // based on the key fields. - if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, rowid, ROWID_LEN, &cb) == SQL_SUCCESS) + if (SQLGetData(hstmt, noCols+1, SQL_C_CHAR, (UCHAR*) rowid, ROWID_LEN, &cb) == SQL_SUCCESS) { strcat(whereClause, queryTableName); strcat(whereClause, ".ROWID = '"); @@ -1503,8 +1734,11 @@ bool wxTable::Refresh(void) result = FALSE; // Switch back to original cursor - if (!SetCursor(cursorNo)) - result = FALSE; + SetCursor(&currCursor); + + // Free the internal cursor + if (SQLFreeStmt(hstmtInternal, SQL_CLOSE) != SQL_SUCCESS) + pDb->DispAllErrors(henv, hdbc, hstmtInternal); // Restore the original where and order by clauses where = saveWhere; @@ -1514,6 +1748,90 @@ bool wxTable::Refresh(void) } // wxTable::Refresh() -#endif - // wxUSE_ODBC +/********** wxTable::SetNull(UINT colNo) **********/ +bool wxTable::SetNull(int colNo) +{ + if (colNo < noCols) + return(colDefs[colNo].Null = TRUE); + else + return(FALSE); + +} // wxTable::SetNull(UINT colNo) + +/********** wxTable::SetNull(char *colName) **********/ +bool wxTable::SetNull(char *colName) +{ + int i; + for (i = 0; i < noCols; i++) + { + if (!stricmp(colName, colDefs[i].ColName)) + break; + } + + if (i < noCols) + return(colDefs[i].Null = TRUE); + else + return(FALSE); + +} // wxTable::SetNull(char *colName) + +/********** wxTable::NewCursor() **********/ +HSTMT *wxTable::NewCursor(bool setCursor, bool bindColumns) +{ + HSTMT *newHSTMT = new HSTMT; + assert(newHSTMT); + if (!newHSTMT) + return(0); + + if (SQLAllocStmt(hdbc, newHSTMT) != SQL_SUCCESS) + { + pDb->DispAllErrors(henv, hdbc); + delete newHSTMT; + return(0); + } + + if (SQLSetStmtOption(*newHSTMT, SQL_CURSOR_TYPE, cursorType) != SQL_SUCCESS) + { + pDb->DispAllErrors(henv, hdbc, *newHSTMT); + delete newHSTMT; + return(0); + } + + if (bindColumns) + { + if(!bindCols(*newHSTMT)) + { + delete newHSTMT; + return(0); + } + } + + if (setCursor) + SetCursor(newHSTMT); + + return(newHSTMT); + +} // wxTable::NewCursor() + +/********** wxTable::DeleteCursor() **********/ +bool wxTable::DeleteCursor(HSTMT *hstmtDel) +{ + bool result = TRUE; + + if (!hstmtDel) // Cursor already deleted + return(result); + + if (SQLFreeStmt(*hstmtDel, SQL_DROP) != SQL_SUCCESS) + { + pDb->DispAllErrors(henv, hdbc); + result = FALSE; + } + + delete hstmtDel; + + return(result); + +} // wxTable::DeleteCursor() + +#endif // wxUSE_ODBC