not necessary anymore

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

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index cf3860dfcfb1fcf1cbea72be97ecb60f5b7c2244..03d947568a02750862c11b3ae5e54e3927571228 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -528,15 +528,16 @@ bool wxDbTable::bindUpdateParams(void)
 /********** wxDbTable::bindCols() **********/
 bool wxDbTable::bindCols(HSTMT cursor)
 {
+    static SDWORD cb;
+
     // Bind each column of the table to a memory address for fetching data
     UWORD i;
     for (i = 0; i < noCols; i++)
     {
+        cb = colDefs[i].CbValue;
         if (SQLBindCol(cursor, (UWORD)(i+1), colDefs[i].SqlCtype, (UCHAR*) colDefs[i].PtrDataObj,
-                       colDefs[i].SzDataObj, &colDefs[i].CbValue ) != SQL_SUCCESS)
-        {
+                       colDefs[i].SzDataObj, &cb ) != SQL_SUCCESS)
           return (pDb->DispAllErrors(henv, hdbc, cursor));
-        }
     }
 
     // Completed successfully
@@ -1416,7 +1417,9 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             break;
         }
     }
-    if (j && pDb->Dbms() != dbmsDBASE)  // Found a keyfield
+    if (j && (pDb->Dbms() != dbmsDBASE) 
+                 && (pDb->Dbms() != dbmsXBASE_SEQUITER)
+          )  // Found a keyfield
     {
         switch (pDb->Dbms())
         {
@@ -1710,7 +1713,8 @@ bool wxDbTable::DropIndex(const wxString &idxName)
                        pDb->SQLTableName(idxName.c_str()).c_str(),
                        pDb->SQLTableName(tableName.c_str()).c_str());
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
-             (pDb->Dbms() == dbmsSYBASE_ASE))
+             (pDb->Dbms() == dbmsSYBASE_ASE) ||
+                        (pDb->Dbms() == dbmsXBASE_SEQUITER))
         sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
                        pDb->SQLTableName(tableName.c_str()).c_str(),
                        pDb->SQLTableName(idxName.c_str()).c_str());
@@ -2118,6 +2122,9 @@ void wxDbTable::SetColDefs(UWORD index, const wxString &fieldName, int dataType,
                            SWORD cType, int size, bool keyField, bool upd,
                            bool insAllow, bool derivedCol)
 {
+    wxASSERT_MSG( index < noCols,
+                  _T("Specified column index exceeds the maximum number of columns for this table.") );
+
     if (!colDefs)  // May happen if the database connection fails
         return;