// SYNOPSIS START
// SYNOPSIS STOP
*/
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dbtable.h"
#endif
#endif
#ifdef DBDEBUG_CONSOLE
- #include "iostream.h"
+#if wxUSE_IOSTREAMH
+ #include <iostream.h>
+#else
+ #include <iostream>
+#endif
#include "wx/ioswrap.h"
#endif
#include "wx/object.h"
#include "wx/list.h"
#include "wx/utils.h"
- #include "wx/msgdlg.h"
#include "wx/log.h"
#endif
#include "wx/filefn.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-//#include <assert.h>
#include "wx/dbtable.h"
#endif
+void csstrncpyt(wxChar *target, const wxChar *source, int n)
+{
+ while ( (*target++ = *source++) != '\0' && --n )
+ ;
+
+ *target = '\0';
+}
+
+
+
/********** wxDbColDef::wxDbColDef() Constructor **********/
wxDbColDef::wxDbColDef()
{
bool found = FALSE;
wxNode *pNode;
- pNode = TablesInUse.First();
+ pNode = TablesInUse.GetFirst();
while (pNode && !found)
{
- if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
+ if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
{
found = TRUE;
if (!TablesInUse.DeleteNode(pNode))
wxLogDebug (s,wxT("Unable to delete node!"));
}
else
- pNode = pNode->Next();
+ pNode = pNode->GetNext();
}
if (!found)
{
return(FALSE);
SWORD fSqlType = 0;
- UDWORD precision = 0;
+ SDWORD precision = 0;
SWORD scale = 0;
// Bind each column of the table that should be bound
break;
case DB_DATA_TYPE_BLOB:
fSqlType = pDb->GetTypeInfBlob().FsqlType;
- precision = 50000;
+ precision = -1;
scale = 0;
if (colDefs[i].Null)
colDefs[i].CbValue = SQL_NULL_DATA;
/********** 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
RETCODE retcode;
// Execute the DELETE statement
- retcode = SQLExecDirect(hstmtDelete, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
+ retcode = SQLExecDirect(hstmtDelete, (SQLTCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
if (retcode == SQL_SUCCESS ||
retcode == SQL_NO_DATA_FOUND ||
RETCODE retcode;
// Execute the UPDATE statement
- retcode = SQLExecDirect(hstmtUpdate, (UCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
+ retcode = SQLExecDirect(hstmtUpdate, (SQLTCHAR FAR *) pSqlStmt.c_str(), SQL_NTS);
if (retcode == SQL_SUCCESS ||
retcode == SQL_NO_DATA_FOUND ||
// Record updated successfully
return(TRUE);
}
+ else if (retcode == SQL_NEED_DATA)
+ {
+ PTR pParmID;
+ retcode = SQLParamData(hstmtUpdate, &pParmID);
+ while (retcode == SQL_NEED_DATA)
+ {
+ // Find the parameter
+ int i;
+ for (i=0; i < noCols; i++)
+ {
+ if (colDefs[i].PtrDataObj == pParmID)
+ {
+ // We found it. Store the parameter.
+ retcode = SQLPutData(hstmtUpdate, pParmID, colDefs[i].SzDataObj);
+ if (retcode != SQL_SUCCESS)
+ {
+ pDb->DispNextError();
+ return pDb->DispAllErrors(henv, hdbc, hstmtUpdate);
+ }
+ break;
+ }
+ }
+ }
+ if (retcode == SQL_SUCCESS ||
+ retcode == SQL_NO_DATA_FOUND ||
+ retcode == SQL_SUCCESS_WITH_INFO)
+ {
+ // Record updated successfully
+ return(TRUE);
+ }
+ }
// Problem updating record
return(pDb->DispAllErrors(henv, hdbc, hstmtUpdate));
// Execute the SQL SELECT statement
int retcode;
- retcode = SQLExecDirect(hstmt, (UCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt.c_str() : sqlStmt.c_str()), SQL_NTS);
+ retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) (queryType == DB_SELECT_STATEMENT ? pSqlStmt.c_str() : sqlStmt.c_str()), SQL_NTS);
if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
return(pDb->DispAllErrors(henv, hdbc, hstmt));
if (!queryOnly && noCols > 0)
{
bool needComma = FALSE;
- sqlStmt.Printf(wxT("INSERT INTO %s ("), tableName.c_str());
+ sqlStmt.Printf(wxT("INSERT INTO %s ("),
+ pDb->SQLTableName(tableName.c_str()).c_str());
for (i = 0; i < noCols; i++)
{
if (! colDefs[i].InsertAllowed)
continue;
if (needComma)
sqlStmt += wxT(",");
- sqlStmt += colDefs[i].ColName;
+ sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+// sqlStmt += colDefs[i].ColName;
needComma = TRUE;
}
needComma = FALSE;
// Prepare the insert statement for execution
if (insertableCount)
{
- if (SQLPrepare(hstmtInsert, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+ if (SQLPrepare(hstmtInsert, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
}
else
// delete all records from the database in this case.
if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0))
{
- pSqlStmt.Printf(wxT("DELETE FROM %s"), tableName.c_str());
+ pSqlStmt.Printf(wxT("DELETE FROM %s"),
+ pDb->SQLTableName(tableName.c_str()).c_str());
return;
}
- pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "), tableName.c_str());
+ pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "),
+ pDb->SQLTableName(tableName.c_str()).c_str());
// Append the WHERE clause to the SQL DELETE statement
switch(typeOfDel)
// Add the column list
int i;
+ wxString tStr;
for (i = 0; i < noCols; i++)
{
+ tStr = colDefs[i].ColName;
// If joining tables, the base table column names must be qualified to avoid ambiguity
- if (appendFromClause || pDb->Dbms() == dbmsACCESS)
+ if ((appendFromClause || pDb->Dbms() == dbmsACCESS) && !tStr.Find(wxT('.')))
{
- pSqlStmt += queryTableName;
+ pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
pSqlStmt += wxT(".");
}
- pSqlStmt += colDefs[i].ColName;
+ pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
if (i + 1 < noCols)
pSqlStmt += wxT(",");
}
if (appendFromClause || pDb->Dbms() == dbmsACCESS)
{
pSqlStmt += wxT(",");
- pSqlStmt += queryTableName;
+ pSqlStmt += pDb->SQLTableName(queryTableName);
+// pSqlStmt += queryTableName;
pSqlStmt += wxT(".ROWID");
}
else
// Append the FROM tablename portion
pSqlStmt += wxT(" FROM ");
- pSqlStmt += queryTableName;
+ pSqlStmt += pDb->SQLTableName(queryTableName);
+// pSqlStmt += queryTableName;
// Sybase uses the HOLDLOCK keyword to lock a record during query.
// The HOLDLOCK keyword follows the table name in the from clause.
bool firstColumn = TRUE;
- pSqlStmt.Printf(wxT("UPDATE %s SET "), tableName.Upper().c_str());
+ pSqlStmt.Printf(wxT("UPDATE %s SET "),
+ pDb->SQLTableName(tableName.c_str()).c_str());
// Append a list of columns to be updated
int i;
pSqlStmt += wxT(",");
else
firstColumn = FALSE;
- pSqlStmt += colDefs[i].ColName;
+
+ pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+// pSqlStmt += colDefs[i].ColName;
pSqlStmt += wxT(" = ?");
}
}
wxString colValue;
// Loop through the columns building a where clause as you go
- int i;
- for (i = 0; i < noCols; i++)
+ int colNo;
+ for (colNo = 0; colNo < noCols; colNo++)
{
// Determine if this column should be included in the WHERE clause
- if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[i].KeyField) ||
- (typeOfWhere == DB_WHERE_MATCHING && (!IsColNull(i))))
+ if ((typeOfWhere == DB_WHERE_KEYFIELDS && colDefs[colNo].KeyField) ||
+ (typeOfWhere == DB_WHERE_MATCHING && (!IsColNull(colNo))))
{
// Skip over timestamp columns
- if (colDefs[i].SqlCtype == SQL_C_TIMESTAMP)
+ if (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP)
continue;
// If there is more than 1 column, join them with the keyword "AND"
if (moreThanOneColumn)
pWhereClause += wxT(" AND ");
else
moreThanOneColumn = TRUE;
+
// Concatenate where phrase for the column
- if (qualTableName.Length())
+ wxString tStr = colDefs[colNo].ColName;
+
+ if (qualTableName.Length() && !tStr.Find(wxT('.')))
{
- pWhereClause += qualTableName;
+ pWhereClause += pDb->SQLTableName(qualTableName);
pWhereClause += wxT(".");
}
- pWhereClause += colDefs[i].ColName;
- if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
+ pWhereClause += pDb->SQLColumnName(colDefs[colNo].ColName);
+
+ if (useLikeComparison && (colDefs[colNo].SqlCtype == SQL_C_CHAR))
pWhereClause += wxT(" LIKE ");
else
pWhereClause += wxT(" = ");
- switch(colDefs[i].SqlCtype)
+
+ switch(colDefs[colNo].SqlCtype)
{
case SQL_C_CHAR:
- colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[i].PtrDataObj);
+ colValue.Printf(wxT("'%s'"), (UCHAR FAR *) colDefs[colNo].PtrDataObj);
break;
case SQL_C_SSHORT:
- colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[i].PtrDataObj));
+ colValue.Printf(wxT("%hi"), *((SWORD *) colDefs[colNo].PtrDataObj));
break;
case SQL_C_USHORT:
- colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[i].PtrDataObj));
+ colValue.Printf(wxT("%hu"), *((UWORD *) colDefs[colNo].PtrDataObj));
break;
case SQL_C_SLONG:
- colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[i].PtrDataObj));
+ colValue.Printf(wxT("%li"), *((SDWORD *) colDefs[colNo].PtrDataObj));
break;
case SQL_C_ULONG:
- colValue.Printf(wxT("%lu"), *((UDWORD *) colDefs[i].PtrDataObj));
+ colValue.Printf(wxT("%lu"), *((UDWORD *) colDefs[colNo].PtrDataObj));
break;
case SQL_C_FLOAT:
- colValue.Printf(wxT("%.6f"), *((SFLOAT *) colDefs[i].PtrDataObj));
+ colValue.Printf(wxT("%.6f"), *((SFLOAT *) colDefs[colNo].PtrDataObj));
break;
case SQL_C_DOUBLE:
- colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[i].PtrDataObj));
+ colValue.Printf(wxT("%.6f"), *((SDOUBLE *) colDefs[colNo].PtrDataObj));
break;
}
pWhereClause += colValue;
// Build a CREATE TABLE string from the colDefs structure.
bool needComma = FALSE;
- sqlStmt.Printf(wxT("CREATE TABLE %s ("), tableName.c_str());
+
+ sqlStmt.Printf(wxT("CREATE TABLE %s ("),
+ pDb->SQLTableName(tableName.c_str()).c_str());
for (i = 0; i < noCols; i++)
{
if (needComma)
sqlStmt += wxT(",");
// Column Name
- sqlStmt += colDefs[i].ColName;
+ sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+// sqlStmt += colDefs[i].ColName;
sqlStmt += wxT(" ");
// Column Type
switch(colDefs[i].DbDataType)
break;
}
// For varchars, append the size of the string
- if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR)// ||
+ if (colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR &&
+ (pDb->Dbms() != dbmsMY_SQL || pDb->GetTypeInfVarchar().TypeName != _T("text")))// ||
// colDefs[i].DbDataType == DB_DATA_TYPE_BLOB)
{
wxString s;
break;
}
}
- if (j && pDb->Dbms() != dbmsDBASE) // Found a keyfield
+ if ( j && (pDb->Dbms() != dbmsDBASE)
+ && (pDb->Dbms() != dbmsXBASE_SEQUITER) ) // Found a keyfield
{
switch (pDb->Dbms())
{
+ case dbmsACCESS:
case dbmsINFORMIX:
case dbmsSYBASE_ASA:
case dbmsSYBASE_ASE:
if (pDb->Dbms() == dbmsDB2)
{
wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
- sqlStmt += tableName.substr(0, 13);
+ sqlStmt += pDb->SQLTableName(tableName.substr(0, 13).c_str());
+// sqlStmt += tableName.substr(0, 13);
}
else
- sqlStmt += tableName;
+ sqlStmt += pDb->SQLTableName(tableName.c_str());
+// sqlStmt += tableName;
sqlStmt += wxT("_PIDX PRIMARY KEY (");
break;
{
if (j++) // Multi part key, comma separate names
sqlStmt += wxT(",");
- sqlStmt += colDefs[i].ColName;
+ sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
+
+ if (pDb->Dbms() == dbmsMY_SQL &&
+ colDefs[i].DbDataType == DB_DATA_TYPE_VARCHAR)
+ {
+ wxString s;
+ s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+ sqlStmt += s;
+ }
}
}
sqlStmt += wxT(")");
pDb->Dbms() == dbmsSYBASE_ASE)
{
sqlStmt += wxT(" CONSTRAINT ");
- sqlStmt += tableName;
+ sqlStmt += pDb->SQLTableName(tableName);
+// sqlStmt += tableName;
sqlStmt += wxT("_PIDX");
}
}
#endif
// Execute the CREATE TABLE statement
- RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+ RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
{
pDb->DispAllErrors(henv, hdbc, hstmt);
wxString sqlStmt;
- sqlStmt.Printf(wxT("DROP TABLE %s"), tableName.c_str());
+ sqlStmt.Printf(wxT("DROP TABLE %s"),
+ pDb->SQLTableName(tableName.c_str()).c_str());
pDb->WriteSqlLog(sqlStmt);
cout << endl << sqlStmt.c_str() << endl;
#endif
-
-
-
- RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
+ RETCODE retcode = SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
if (retcode != SQL_SUCCESS)
{
// Check for "Base table not found" error and ignore
if (!ok)
{
+ #if 0
+ // retcode is not used
wxODBC_ERRORS retcode;
// Oracle returns a DB_ERR_GENERAL_ERROR if the column is already
// defined to be NOT NULL, but reportedly MySQL doesn't mind.
// This line is just here for debug checking of the value
retcode = (wxODBC_ERRORS)pDb->DB_STATUS;
+ #endif
}
}
else
sqlStmt += wxT("UNIQUE ");
sqlStmt += wxT("INDEX ");
- sqlStmt += idxName;
+ sqlStmt += pDb->SQLTableName(idxName);
sqlStmt += wxT(" ON ");
- sqlStmt += tableName;
+
+ sqlStmt += pDb->SQLTableName(tableName);
+// sqlStmt += tableName;
sqlStmt += wxT(" (");
// Append list of columns making up index
int i;
for (i = 0; i < noIdxCols; i++)
{
- sqlStmt += pIdxDefs[i].ColName;
+ sqlStmt += pDb->SQLColumnName(pIdxDefs[i].ColName);
+// sqlStmt += pIdxDefs[i].ColName;
+ // MySQL requires a key length on VARCHAR keys
+ if ( pDb->Dbms() == dbmsMY_SQL )
+ {
+ // Find the details on this column
+ int j;
+ for ( j = 0; j < noCols; ++j )
+ {
+ if ( wxStrcmp( pIdxDefs[i].ColName, colDefs[j].ColName ) == 0 )
+ {
+ break;
+ }
+ }
+ if ( colDefs[j].DbDataType == DB_DATA_TYPE_VARCHAR)
+ {
+ wxString s;
+ s.Printf(wxT("(%d)"), colDefs[i].SzDataObj);
+ sqlStmt += s;
+ }
+ }
+
// Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
- if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (strncmp(pDb->dbInf.dbmsVer,"07",2)==0)) &&
+ if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (wxStrncmp(pDb->dbInf.dbmsVer,_T("07"),2)==0)) &&
!(pDb->Dbms() == dbmsPOSTGRES))
{
if (pIdxDefs[i].Ascending)
sqlStmt += wxT(" DESC");
}
else
- wxASSERT_MSG(pIdxDefs[i].Ascending, "Datasource does not support DESCending index columns");
+ wxASSERT_MSG(pIdxDefs[i].Ascending, _T("Datasource does not support DESCending index columns"));
if ((i + 1) < noIdxCols)
sqlStmt += wxT(",");
#endif
// Execute the CREATE INDEX statement
- if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+ if (SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
{
pDb->DispAllErrors(henv, hdbc, hstmt);
pDb->RollbackTrans();
if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
- sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),idxName.c_str(), tableName.c_str());
+ sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),
+ 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))
- sqlStmt.Printf(wxT("DROP INDEX %s.%s"),tableName.c_str(), idxName.c_str());
+ (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());
else
- sqlStmt.Printf(wxT("DROP INDEX %s"),idxName.c_str());
+ sqlStmt.Printf(wxT("DROP INDEX %s"),
+ pDb->SQLTableName(idxName.c_str()).c_str());
pDb->WriteSqlLog(sqlStmt);
cout << endl << sqlStmt.c_str() << endl;
#endif
- if (SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+ if (SQLExecDirect(hstmt, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
{
// Check for "Index not found" error and ignore
pDb->GetNextError(henv, hdbc, hstmt);
// Insert the record by executing the already prepared insert statement
RETCODE retcode;
retcode=SQLExecute(hstmtInsert);
- if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
+ if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO &&
+ retcode != SQL_NEED_DATA)
{
// Check to see if integrity constraint was violated
pDb->GetNextError(henv, hdbc, hstmtInsert);
return(DB_FAILURE);
}
}
+ if (retcode == SQL_NEED_DATA)
+ {
+ PTR pParmID;
+ retcode = SQLParamData(hstmtInsert, &pParmID);
+ while (retcode == SQL_NEED_DATA)
+ {
+ // Find the parameter
+ int i;
+ for (i=0; i < noCols; i++)
+ {
+ if (colDefs[i].PtrDataObj == pParmID)
+ {
+ // We found it. Store the parameter.
+ retcode = SQLPutData(hstmtInsert, pParmID, colDefs[i].SzDataObj);
+ if (retcode != SQL_SUCCESS)
+ {
+ pDb->DispNextError();
+ pDb->DispAllErrors(henv, hdbc, hstmtInsert);
+ return(DB_FAILURE);
+ }
+ break;
+ }
+ }
+ }
+ }
// Record inserted into the datasource successfully
return(DB_SUCCESS);
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;
sqlStmt = wxT("SELECT COUNT(");
sqlStmt += args;
sqlStmt += wxT(") FROM ");
- sqlStmt += queryTableName;
+ sqlStmt += pDb->SQLTableName(queryTableName);
+// sqlStmt += queryTableName;
#if wxODBC_BACKWARD_COMPATABILITY
if (from && wxStrlen(from))
#else
}
// Execute the SQL statement
- if (SQLExecDirect(*hstmtCount, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
+ if (SQLExecDirect(*hstmtCount, (SQLTCHAR FAR *) sqlStmt.c_str(), SQL_NTS) != SQL_SUCCESS)
{
pDb->DispAllErrors(henv, hdbc, *hstmtCount);
return(0);
hstmt = hstmtInternal;
#if wxODBC_BACKWARD_COMPATABILITY
// Save the where and order by clauses
- char *saveWhere = where;
- char *saveOrderBy = orderBy;
+ wxChar *saveWhere = where;
+ wxChar *saveOrderBy = orderBy;
#else
wxString saveWhere = where;
wxString saveOrderBy = orderBy;
// based on the key fields.
if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
{
- whereClause += queryTableName;
+ whereClause += pDb->SQLTableName(queryTableName);
+// whereClause += queryTableName;
whereClause += wxT(".ROWID = '");
whereClause += rowid;
whereClause += wxT("'");
{
colDefs[colNo].Null = set;
if (set) // Blank out the values in the member variable
- ClearMemberVar(colNo,FALSE); // Must call with FALSE, or infinite recursion will happen
+ {
+ colDefs[colNo].CbValue = SQL_NULL_DATA; // SF PATCH#766404
+ ClearMemberVar(colNo,FALSE); // Must call with FALSE, or infinite recursion will happen
+ }
return(TRUE);
}
else
/********** wxDbTable::SetColNull() **********/
bool wxDbTable::SetColNull(const wxString &colName, bool set)
{
- int i;
- for (i = 0; i < noCols; i++)
+ int colNo;
+ for (colNo = 0; colNo < noCols; colNo++)
{
- if (!wxStricmp(colName, colDefs[i].ColName))
+ if (!wxStricmp(colName, colDefs[colNo].ColName))
break;
}
- if (i < noCols)
+ if (colNo < noCols)
{
- colDefs[i].Null = set;
+ colDefs[colNo].Null = set;
if (set) // Blank out the values in the member variable
- ClearMemberVar(i,FALSE); // Must call with FALSE, or infinite recursion will happen
+ {
+ colDefs[colNo].CbValue = SQL_NULL_DATA; // SF PATCH#766404
+ ClearMemberVar(colNo,FALSE); // Must call with FALSE, or infinite recursion will happen
+ }
return(TRUE);
}
else
SetCursor(hstmtDefault);
break;
default:
- assert(0);
+ wxASSERT(0);
}
} // wxDbTable::SetRowMode()
-wxVariant wxDbTable::GetCol(const int col) const
+wxVariant wxDbTable::GetCol(const int colNo) const
{
wxVariant val;
- if ((col < noCols) && (!IsColNull(col)))
+ if ((colNo < noCols) && (!IsColNull(colNo)))
{
- switch (colDefs[col].SqlCtype)
+ switch (colDefs[colNo].SqlCtype)
{
case SQL_CHAR:
case SQL_VARCHAR:
- val = (char *)(colDefs[col].PtrDataObj);
+ val = (wxChar *)(colDefs[colNo].PtrDataObj);
break;
case SQL_C_LONG:
case SQL_C_SLONG:
- val = *(long *)(colDefs[col].PtrDataObj);
+ val = *(long *)(colDefs[colNo].PtrDataObj);
break;
case SQL_C_SHORT:
case SQL_C_SSHORT:
- val = (long int )(*(short *)(colDefs[col].PtrDataObj));
+ val = (long int )(*(short *)(colDefs[colNo].PtrDataObj));
break;
case SQL_C_ULONG:
- val = (long)(*(unsigned long *)(colDefs[col].PtrDataObj));
+ val = (long)(*(unsigned long *)(colDefs[colNo].PtrDataObj));
break;
case SQL_C_TINYINT:
- val = (long)(*(char *)(colDefs[col].PtrDataObj));
+ val = (long)(*(wxChar *)(colDefs[colNo].PtrDataObj));
break;
case SQL_C_UTINYINT:
- val = (long)(*(unsigned char *)(colDefs[col].PtrDataObj));
+ val = (long)(*(wxChar *)(colDefs[colNo].PtrDataObj));
break;
case SQL_C_USHORT:
- val = (long)(*(UWORD *)(colDefs[col].PtrDataObj));
+ val = (long)(*(UWORD *)(colDefs[colNo].PtrDataObj));
break;
case SQL_C_DATE:
- val = (DATE_STRUCT *)(colDefs[col].PtrDataObj);
+ val = (DATE_STRUCT *)(colDefs[colNo].PtrDataObj);
break;
case SQL_C_TIME:
- val = (TIME_STRUCT *)(colDefs[col].PtrDataObj);
+ val = (TIME_STRUCT *)(colDefs[colNo].PtrDataObj);
break;
case SQL_C_TIMESTAMP:
- val = (TIMESTAMP_STRUCT *)(colDefs[col].PtrDataObj);
+ val = (TIMESTAMP_STRUCT *)(colDefs[colNo].PtrDataObj);
break;
case SQL_C_DOUBLE:
- val = *(double *)(colDefs[col].PtrDataObj);
+ val = *(double *)(colDefs[colNo].PtrDataObj);
break;
default:
assert(0);
} // wxDbTable::GetCol()
-void csstrncpyt(char *s, const char *t, int n)
-{
- while ((*s++ = *t++) && --n)
- {};
-
- *s = '\0';
-}
-
-void wxDbTable::SetCol(const int col, const wxVariant val)
+void wxDbTable::SetCol(const int colNo, const wxVariant val)
{
//FIXME: Add proper wxDateTime support to wxVariant..
wxDateTime dateval;
- SetColNull(col, val.IsNull());
+ SetColNull(colNo, val.IsNull());
if (!val.IsNull())
{
- if ((colDefs[col].SqlCtype == SQL_C_DATE)
- || (colDefs[col].SqlCtype == SQL_C_TIME)
- || (colDefs[col].SqlCtype == SQL_C_TIMESTAMP))
+ if ((colDefs[colNo].SqlCtype == SQL_C_DATE)
+ || (colDefs[colNo].SqlCtype == SQL_C_TIME)
+ || (colDefs[colNo].SqlCtype == SQL_C_TIMESTAMP))
{
//Returns null if invalid!
if (!dateval.ParseDate(val.GetString()))
- SetColNull(col,TRUE);
+ SetColNull(colNo, TRUE);
}
- switch (colDefs[col].SqlCtype)
+ switch (colDefs[colNo].SqlCtype)
{
case SQL_CHAR:
case SQL_VARCHAR:
- csstrncpyt((char *)(colDefs[col].PtrDataObj),
+ csstrncpyt((wxChar *)(colDefs[colNo].PtrDataObj),
val.GetString().c_str(),
- colDefs[col].SzDataObj-1);
+ colDefs[colNo].SzDataObj-1);
break;
case SQL_C_LONG:
case SQL_C_SLONG:
- *(long *)(colDefs[col].PtrDataObj) = val;
+ *(long *)(colDefs[colNo].PtrDataObj) = val;
break;
case SQL_C_SHORT:
case SQL_C_SSHORT:
- *(short *)(colDefs[col].PtrDataObj) = val.GetLong();
+ *(short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
break;
case SQL_C_ULONG:
- *(unsigned long *)(colDefs[col].PtrDataObj) = val.GetLong();
+ *(unsigned long *)(colDefs[colNo].PtrDataObj) = val.GetLong();
break;
case SQL_C_TINYINT:
- *(char *)(colDefs[col].PtrDataObj) = val.GetChar();
+ *(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();
break;
case SQL_C_UTINYINT:
- *(unsigned char *)(colDefs[col].PtrDataObj) = val.GetChar();
+ *(wxChar *)(colDefs[colNo].PtrDataObj) = val.GetChar();
break;
case SQL_C_USHORT:
- *(unsigned short *)(colDefs[col].PtrDataObj) = val.GetLong();
+ *(unsigned short *)(colDefs[colNo].PtrDataObj) = val.GetLong();
break;
//FIXME: Add proper wxDateTime support to wxVariant..
case SQL_C_DATE:
{
DATE_STRUCT *dataptr =
- (DATE_STRUCT *)colDefs[col].PtrDataObj;
+ (DATE_STRUCT *)colDefs[colNo].PtrDataObj;
dataptr->year = dateval.GetYear();
dataptr->month = dateval.GetMonth()+1;
case SQL_C_TIME:
{
TIME_STRUCT *dataptr =
- (TIME_STRUCT *)colDefs[col].PtrDataObj;
+ (TIME_STRUCT *)colDefs[colNo].PtrDataObj;
dataptr->hour = dateval.GetHour();
dataptr->minute = dateval.GetMinute();
case SQL_C_TIMESTAMP:
{
TIMESTAMP_STRUCT *dataptr =
- (TIMESTAMP_STRUCT *)colDefs[col].PtrDataObj;
+ (TIMESTAMP_STRUCT *)colDefs[colNo].PtrDataObj;
dataptr->year = dateval.GetYear();
dataptr->month = dateval.GetMonth()+1;
dataptr->day = dateval.GetDay();
}
break;
case SQL_C_DOUBLE:
- *(double *)(colDefs[col].PtrDataObj) = val;
+ *(double *)(colDefs[colNo].PtrDataObj) = val;
break;
default:
assert(0);
GenericKey wxDbTable::GetKey()
{
void *blk;
- char *blkptr;
+ wxChar *blkptr;
blk = malloc(m_keysize);
- blkptr = (char *) blk;
+ blkptr = (wxChar *) blk;
int i;
for (i=0; i < noCols; i++)
void wxDbTable::SetKey(const GenericKey& k)
{
- void *blk;
- char *blkptr;
+ void *blk;
+ wxChar *blkptr;
blk = k.GetBlk();
- blkptr = (char *)blk;
+ blkptr = (wxChar *)blk;
int i;
for (i=0; i < noCols; i++)
projects / wxWidgets.git / blobdiff