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

All char, char *, and char arrays changed to use wxChar or wxString. 99% backward compatability maintained

Browse Source 
Cleaned up code to remove duplicate blocks from multiple functions
Added better handling of failed creation of wxDbTable/wxDb objects
Moved code out of class constructors to a private function called from within the constructor
Moved destructor code to a cleanup() function so it could be called from within the constructor if the constructor failed.
Added wxDb::ModifyColumn() function.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-02-01 20:21:52 +00:00
parent 94613352b5
commit 4fdae9972d
4 changed files with 1192 additions and 1183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
include/wx/db.h
View File

@@ -118,8 +118,8 @@ enum enumDummy {enumDum1};
const int wxDB_PATH_MAX = 254; const int wxDB_PATH_MAX = 254;
extern char const *SQL_LOG_FILENAME; extern wxChar const *SQL_LOG_FILENAME;
extern char const *SQL_CATALOG_FILENAME; extern wxChar const *SQL_CATALOG_FILENAME;
// Database Globals // Database Globals
@@ -258,20 +258,20 @@ enum wxODBC_ERRORS
struct wxDbConnectInf struct wxDbConnectInf
{ {
HENV Henv; HENV Henv;
char Dsn[SQL_MAX_DSN_LENGTH+1]; // Data Source Name wxString Dsn; // Data Source Name
char Uid[20+1]; // User ID wxString Uid; // User ID
char AuthStr[20+1]; // Authorization string (password) wxString AuthStr; // Authorization string (password)
char description[SQL_MAX_DSN_LENGTH+1]; // Not sure what the max length is wxString description; // Not sure what the max length is
char fileType[SQL_MAX_DSN_LENGTH+1]; // Not sure what the max length is wxString fileType; // Not sure what the max length is
// Optionals needed for some databases like dBase // Optionals needed for some databases like dBase
char defaultDir[wxDB_PATH_MAX]; // Directory that db file resides in wxString defaultDir; // Directory that db file resides in
}; };
struct wxDbSqlTypeInfo struct wxDbSqlTypeInfo
{ {
char TypeName[DB_TYPE_NAME_LEN]; wxString TypeName;
int FsqlType; int FsqlType;
long Precision; long Precision;
short CaseSensitive; short CaseSensitive;
@@ -301,24 +301,24 @@ public:
class WXDLLEXPORT wxDbColInf class WXDLLEXPORT wxDbColInf
{ {
public: public:
char catalog[128+1]; wxChar catalog[128+1];
char schema[128+1]; wxChar schema[128+1];
char tableName[DB_MAX_TABLE_NAME_LEN+1]; wxChar tableName[DB_MAX_TABLE_NAME_LEN+1];
char colName[DB_MAX_COLUMN_NAME_LEN+1]; wxChar colName[DB_MAX_COLUMN_NAME_LEN+1];
SWORD sqlDataType; SWORD sqlDataType;
char typeName[128+1]; wxChar typeName[128+1];
SWORD columnSize; SWORD columnSize;
SWORD bufferLength; SWORD bufferLength;
short decimalDigits; short decimalDigits;
short numPrecRadix; short numPrecRadix;
short nullable; short nullable;
char remarks[254+1]; wxChar remarks[254+1];
int dbDataType; // conversion of the 'sqlDataType' to the generic data type used by these classes int dbDataType; // conversion of the 'sqlDataType' to the generic data type used by these classes
// mj10777.19991224 : new // mj10777.19991224 : new
int PkCol; // Primary key column 0=No; 1= First Key, 2 = Second Key etc. int PkCol; // Primary key column 0=No; 1= First Key, 2 = Second Key etc.
char PkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Tables that use this PKey as a FKey wxChar PkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Tables that use this PKey as a FKey
int FkCol; // Foreign key column 0=No; 1= First Key, 2 = Second Key etc. int FkCol; // Foreign key column 0=No; 1= First Key, 2 = Second Key etc.
char FkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Foreign key table name wxChar FkTableName[DB_MAX_TABLE_NAME_LEN+1]; // Foreign key table name
wxDbColFor *pColFor; // How should this columns be formatted wxDbColFor *pColFor; // How should this columns be formatted
wxDbColInf(); wxDbColInf();
@@ -331,9 +331,9 @@ public:
class WXDLLEXPORT wxDbTableInf // Description of a Table class WXDLLEXPORT wxDbTableInf // Description of a Table
{ {
public: public:
char tableName[DB_MAX_TABLE_NAME_LEN+1]; wxChar tableName[DB_MAX_TABLE_NAME_LEN+1];
char tableType[254+1]; // "TABLE" or "SYSTEM TABLE" etc. wxChar tableType[254+1]; // "TABLE" or "SYSTEM TABLE" etc.
char tableRemarks[254+1]; wxChar tableRemarks[254+1];
int numCols; // How many Columns does this Table have: GetColumnCount(..); int numCols; // How many Columns does this Table have: GetColumnCount(..);
wxDbColInf *pColInf; // pColInf = NULL ; User can later call GetColumns(..); wxDbColInf *pColInf; // pColInf = NULL ; User can later call GetColumns(..);
wxDbTableInf(); wxDbTableInf();
@@ -344,8 +344,8 @@ public:
class WXDLLEXPORT wxDbInf // Description of a Database class WXDLLEXPORT wxDbInf // Description of a Database
{ {
public: public:
char catalog[128+1]; wxChar catalog[128+1];
char schema[128+1]; wxChar schema[128+1];
int numTables; // How many tables does this database have int numTables; // How many tables does this database have
wxDbTableInf *pTableInf; // pTableInf = new wxDbTableInf[numTables]; wxDbTableInf *pTableInf; // pTableInf = new wxDbTableInf[numTables];
@@ -388,16 +388,16 @@ enum wxDBMS
// why the connection failed. Note: as each wxDb object is closed, it // why the connection failed. Note: as each wxDb object is closed, it
// will overwrite the errors of the previously destroyed wxDb object in // will overwrite the errors of the previously destroyed wxDb object in
// this variable. // this variable.
extern char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; extern wxChar DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
class WXDLLEXPORT wxDb class WXDLLEXPORT wxDb
{ {
private: private:
bool dbIsOpen; bool dbIsOpen;
char *dsn; // Data source name wxString dsn; // Data source name
char *uid; // User ID wxString uid; // User ID
char *authStr; // Authorization string (password) wxString authStr; // Authorization string (password)
FILE *fpSqlLog; // Sql Log file pointer FILE *fpSqlLog; // Sql Log file pointer
wxDbSqlLogState sqlLogState; // On or Off wxDbSqlLogState sqlLogState; // On or Off
bool fwdOnlyCursors; bool fwdOnlyCursors;
@@ -407,8 +407,10 @@ private:
bool getDbInfo(void); bool getDbInfo(void);
bool getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo); bool getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo);
bool setConnectionOptions(void); bool setConnectionOptions(void);
void logError(const char *errMsg, const char *SQLState); void logError(const wxString &errMsg, const wxString &SQLState);
void initialize(); void initialize();
const wxChar *convertUserID(const wxChar *userID, wxString &UserID);
#if !wxODBC_BACKWARD_COMPATABILITY #if !wxODBC_BACKWARD_COMPATABILITY
// ODBC handles // ODBC handles
HENV henv; // ODBC Environment handle HENV henv; // ODBC Environment handle
@@ -451,17 +453,17 @@ public:
// datasource when the datasource is first opened. // datasource when the datasource is first opened.
struct struct
{ {
char dbmsName[40]; // Name of the dbms product wxChar dbmsName[40]; // Name of the dbms product
char dbmsVer[64]; // Version # of the dbms product wxChar dbmsVer[64]; // Version # of the dbms product
char driverName[40]; // Driver name wxChar driverName[40]; // Driver name
char odbcVer[60]; // ODBC version of the driver wxChar odbcVer[60]; // ODBC version of the driver
char drvMgrOdbcVer[60]; // ODBC version of the driver manager wxChar drvMgrOdbcVer[60]; // ODBC version of the driver manager
char driverVer[60]; // Driver version wxChar driverVer[60]; // Driver version
char serverName[80]; // Server Name, typically a connect string wxChar serverName[80]; // Server Name, typically a connect string
char databaseName[128]; // Database filename wxChar databaseName[128]; // Database filename
char outerJoins[2]; // Indicates whether the data source supports outer joins wxChar outerJoins[2]; // Indicates whether the data source supports outer joins
char procedureSupport[2]; // Indicates whether the data source supports stored procedures wxChar procedureSupport[2]; // Indicates whether the data source supports stored procedures
char accessibleTables[2]; // Indicates whether the data source only reports accessible tables in SQLTables. wxChar accessibleTables[2]; // Indicates whether the data source only reports accessible tables in SQLTables.
UWORD maxConnections; // Maximum # of connections the data source supports UWORD maxConnections; // Maximum # of connections the data source supports
UWORD maxStmts; // Maximum # of HSTMTs per HDBC UWORD maxStmts; // Maximum # of HSTMTs per HDBC
UWORD apiConfLvl; // ODBC API conformance level UWORD apiConfLvl; // ODBC API conformance level
@@ -470,7 +472,7 @@ public:
UWORD cursorCommitBehavior; // Indicates how cursors are affected by a db commit UWORD cursorCommitBehavior; // Indicates how cursors are affected by a db commit
UWORD cursorRollbackBehavior; // Indicates how cursors are affected by a db rollback UWORD cursorRollbackBehavior; // Indicates how cursors are affected by a db rollback
UWORD supportNotNullClause; // Indicates if data source supports NOT NULL clause UWORD supportNotNullClause; // Indicates if data source supports NOT NULL clause
char supportIEF[2]; // Integrity Enhancement Facility (Referential Integrity) wxChar supportIEF[2]; // Integrity Enhancement Facility (Referential Integrity)
UDWORD txnIsolation; // Default transaction isolation level supported by the driver UDWORD txnIsolation; // Default transaction isolation level supported by the driver
UDWORD txnIsolationOptions; // Transaction isolation level options available UDWORD txnIsolationOptions; // Transaction isolation level options available
UDWORD fetchDirections; // Fetch directions supported UDWORD fetchDirections; // Fetch directions supported
@@ -507,7 +509,7 @@ public:
// Public member functions // Public member functions
wxDb(HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS); wxDb(HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS);
bool Open(char *Dsn, char *Uid, char *AuthStr); // Data Source Name, User ID, Password bool Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr); // Data Source Name, User ID, Password
bool Open(wxDb *copyDb); // pointer to a wxDb whose connection info should be copied rather than re-queried bool Open(wxDb *copyDb); // pointer to a wxDb whose connection info should be copied rather than re-queried
void Close(void); void Close(void);
bool CommitTrans(void); bool CommitTrans(void);
@@ -515,26 +517,26 @@ public:
bool DispAllErrors(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT); bool DispAllErrors(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
bool GetNextError(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT); bool GetNextError(HENV aHenv, HDBC aHdbc = SQL_NULL_HDBC, HSTMT aHstmt = SQL_NULL_HSTMT);
void DispNextError(void); void DispNextError(void);
bool CreateView(const char *viewName, const char *colList, const char *pSqlStmt, bool attemptDrop=TRUE); bool CreateView(const wxString &viewName, const wxString &colList, const wxString &pSqlStmt, bool attemptDrop=TRUE);
bool DropView(const char *viewName); bool DropView(const wxString &viewName);
bool ExecSql(const char *pSqlStmt); bool ExecSql(const wxString &pSqlStmt);
bool GetNext(void); bool GetNext(void);
bool GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned); bool GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned);
bool Grant(int privileges, const char *tableName, const char *userList = "PUBLIC"); bool Grant(int privileges, const wxString &tableName, const wxString &userList = wxT("PUBLIC"));
int TranslateSqlState(const wxChar *SQLState); int TranslateSqlState(const wxString &SQLState);
wxDbInf *GetCatalog(char *userID); wxDbInf *GetCatalog(const wxChar *userID=NULL);
bool Catalog(const char *userID=NULL, const char *fileName = SQL_CATALOG_FILENAME); bool Catalog(const wxChar *userID=NULL, const wxString &fileName=SQL_CATALOG_FILENAME);
int GetKeyFields(char *tableName, wxDbColInf* colInf, int nocols); int GetKeyFields(const wxString &tableName, wxDbColInf* colInf, int nocols);
wxDbColInf *GetColumns(char *tableName[], const char *userID=NULL); wxDbColInf *GetColumns(wxChar *tableName[], const wxChar *userID=NULL);
wxDbColInf *GetColumns(char *tableName, int *numCols, const char *userID=NULL); wxDbColInf *GetColumns(const wxString &tableName, int *numCols, const wxChar *userID=NULL);
int GetColumnCount(char *tableName, const char *userID=NULL); int GetColumnCount(const wxString &tableName, const wxChar *userID=NULL);
const char *GetDatabaseName(void) {return dbInf.dbmsName;} const wxChar *GetDatabaseName(void) {return dbInf.dbmsName;}
const char *GetDataSource(void) {return (const char *)dsn;} const wxString &GetDataSource(void) {return dsn;}
const char *GetDatasourceName(void){return (const char *)dsn;} const wxString &GetDatasourceName(void){return dsn;}
const char *GetUsername(void) {return (const char *)uid;} const wxString &GetUsername(void) {return uid;}
const char *GetPassword(void) {return (const char *)authStr;} const wxString &GetPassword(void) {return authStr;}
bool IsOpen(void) {return dbIsOpen;} bool IsOpen(void) {return dbIsOpen;}
HENV GetHENV(void) {return henv;} HENV GetHENV(void) {return henv;}
HDBC GetHDBC(void) {return hdbc;} HDBC GetHDBC(void) {return hdbc;}
@@ -545,13 +547,17 @@ public:
wxDbSqlTypeInfo GetTypeInfFloat() {return typeInfFloat;} wxDbSqlTypeInfo GetTypeInfFloat() {return typeInfFloat;}
wxDbSqlTypeInfo GetTypeInfDate() {return typeInfDate;} wxDbSqlTypeInfo GetTypeInfDate() {return typeInfDate;}
bool TableExists(const char *tableName, const char *userID=NULL, const char *path=NULL); // Table name can refer to a table, view, alias or synonym bool TableExists(const wxString &tableName, const wxChar *userID=NULL, const wxString &tablePath=wxT("")); // tableName can refer to a table, view, alias or synonym
bool TablePrivileges(const char *tableName, const char* priv, const char *userID="", const char *schema=NULL, const char *path=""); // Table name can refer to a table, view, alias or synonym bool TablePrivileges(const wxString &tableName, const wxString &priv, const wxChar *userID=NULL, const wxChar *schema=NULL, const wxString &path=wxT("")); // tableName can refer to a table, view, alias or synonym
void LogError(const char *errMsg, const char *SQLState = NULL) {logError(errMsg, SQLState);} void LogError(const wxString &errMsg, const wxString &SQLState = wxT("")) { logError(errMsg, SQLState); }
void SetDebugErrorMessages(bool state) { silent = !state; } void SetDebugErrorMessages(bool state) { silent = !state; }
bool SetSqlLogging(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME, bool append = FALSE); bool SetSqlLogging(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME, bool append = FALSE);
bool WriteSqlLog(const wxChar *logMsg); bool WriteSqlLog(const wxString &logMsg);
wxDBMS Dbms(void); wxDBMS Dbms(void);
bool ModifyColumn(const wxString &tableName, const wxString &columnName,
int dataType, ULONG columnLength=0,
const wxString &optionalParam="");
bool FwdOnlyCursors(void) {return fwdOnlyCursors;} bool FwdOnlyCursors(void) {return fwdOnlyCursors;}
// These two functions are provided strictly for use by wxDbTable. // These two functions are provided strictly for use by wxDbTable.
@@ -569,9 +575,9 @@ public:
struct wxDbList struct wxDbList
{ {
wxDbList *PtrPrev; // Pointer to previous item in the list wxDbList *PtrPrev; // Pointer to previous item in the list
wxChar Dsn[SQL_MAX_DSN_LENGTH+1]; // Data Source Name wxString Dsn; // Data Source Name
wxChar Uid[20+1]; // User ID wxString Uid; // User ID
wxChar AuthStr[20+1]; // Authorization string (password) wxString AuthStr; // Authorization string (password)
wxDb *PtrDb; // Pointer to the wxDb object wxDb *PtrDb; // Pointer to the wxDb object
bool Free; // Is item free or in use? bool Free; // Is item free or in use?
wxDbList *PtrNext; // Pointer to next item in the list wxDbList *PtrNext; // Pointer to next item in the list
@@ -582,7 +588,7 @@ struct wxDbList
class wxTablesInUse : public wxObject class wxTablesInUse : public wxObject
{ {
public: public:
const char *tableName; const wxChar *tableName;
ULONG tableID; ULONG tableID;
class wxDb *pDb; class wxDb *pDb;
}; // wxTablesInUse }; // wxTablesInUse
@@ -604,16 +610,16 @@ bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME
#if 0 #if 0
// MSW/VC6 ONLY!!! Experimental // MSW/VC6 ONLY!!! Experimental
int WXDLLEXPORT wxDbCreateDataSource(const char *driverName, const char *dsn, const char *description="", int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description=wxT(""),
bool sysDSN=FALSE, const char *defDir="", wxWindow *parent=NULL); bool sysDSN=FALSE, const wxString &defDir=wxT(""), wxWindow *parent=NULL);
#endif #endif
// This routine allows you to query a driver manager // This routine allows you to query a driver manager
// for a list of available datasources. Call this routine // for a list of available datasources. Call this routine
// the first time using SQL_FETCH_FIRST. Continue to call it // the first time using SQL_FETCH_FIRST. Continue to call it
// using SQL_FETCH_NEXT until you've exhausted the list. // using SQL_FETCH_NEXT until you've exhausted the list.
bool WXDLLEXPORT wxDbGetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax, bool WXDLLEXPORT wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
UWORD direction = SQL_FETCH_NEXT); SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
// Change this to 0 to remove use of all deprecated functions // Change this to 0 to remove use of all deprecated functions
@@ -649,7 +655,7 @@ bool WXDLLEXPORT FreeDbConnection(wxDB *pDb);
void WXDLLEXPORT CloseDbConnections(void); void WXDLLEXPORT CloseDbConnections(void);
int WXDLLEXPORT NumberDbConnectionsInUse(void); int WXDLLEXPORT NumberDbConnectionsInUse(void);
bool SqlLog(sqlLog state, const wxChar *filename = SQL_LOG_FILENAME); bool SqlLog(sqlLog state, const char *filename = SQL_LOG_FILENAME);
bool WXDLLEXPORT GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax, bool WXDLLEXPORT GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
UWORD direction = SQL_FETCH_NEXT); UWORD direction = SQL_FETCH_NEXT);

83
include/wx/dbtable.h
View File

@@ -65,7 +65,7 @@ const int wxDB_NO_MORE_COLUMN_NUMBERS = -1;
class WXDLLEXPORT wxDbColDef class WXDLLEXPORT wxDbColDef
{ {
public: public:
char ColName[DB_MAX_COLUMN_NAME_LEN+1]; // Column Name wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1]; // Column Name
int DbDataType; // Logical Data Type; e.g. DB_DATA_TYPE_INTEGER int DbDataType; // Logical Data Type; e.g. DB_DATA_TYPE_INTEGER
int SqlCtype; // C data type; e.g. SQL_C_LONG int SqlCtype; // C data type; e.g. SQL_C_LONG
void *PtrDataObj; // Address of the data object void *PtrDataObj; // Address of the data object
@@ -92,7 +92,7 @@ public:
class WXDLLEXPORT wxDbIdxDef class WXDLLEXPORT wxDbIdxDef
{ {
public: public:
char ColName[DB_MAX_COLUMN_NAME_LEN+1]; wxChar ColName[DB_MAX_COLUMN_NAME_LEN+1];
bool Ascending; bool Ascending;
}; // wxDbIdxDef }; // wxDbIdxDef
@@ -107,13 +107,19 @@ private:
bool insertable; bool insertable;
// Private member functions // Private member functions
bool initialize(wxDb *pwxDb, const wxString &tblName, const int nCols,
const wxString &qryTblName, bool qryOnly, const wxString &tblPath);
void cleanup();
bool bindParams(bool forUpdate); // called by the other 'bind' functions
bool bindInsertParams(void); bool bindInsertParams(void);
bool bindUpdateParams(void); bool bindUpdateParams(void);
bool bindCols(HSTMT cursor); bool bindCols(HSTMT cursor);
bool getRec(UWORD fetchType); bool getRec(UWORD fetchType);
bool execDelete(const char *pSqlStmt); bool execDelete(const wxString &pSqlStmt);
bool execUpdate(const char *pSqlStmt); bool execUpdate(const wxString &pSqlStmt);
bool query(int queryType, bool forUpdate, bool distinct, const char *pSqlStmt = NULL); bool query(int queryType, bool forUpdate, bool distinct, const wxString &pSqlStmt=wxT(""));
#if !wxODBC_BACKWARD_COMPATABILITY #if !wxODBC_BACKWARD_COMPATABILITY
// these were public // these were public
@@ -140,9 +146,9 @@ private:
wxDb *pDb; wxDb *pDb;
// Table Inf. // Table Inf.
char tablePath[wxDB_PATH_MAX]; // needed for dBase tables wxString tablePath; // needed for dBase tables
char tableName[DB_MAX_TABLE_NAME_LEN+1]; // Table name wxString tableName; // Table name
char queryTableName[DB_MAX_TABLE_NAME_LEN+1]; // Query Table Name wxString queryTableName; // Query Table Name
int noCols; // # of columns in the table int noCols; // # of columns in the table
bool queryOnly; // Query Only, no inserts, updates or deletes bool queryOnly; // Query Only, no inserts, updates or deletes
@@ -184,15 +190,20 @@ public:
wxDbColDef *colDefs; // Array of wxDbColDef structures wxDbColDef *colDefs; // Array of wxDbColDef structures
#endif #endif
// Public member functions // Public member functions
wxDbTable(wxDb *pwxDb, const char *tblName, const int nCols, wxDbTable(wxDb *pwxDb, const wxString &tblName, const int nCols,
const char *qryTblName = NULL, bool qryOnly = !wxDB_QUERY_ONLY, const char *tblPath=""); const wxString &qryTblName = "", bool qryOnly = !wxDB_QUERY_ONLY, const wxString &tblPath="");
// DEPRECATED
wxDbTable(wxDb *pwxDb, const wxString &tblName, const int nCols,
const wxChar *qryTblName = "", bool qryOnly = !wxDB_QUERY_ONLY, const wxString &tblPath="");
virtual ~wxDbTable(); virtual ~wxDbTable();
bool Open(bool checkPrivileges=FALSE); bool Open(bool checkPrivileges=FALSE);
bool CreateTable(bool attemptDrop=TRUE); bool CreateTable(bool attemptDrop=TRUE);
bool DropTable(void); bool DropTable(void);
bool CreateIndex(const char * idxName, bool unique, int noIdxCols, wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE); bool CreateIndex(const wxString &idxName, bool unique, int noIdxCols, wxDbIdxDef *pIdxDefs, bool attemptDrop=TRUE);
bool DropIndex(const char * idxName); bool DropIndex(const wxString &idxName);
// Accessors // Accessors
@@ -200,16 +211,16 @@ public:
// set when the wxDbTable instance is createand cannot be // set when the wxDbTable instance is createand cannot be
// changed, hence there is no corresponding SetXxxx function // changed, hence there is no corresponding SetXxxx function
wxDb *GetDb() { return pDb; } wxDb *GetDb() { return pDb; }
const char *GetTableName() { return tableName; } const wxString &GetTableName() { return tableName; }
const char *GetQueryTableName() { return queryTableName; } const wxString &GetQueryTableName() { return queryTableName; }
const char *GetTablePath() { return tablePath; } const wxString &GetTablePath() { return tablePath; }
int GetNumberOfColumns() { return noCols; } // number of "defined" columns for this wxDbTable instance int GetNumberOfColumns() { return noCols; } // number of "defined" columns for this wxDbTable instance
const char *GetFromClause() { return from; } const wxString &GetFromClause() { return from; }
const char *GetOrderByClause() { return orderBy; } const wxString &GetOrderByClause() { return orderBy; }
const char *GetWhereClause() { return where; } const wxString &GetWhereClause() { return where; }
bool IsQueryOnly() { return queryOnly; } bool IsQueryOnly() { return queryOnly; }
#if wxODBC_BACKWARD_COMPATABILITY #if wxODBC_BACKWARD_COMPATABILITY
@@ -224,19 +235,19 @@ public:
void From(const wxString& From) { from = From; } void From(const wxString& From) { from = From; }
void OrderBy(const wxString& OrderBy) { orderBy = OrderBy; } void OrderBy(const wxString& OrderBy) { orderBy = OrderBy; }
void Where(const wxString& Where) { where = Where; } void Where(const wxString& Where) { where = Where; }
const char * Where() { return (const char *)where.c_str(); } const wxString &Where() { return where; }
const char * OrderBy() { return (const char *)orderBy.c_str(); } const wxString &OrderBy() { return orderBy; }
const char * From() { return (const char *)from.c_str(); } const wxString &From() { return from; }
#endif #endif
int Insert(void); int Insert(void);
bool Update(void); bool Update(void);
bool Update(const char *pSqlStmt); bool Update(const wxString &pSqlStmt);
bool UpdateWhere(const char *pWhereClause); bool UpdateWhere(const wxString &pWhereClause);
bool Delete(void); bool Delete(void);
bool DeleteWhere(const char *pWhereClause); bool DeleteWhere(const wxString &pWhereClause);
bool DeleteMatching(void); bool DeleteMatching(void);
virtual bool Query(bool forUpdate = FALSE, bool distinct = FALSE); virtual bool Query(bool forUpdate = FALSE, bool distinct = FALSE);
bool QueryBySqlStmt(const char *pSqlStmt); bool QueryBySqlStmt(const wxString &pSqlStmt);
bool QueryMatching(bool forUpdate = FALSE, bool distinct = FALSE); bool QueryMatching(bool forUpdate = FALSE, bool distinct = FALSE);
bool QueryOnKeyFields(bool forUpdate = FALSE, bool distinct = FALSE); bool QueryOnKeyFields(bool forUpdate = FALSE, bool distinct = FALSE);
bool Refresh(void); bool Refresh(void);
@@ -253,10 +264,18 @@ public:
bool IsCursorClosedOnCommit(void); bool IsCursorClosedOnCommit(void);
UWORD GetRowNum(void); UWORD GetRowNum(void);
void BuildSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct); void BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool distinct);
void BuildDeleteStmt(char *pSqlStmt, int typeOfDel, const char *pWhereClause = NULL); void BuildSelectStmt(wxChar *pSqlStmt, int typeOfSelect, bool distinct);
void BuildUpdateStmt(char *pSqlStmt, int typeOfUpd, const char *pWhereClause = NULL);
void BuildWhereClause(char *pWhereClause, int typeOfWhere, const char *qualTableName = NULL, bool useLikeComparison=FALSE); void BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxString &pWhereClause="");
void BuildDeleteStmt(wxChar *pSqlStmt, int typeOfDel, const wxString &pWhereClause="");
void BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxString &pWhereClause="");
void BuildUpdateStmt(wxChar *pSqlStmt, int typeOfUpd, const wxString &pWhereClause="");
void BuildWhereClause(wxString &pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=FALSE);
void BuildWhereClause(wxChar *pWhereClause, int typeOfWhere, const wxString &qualTableName="", bool useLikeComparison=FALSE);
#if wxODBC_BACKWARD_COMPATABILITY #if wxODBC_BACKWARD_COMPATABILITY
// The following member functions are deprecated. You should use the BuildXxxxxStmt functions (above) // The following member functions are deprecated. You should use the BuildXxxxxStmt functions (above)
void GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct) void GetSelectStmt(char *pSqlStmt, int typeOfSelect, bool distinct)
@@ -276,7 +295,7 @@ public:
bool SetQueryTimeout(UDWORD nSeconds); bool SetQueryTimeout(UDWORD nSeconds);
wxDbColDef *GetColDefs() { return colDefs; } wxDbColDef *GetColDefs() { return colDefs; }
void SetColDefs(int index, const char *fieldName, int dataType, void *pData, int cType, void SetColDefs(int index, const wxString &fieldName, int dataType, void *pData, int cType,
int size, bool keyField = FALSE, bool upd = TRUE, int size, bool keyField = FALSE, bool upd = TRUE,
bool insAllow = TRUE, bool derivedCol = FALSE); bool insAllow = TRUE, bool derivedCol = FALSE);
wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, ULONG numCols); wxDbColDataPtr *SetColDefs(wxDbColInf *colInfs, ULONG numCols);
@@ -291,12 +310,12 @@ public:
HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE) { return GetNewCursor(setCursor,bindColumns); } HSTMT *NewCursor(bool setCursor = FALSE, bool bindColumns = TRUE) { return GetNewCursor(setCursor,bindColumns); }
#endif #endif
ULONG Count(const char *args="*"); ULONG Count(const wxString &args="*");
int DB_STATUS(void) { return(pDb->DB_STATUS); } int DB_STATUS(void) { return(pDb->DB_STATUS); }
bool IsColNull(int colNo); bool IsColNull(int colNo);
bool SetColNull(int colNo, bool set=TRUE); bool SetColNull(int colNo, bool set=TRUE);
bool SetColNull(const char *colName, bool set=TRUE); bool SetColNull(const wxString &colName, bool set=TRUE);
#if wxODBC_BACKWARD_COMPATABILITY #if wxODBC_BACKWARD_COMPATABILITY
// The following member functions are deprecated. You should use the SetColNull() // The following member functions are deprecated. You should use the SetColNull()
bool SetNull(int colNo, bool set=TRUE) { return (SetNull(colNo,set)); } bool SetNull(int colNo, bool set=TRUE) { return (SetNull(colNo,set)); }

964
src/common/db.cpp
View File

File diff suppressed because it is too large Load Diff

994
src/common/dbtable.cpp
View File

File diff suppressed because it is too large Load Diff