X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b12ab1641ca114b6ca8f7ddb628a9915b4f24f0..ff1865910312d960737474a75a77737d5ce94864:/include/wx/db.h?ds=sidebyside diff --git a/include/wx/db.h b/include/wx/db.h index fbfe99b616..adfbd49b11 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -46,21 +46,18 @@ #define OLD_GETCOLUMNS 1 #define EXPERIMENTAL_WXDB_FUNCTIONS 1 -// Use this line for wxWindows v1.x -//#include "wx_ver.h" -// Use this line for wxWindows v2.x #include "wx/version.h" -#if wxMAJOR_VERSION == 2 - #ifdef __GNUG__ - #pragma interface "db.h" - #endif +#ifdef __GNUG__ + #pragma interface "db.h" #endif #include "wx/setup.h" -#if wxMAJOR_VERSION == 2 - extern "C" { +#include "wx/defs.h" +#include "wx/string.h" + +extern "C" { #ifdef __VISUALC__ // If you use the wxDbCreateDataSource() function with MSW/VC6, // you cannot use the iODBC headers, you must use the VC headers, @@ -75,22 +72,7 @@ #include "wx/isql.h" #include "wx/isqlext.h" #endif - } -#else // version == 1 - extern "C" { -#ifdef __VISUALC__ -// If you use the wxDbCreateDataSource() function with MSW/VC6, -// you cannot use the iODBC headers, you must use the VC headers, -// plus the odbcinst.h header - gt Nov 2 2000 - #include "sql.h" - #include "sqlext.h" - #include "odbcinst.h" -#else - #include "iodbc.h" - #include "isqlext.h" -#endif - } -#endif +} typedef float SFLOAT; typedef double SDOUBLE; @@ -105,10 +87,13 @@ enum enumDummy {enumDum1}; #ifndef SQL_C_BOOLEAN #define SQL_C_BOOLEAN(datatype) (sizeof(datatype) == 1 ? SQL_C_UTINYINT : (sizeof(datatype) == 2 ? SQL_C_USHORT : SQL_C_ULONG)) +//# define SQL_C_BOOLEAN (sizeof(int) == 2 ? SQL_C_USHORT : SQL_C_ULONG) #endif + #ifndef SQL_C_ENUM #define SQL_C_ENUM (sizeof(enumDummy) == 2 ? SQL_C_USHORT : SQL_C_ULONG) #endif + #ifndef SQL_C_BLOB #ifdef SQL_LONGVARBINARY #define SQL_C_BLOB SQL_LONGVARBINARY @@ -116,15 +101,15 @@ enum enumDummy {enumDum1}; #define SQL_C_BLOB SQL_VARBINARY #endif #endif - +/* #ifndef TRUE -#define TRUE 1 +#define TRUE true #endif #ifndef FALSE -#define FALSE 0 +#define FALSE false #endif - +*/ const int wxDB_PATH_MAX = 254; extern wxChar const *SQL_LOG_FILENAME; @@ -280,10 +265,10 @@ class WXDLLEXPORT wxDbConnectInf bool freeHenvOnDestroy; public: - HENV Henv; - wxChar Dsn[SQL_MAX_DSN_LENGTH+1]; // Data Source Name - wxChar Uid[SQL_MAX_USER_NAME_LEN+1]; // User ID - wxChar AuthStr[SQL_MAX_AUTHSTR_LEN+1]; // Authorization string (password) + HENV Henv; + wxChar Dsn[SQL_MAX_DSN_LENGTH+1]; // Data Source Name + wxChar Uid[SQL_MAX_USER_NAME_LEN+1]; // User ID + wxChar AuthStr[SQL_MAX_AUTHSTR_LEN+1]; // Authorization string (password) wxString Description; // Not sure what the max length is wxString FileType; // Not sure what the max length is @@ -396,8 +381,6 @@ public: }; - - class WXDLLEXPORT wxDbTableInf // Description of a Table { public: @@ -471,6 +454,7 @@ class WXDLLEXPORT wxDb { private: bool dbIsOpen; + bool dbIsCached; // Was connection created by caching functions wxString dsn; // Data source name wxString uid; // User ID wxString authStr; // Authorization string (password) @@ -514,6 +498,9 @@ private: public: + void setCached(bool cached) { dbIsCached = cached; }; // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!! + bool IsCached() { return dbIsCached; }; + bool GetDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo) { return getDataTypeInfo(fSqlType, structSQLTypeInfo); } @@ -591,6 +578,7 @@ public: // Public member functions wxDb(const HENV &aHenv, bool FwdOnlyCursors=(bool)wxODBC_FWD_ONLY_CURSORS); + ~wxDb(); bool Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr); // Data Source Name, User ID, Password bool Open(wxDbConnectInf *dbConnectInf); @@ -615,7 +603,7 @@ public: wxDbColInf *GetColumns(wxChar *tableName[], const wxChar *userID=NULL); wxDbColInf *GetColumns(const wxString &tableName, UWORD *numCols, const wxChar *userID=NULL); - UWORD GetColumnCount(const wxString &tableName, const wxChar *userID=NULL); + int GetColumnCount(const wxString &tableName, const wxChar *userID=NULL); const wxChar *GetDatabaseName(void) {return dbInf.dbmsName;} const wxString &GetDataSource(void) {return dsn;} const wxString &GetDatasourceName(void){return dsn;} @@ -639,6 +627,14 @@ public: const wxChar *userID=NULL, const wxChar *schema=NULL, const wxString &path=wxEmptyString); + // These two functions return the table name or column name in a form ready + // for use in SQL statements. For example, if the datasource allows spaces + // in the table name or column name, the returned string will have the + // correct enclosing marks around the name to allow it to be properly + // included in a SQL statement + const wxString SQLTableName(const char *tableName); + const wxString SQLColumnName(const char *colName); + void LogError(const wxString &errMsg, const wxString &SQLState = wxEmptyString) { logError(errMsg, SQLState); } void SetDebugErrorMessages(bool state) { silent = !state; } @@ -698,8 +694,15 @@ void WXDLLEXPORT wxDbCloseConnections(void); int WXDLLEXPORT wxDbConnectionsInUse(void); +//TODO: document +// Writes a message to the wxLog window (stdout usually) when an internal error +// situation occurs. This function only works in DEBUG builds +const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb, + char *ErrFile, int ErrLine); +//TODO: end document + // This function sets the sql log state for all open wxDb objects -bool wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME); +bool WXDLLEXPORT wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME); #if 0