X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e7e5298cca88ec845ce24fda97732f13a7b7dc93..aac65598a1137a8a9d4d31155ba83833500aea4d:/include/wx/dbtable.h diff --git a/include/wx/dbtable.h b/include/wx/dbtable.h index 1de1597bf8..5db2af00bb 100644 --- a/include/wx/dbtable.h +++ b/include/wx/dbtable.h @@ -67,7 +67,7 @@ class WXDLLEXPORT wxDbColDef public: wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1]; // Column Name int DbDataType; // Logical Data Type; e.g. DB_DATA_TYPE_INTEGER - int SqlCtype; // C data type; e.g. SQL_C_LONG + SWORD SqlCtype; // C data type; e.g. SQL_C_LONG void *PtrDataObj; // Address of the data object int SzDataObj; // Size, in bytes, of the data object bool KeyField; // TRUE if this column is part of the PRIMARY KEY to the table; Date fields should NOT be KeyFields. @@ -76,6 +76,10 @@ public: bool DerivedCol; // Specifies whether this column is a derived value SDWORD CbValue; // Internal use only!!! bool Null; // NOT FULLY IMPLEMENTED - Allows NULL values in Inserts and Updates + + wxDbColDef(); + + bool Initialize(); }; // wxDbColDef @@ -84,7 +88,7 @@ class WXDLLEXPORT wxDbColDataPtr public: void *PtrDataObj; int SzDataObj; - int SqlCtype; + SWORD SqlCtype; }; // wxDbColDataPtr @@ -107,7 +111,7 @@ private: bool insertable; // Private member functions - bool initialize(wxDb *pwxDb, const wxString &tblName, const int nCols, + bool initialize(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns, const wxString &qryTblName, bool qryOnly, const wxString &tblPath); void cleanup(); @@ -119,7 +123,7 @@ private: bool getRec(UWORD fetchType); bool execDelete(const wxString &pSqlStmt); bool execUpdate(const wxString &pSqlStmt); - bool query(int queryType, bool forUpdate, bool distinct, const wxString &pSqlStmt=wxT("")); + bool query(int queryType, bool forUpdate, bool distinct, const wxString &pSqlStmt=wxEmptyString); #if !wxODBC_BACKWARD_COMPATABILITY // these were public @@ -149,7 +153,7 @@ private: wxString tablePath; // needed for dBase tables wxString tableName; // Table name wxString queryTableName; // Query Table Name - int noCols; // # of columns in the table + UWORD noCols; // # of columns in the table bool queryOnly; // Query Only, no inserts, updates or deletes // Column Definitions @@ -183,43 +187,42 @@ public: char tablePath[wxDB_PATH_MAX]; // needed for dBase tables char tableName[DB_MAX_TABLE_NAME_LEN+1]; // Table name char queryTableName[DB_MAX_TABLE_NAME_LEN+1]; // Query Table Name - int noCols; // # of columns in the table + UWORD noCols; // # of columns in the table bool queryOnly; // Query Only, no inserts, updates or deletes // Column Definitions wxDbColDef *colDefs; // Array of wxDbColDef structures #endif // Public member functions - wxDbTable(wxDb *pwxDb, const wxString &tblName, const int nCols, + wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns, const wxString &qryTblName="", bool qryOnly = !wxDB_QUERY_ONLY, const wxString &tblPath=""); // DEPRECATED - wxDbTable(wxDb *pwxDb, const wxString &tblName, const int nCols, + wxDbTable(wxDb *pwxDb, const wxString &tblName, const UWORD numColumns, const wxChar *qryTblName="", bool qryOnly = !wxDB_QUERY_ONLY, const wxString &tblPath=""); virtual ~wxDbTable(); - bool Open(bool checkPrivileges=FALSE); + bool Open(bool checkPrivileges=FALSE, bool checkTableExists=TRUE); bool CreateTable(bool attemptDrop=TRUE); bool DropTable(void); - bool CreateIndex(const wxString &idxName, bool unique, int noIdxCols, + bool CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCols, wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE); bool DropIndex(const wxString &idxName); // Accessors // The member variables returned by these accessors are all - // set when the wxDbTable instance is createand cannot be + // set when the wxDbTable instance is created and cannot be // changed, hence there is no corresponding SetXxxx function wxDb *GetDb() { return pDb; } const wxString &GetTableName() { return tableName; } const wxString &GetQueryTableName() { return queryTableName; } const wxString &GetTablePath() { return tablePath; } - int GetNumberOfColumns() { return noCols; } // number of "defined" columns for this wxDbTable instance - + UWORD GetNumberOfColumns() { return noCols; } // number of "defined" columns for this wxDbTable instance const wxString &GetFromClause() { return from; } const wxString &GetOrderByClause() { return orderBy; } @@ -233,7 +236,7 @@ public: #else void SetFromClause(const wxString &From) { from = From; } void SetOrderByClause(const wxString &OrderBy) { orderBy = OrderBy; } - bool SetOrderByColNums(int first, ...); + bool SetOrderByColNums(UWORD first, ...); void SetWhereClause(const wxString &Where) { where = Where; } void From(const wxString &From) { from = From; } void OrderBy(const wxString &OrderBy) { orderBy = OrderBy; } @@ -293,16 +296,16 @@ public: #endif bool CanSelectForUpdate(void); bool CanUpdByROWID(void); - void ClearMemberVar(int colNo, bool setToNull=FALSE); + void ClearMemberVar(UWORD colNo, bool setToNull=FALSE); void ClearMemberVars(bool setToNull=FALSE); bool SetQueryTimeout(UDWORD nSeconds); wxDbColDef *GetColDefs() { return colDefs; } - void SetColDefs(int index, const wxString &fieldName, int dataType, - void *pData, int cType, + void SetColDefs(UWORD index, const wxString &fieldName, int dataType, + void *pData, SWORD cType, int size, bool keyField = FALSE, bool upd = TRUE, bool insAllow = TRUE, bool derivedCol = FALSE); - wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, ULONG numCols); + wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, UWORD numCols); bool CloseCursor(HSTMT cursor); bool DeleteCursor(HSTMT *hstmtDel); @@ -317,8 +320,8 @@ public: ULONG Count(const wxString &args="*"); int DB_STATUS(void) { return(pDb->DB_STATUS); } - bool IsColNull(int colNo); - bool SetColNull(int colNo, bool set=TRUE); + bool IsColNull(UWORD colNo); + bool SetColNull(UWORD colNo, bool set=TRUE); bool SetColNull(const wxString &colName, bool set=TRUE); #if wxODBC_BACKWARD_COMPATABILITY // The following member functions are deprecated. You should use the SetColNull()