Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed problem where if a table had no insertable columns, construction of the insertion statemtent would fail, which then would cause unstable behavior at a later time. Now if Insert() is called and there are no insertable columns, insert will return a failure.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7446 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2000-05-21 10:49:22 +00:00
parent c160361dcf
commit cf5d275eb8
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/dbtable.h
View File

@@ -98,6 +98,7 @@ private:
// Private member variables // Private member variables
UDWORD cursorType; UDWORD cursorType;
bool insertable;
// Private member functions // Private member functions
bool bindInsertParams(void); bool bindInsertParams(void);

17
src/common/dbtable.cpp
View File

@@ -623,7 +623,6 @@ bool wxDbTable::Open(void)
return FALSE; return FALSE;
int i; int i;
wxString sqlStmt; wxString sqlStmt;
// Verify that the table exists in the database // Verify that the table exists in the database
if (!pDb->TableExists(tableName,pDb->GetUsername(),tablePath)) if (!pDb->TableExists(tableName,pDb->GetUsername(),tablePath))
@@ -659,7 +658,6 @@ bool wxDbTable::Open(void)
if (!bindCols(hstmtInternal)) // Internal use only if (!bindCols(hstmtInternal)) // Internal use only
return(FALSE); return(FALSE);
/* /*
* Do NOT bind the hstmtCount cursor!!! * Do NOT bind the hstmtCount cursor!!!
*/ */
@@ -680,6 +678,9 @@ bool wxDbTable::Open(void)
} }
needComma = FALSE; needComma = FALSE;
sqlStmt += ") VALUES ("; sqlStmt += ") VALUES (";
int insertableCount = 0;
for (i = 0; i < noCols; i++) for (i = 0; i < noCols; i++)
{ {
if (! colDefs[i].InsertAllowed) if (! colDefs[i].InsertAllowed)
@@ -688,14 +689,20 @@ bool wxDbTable::Open(void)
sqlStmt += ","; sqlStmt += ",";
sqlStmt += "?"; sqlStmt += "?";
needComma = TRUE; needComma = TRUE;
insertableCount++;
} }
sqlStmt += ")"; sqlStmt += ")";
// pDb->WriteSqlLog(sqlStmt); // pDb->WriteSqlLog(sqlStmt);
// Prepare the insert statement for execution // Prepare the insert statement for execution
if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS) if (insertableCount)
return(pDb->DispAllErrors(henv, hdbc, hstmtInsert)); {
if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
}
else
insertable= false;
} }
// Completed successfully // Completed successfully
@@ -1282,7 +1289,7 @@ bool wxDbTable::DropIndex(const char * idxName)
int wxDbTable::Insert(void) int wxDbTable::Insert(void)
{ {
assert(!queryOnly); assert(!queryOnly);
if (queryOnly) if (queryOnly || !insertable)
return(DB_FAILURE); return(DB_FAILURE);
bindInsertParams(); bindInsertParams();