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

Cleaned up the API for class/structure/function names to follow the wxWindows conventions (mostly prefixing wx to all of them). Backward compatability is maintained by keeping the old names calling the new functions, or typedef-ing the old names to the new names. The old names can be totally disabled at the end of the file by changing the #if 1 block that surrounds the old names

Browse Source 
Undid RRs last change, as it breaks backward compatabilty with using this class with 1.6x (GetData() is still a supported function, and is used in dozens of other places in this file, so it could not have broken compilation).
Added a param to GetWhereClause() so that now the LIKE operator can be applied to strings rather than EQUAL


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6765 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2000-03-16 18:59:40 +00:00
parent ab0f03868e
commit 8128349e81
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/common/dbtable.cpp
View File

@@ -147,8 +147,8 @@ wxTable::wxTable(wxDB *pwxDB, const char *tblName, const int nCols,
s.sprintf("wxTable constructor (%-20s) tableID:[%6lu] pDb:[%p]", tblName,tableID,pDb);
#ifdef __WXDEBUG__
CstructTablesInUse *tableInUse;
tableInUse = new CstructTablesInUse();
wxTablesInUse *tableInUse;
tableInUse = new wxTablesInUse();
tableInUse->tableName = tblName;
tableInUse->tableID = tableID;
tableInUse->pDb = pDb;
@@ -263,11 +263,11 @@ wxTable::~wxTable()
pNode = TablesInUse.First();
while (pNode && !found)
{
if (((CstructTablesInUse *)pNode->Data())->tableID == tableID)
if (((wxTablesInUse *)pNode->Data())->tableID == tableID)
{
found = TRUE;
if (!TablesInUse.DeleteNode(pNode))
wxLogDebug (s.c_str(),"Unable to delete node!");
wxLogDebug (s.GetData(),"Unable to delete node!");
}
else
pNode = pNode->Next();
@@ -1094,7 +1094,7 @@ bool wxTable::DropTable()
/********** wxTable::CreateIndex() **********/
bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, CidxDef *pIdxDefs, bool attemptDrop)
bool wxTable::CreateIndex(const char * idxName, bool unique, int noIdxCols, wxIdxDef *pIdxDefs, bool attemptDrop)
{
// char sqlStmt[DB_MAX_STATEMENT_LEN];
wxString sqlStmt;
@@ -1497,7 +1497,8 @@ void wxTable::GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereCla
/********** wxTable::GetWhereClause() **********/
void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName)
void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere,
const char *qualTableName, bool useLikeComparison)
/*
* Note: GetWhereClause() currently ignores timestamp columns.
* They are not included as part of the where clause.
@@ -1529,7 +1530,10 @@ void wxTable::GetWhereClause(char *pWhereClause, int typeOfWhere, const char *qu
wxStrcat(pWhereClause, ".");
}
wxStrcat(pWhereClause, colDefs[i].ColName);
wxStrcat(pWhereClause, " = ");
if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
wxStrcat(pWhereClause, " LIKE ");
else
wxStrcat(pWhereClause, " = ");
switch(colDefs[i].SqlCtype)
{
case SQL_C_CHAR: