// 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
-// 2) All enhancements and bug fixes are to be submitted back to the wxWindows
-// user groups free of all charges for use with the wxWindows library.
+// wxWidgets-based application
+// 2) All enhancements and bug fixes are to be submitted back to the wxWidgets
+// user groups free of all charges for use with the wxWidgets library.
// 3) These classes may not be distributed as part of any other class library,
// DLL, text (written or electronic), other than a complete distribution of
-// the wxWindows GUI development toolkit.
+// the wxWidgets GUI development toolkit.
///////////////////////////////////////////////////////////////////////////////
/*
#ifdef __WXDEBUG__
if (tableID)
{
- TablesInUse.DeleteContents(TRUE);
bool found = FALSE;
- wxNode *pNode;
+ wxList::compatibility_iterator pNode;
pNode = TablesInUse.GetFirst();
while (pNode && !found)
{
if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
{
found = TRUE;
- if (!TablesInUse.DeleteNode(pNode))
- wxLogDebug (s,wxT("Unable to delete node!"));
+ delete (wxTablesInUse *)pNode->GetData();
+ TablesInUse.Erase(pNode);
}
else
pNode = pNode->GetNext();
/***************************** PRIVATE FUNCTIONS *****************************/
-bool wxDbTable::setCbValueForColumn(int columnIndex)
+void wxDbTable::setCbValueForColumn(int columnIndex)
{
switch(colDefs[columnIndex].DbDataType)
{
if (colDefs[columnIndex].Null)
colDefs[columnIndex].CbValue = SQL_NULL_DATA;
else
- if (colDefs[columnIndex].SqlCtype == SQL_C_BINARY)
- colDefs[columnIndex].CbValue = 0;
- else if (colDefs[columnIndex].SqlCtype == SQL_C_CHAR)
- colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(0);
+ if (colDefs[columnIndex].SqlCtype == SQL_C_CHAR)
+ colDefs[columnIndex].CbValue = SQL_NTS;
else
colDefs[columnIndex].CbValue = SQL_LEN_DATA_AT_EXEC(colDefs[columnIndex].SzDataObj);
break;
break;
case DB_DATA_TYPE_BLOB:
fSqlType = pDb->GetTypeInfBlob().FsqlType;
- precision = -1;
+ precision = colDefs[i].SzDataObj;
scale = 0;
break;
}
{
if (SQLBindParameter(hstmtInsert, colNo++, SQL_PARAM_INPUT, colDefs[i].SqlCtype,
fSqlType, precision, scale, (UCHAR*) colDefs[i].PtrDataObj,
- precision+1,&colDefs[i].CbValue) != SQL_SUCCESS)
+ precision+1, &colDefs[i].CbValue) != SQL_SUCCESS)
{
return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
}
break;
}
}
+ retcode = SQLParamData(hstmtUpdate, &pParmID);
}
if (retcode == SQL_SUCCESS ||
retcode == SQL_NO_DATA_FOUND ||
return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
}
else
- insertable= FALSE;
+ insertable = FALSE;
}
// Completed successfully
{
tStr = colDefs[i].ColName;
// If joining tables, the base table column names must be qualified to avoid ambiguity
- if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && !tStr.Find(wxT('.')))
+ if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && tStr.Find(wxT('.')) == wxNOT_FOUND)
{
pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
pSqlStmt += wxT(".");
// Concatenate where phrase for the column
wxString tStr = colDefs[colNo].ColName;
- if (qualTableName.Length() && !tStr.Find(wxT('.')))
+ if (qualTableName.Length() && tStr.Find(wxT('.')) == wxNOT_FOUND)
{
pWhereClause += pDb->SQLTableName(qualTableName);
pWhereClause += wxT(".");
wxString strMsg;
strMsg.Printf(wxT("wxDbTable::bindParams(): Unknown column type for colDefs %d colName %s"),
colNo,colDefs[colNo].ColName);
- wxFAIL_MSG(wxT(strMsg));
+ wxFAIL_MSG(strMsg.c_str());
}
break;
}
break;
}
}
+ retcode = SQLParamData(hstmtInsert, &pParmID);
+ if (retcode != SQL_SUCCESS &&
+ retcode != SQL_SUCCESS_WITH_INFO)
+ {
+ // record was not inserted
+ pDb->DispNextError();
+ pDb->DispAllErrors(henv, hdbc, hstmtInsert);
+ return(DB_FAILURE);
+ }
}
}
if (set) // Blank out the values in the member variable
ClearMemberVar(colNo, FALSE); // Must call with FALSE here, or infinite recursion will happen
- setCbValueForColumn(i);
+ setCbValueForColumn(colNo);
return(TRUE);
}
if (set) // Blank out the values in the member variable
ClearMemberVar(colNo,FALSE); // Must call with FALSE here, or infinite recursion will happen
- setCbValueForColumn(i);
+ setCbValueForColumn(colNo);
return(TRUE);
}