From 2b63ff5d388c5877733bf256ae29e9001de12136 Mon Sep 17 00:00:00 2001 From: George Tasker Date: Fri, 24 Nov 2000 16:43:36 +0000 Subject: [PATCH] Added SetOrderByColNums() function Changed 0s to NULLs for const char * params git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8802 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dbtable.h | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h index efb6b12d97..21f633e92d 100644 --- a/include/wx/dbtable.h +++ b/include/wx/dbtable.h @@ -50,6 +50,10 @@ const int wxDB_DEFAULT_CURSOR = 0; const bool wxDB_QUERY_ONLY = TRUE; const bool wxDB_DISABLE_VIEW = TRUE; +// Used to indicate end of a variable length list of +// column numbers passed to member functions +const int wxDB_NO_MORE_COLUMN_NUMBERS = -1; + // The following class is used to define a column of a table. // The wxDbTable constructor will dynamically allocate as many of // these as there are columns in the table. The class derived @@ -109,7 +113,7 @@ private: bool getRec(UWORD fetchType); bool execDelete(const char *pSqlStmt); bool execUpdate(const char *pSqlStmt); - bool query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = 0); + bool query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = NULL); #if !wxODBC_BACKWARD_COMPATABILITY // these were public @@ -181,7 +185,7 @@ public: #endif // Public member functions wxDbTable(wxDb *pwxDb, const char *tblName, const int nCols, - const char *qryTblName = 0, bool qryOnly = !wxDB_QUERY_ONLY, const char *tblPath=""); + const char *qryTblName = NULL, bool qryOnly = !wxDB_QUERY_ONLY, const char *tblPath=""); virtual ~wxDbTable(); bool Open(bool checkPrivileges=FALSE); @@ -215,6 +219,7 @@ public: #else void SetFromClause(const wxString& From) { from = From; } void SetOrderByClause(const wxString& OrderBy) { orderBy = OrderBy; } + bool SetOrderByColNums(int first, ...); void SetWhereClause(const wxString& Where) { where = Where; } void From(const wxString& From) { from = From; } void OrderBy(const wxString& OrderBy) { orderBy = OrderBy; } @@ -249,19 +254,19 @@ public: UWORD GetRowNum(void); void BuildSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct); - void BuildDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = 0); - void BuildUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = 0); - void BuildWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName = 0, bool useLikeComparison=FALSE); + void BuildDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = NULL); + void BuildUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = NULL); + void BuildWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName = NULL, bool useLikeComparison=FALSE); #if wxODBC_BACKWARD_COMPATABILITY // The following member functions are deprecated. You should use the BuildXxxxxStmt functions (above) void GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct) { BuildSelectStmt(pSqlStmt,typeOfSelect,distinct); } - void GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = 0) + void GetDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = NULL) { BuildDeleteStmt(pSqlStmt,typeOfDel,pWhereClause); } - void GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = 0) + void GetUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = NULL) { BuildUpdateStmt(pSqlStmt,typeOfUpd,pWhereClause); } void GetWhereClause(char *pWhereClause, int typeOfWhere, - const char *qualTableName = 0, bool useLikeComparison=FALSE) + const char *qualTableName = NULL, bool useLikeComparison=FALSE) { BuildWhereClause(pWhereClause,typeOfWhere,qualTableName,useLikeComparison); } #endif bool CanSelectForUpdate(void); -- 2.47.2