// SYNOPSIS START
// SYNOPSIS STOP
*/
-#ifdef __GNUG__
+
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dbtable.h"
#endif
#include "wx/object.h"
#include "wx/list.h"
#include "wx/utils.h"
- #if wxUSE_GUI
- #include "wx/msgdlg.h"
- #endif
#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(char *target, const char *source, int n)
+{
+ while ( (*target++ = *source++) != '\0' && --n )
+ ;
+
+ *target = '\0';
+}
+
+
+
/********** wxDbColDef::wxDbColDef() Constructor **********/
wxDbColDef::wxDbColDef()
{
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;
// Record updated successfully
return(TRUE);
}
+ else if (retcode == SQL_NEED_DATA)
+ {
+ PTR pParmID;
+ while ((retcode = SQLParamData(hstmtUpdate, &pParmID) == 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));
// 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 += pDb->SQLTableName(queryTableName.c_str());
-// pSqlStmt += queryTableName;
pSqlStmt += wxT(".");
}
pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
-// pSqlStmt += colDefs[i].ColName;
if (i + 1 < noCols)
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 += pDb->SQLTableName(qualTableName);
-// pWhereClause += qualTableName;
pWhereClause += wxT(".");
}
- pWhereClause += pDb->SQLColumnName(colDefs[i].ColName);
-// 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;
break;
}
}
- if (j && pDb->Dbms() != dbmsDBASE) // Found a keyfield
+ if (j && (pDb->Dbms() != dbmsDBASE)
+ && (pDb->Dbms() != dbmsXBASE_SEQUITER)
+ ) // Found a keyfield
{
switch (pDb->Dbms())
{
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)) &&
!(pDb->Dbms() == dbmsPOSTGRES))
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());
// 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;
+ while ((retcode = SQLParamData(hstmtInsert, &pParmID) == 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);
{
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()
} // wxDbTable::GetCol()
-void csstrncpyt(char *s, const char *t, int n)
-{
- while ((*s++ = *t++) && --n)
- {};
-
- *s = '\0';
-}
-
void wxDbTable::SetCol(const int colNo, const wxVariant val)
{
//FIXME: Add proper wxDateTime support to wxVariant..
projects / wxWidgets.git / blobdiff