X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43e8916ff3fd271e55c9daa6660cb8ea5ff7efe6..210bb741b94a7a4a015de730017c3576afe7a8f1:/include/wx/db.h diff --git a/include/wx/db.h b/include/wx/db.h index 827e35cdbc..0c9b196a2b 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -31,10 +31,6 @@ #define OLD_GETCOLUMNS 1 #define EXPERIMENTAL_WXDB_FUNCTIONS 1 -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "db.h" -#endif - #include "wx/defs.h" #include "wx/string.h" @@ -45,12 +41,7 @@ #if wxUSE_MFC #include #else // !wxUSE_MFC - #ifndef STRICT - #define STRICT 1 - #endif - - #include - #include "wx/msw/winundef.h" + #include "wx/msw/wrapwin.h" #endif // wxUSE_MFC/!wxUSE_MFC // If you use the wxDbCreateDataSource() function with MSW/VC6, @@ -66,9 +57,8 @@ //#endif #include "odbcinst.h" #else - #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) ) - #include - #include "wx/msw/winundef.h" + #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) || defined (__DMC__)) + #include "wx/msw/wrapwin.h" #endif extern "C" { #if defined(wxUSE_BUILTIN_IODBC) && wxUSE_BUILTIN_IODBC @@ -83,13 +73,16 @@ typedef UCHAR SQLTCHAR; #endif #endif - #else + #else // !wxUSE_BUILTIN_IODBC + // SQL headers define BOOL if it's not defined yet but BOOL is also + // defined in many other places on other systems (Motif, at least on + // OpenVMS; Cocoa and X11) so prevent the problem by defining it before + // including these headers + #define BOOL int #include #include - //#if wxUSE_UNICODE - // #include - //#endif - #endif + #undef BOOL + #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC } #endif @@ -99,6 +92,14 @@ #define SQL_C_WXCHAR SQL_C_CHAR #endif +#ifdef __DIGITALMARS__ +#if wxUSE_UNICODE +typedef wxChar SQLTCHAR; +#else +typedef UCHAR SQLTCHAR; +#endif +#endif + typedef float SFLOAT; typedef double SDOUBLE; typedef unsigned int UINT; @@ -126,6 +127,15 @@ enum enumDummy {enumDum1}; #endif #endif +#ifndef _WIN64 +#ifndef SQLLEN +#define SQLLEN SQLINTEGER +#endif +#ifndef SQLULEN +#define SQLULEN SQLUINTEGER +#endif +#endif + const int wxDB_PATH_MAX = 254; extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME; @@ -145,6 +155,7 @@ const int DB_DATA_TYPE_INTEGER = 2; const int DB_DATA_TYPE_FLOAT = 3; const int DB_DATA_TYPE_DATE = 4; const int DB_DATA_TYPE_BLOB = 5; +const int DB_DATA_TYPE_MEMO = 6; const int DB_SELECT_KEYFIELDS = 1; const int DB_SELECT_WHERE = 2; @@ -315,38 +326,38 @@ class WXDLLIMPEXP_ODBC wxDbConnectInf void FreeHenv(); // Accessors - const HENV &GetHenv() { return Henv; }; + const HENV &GetHenv() { return Henv; } - const wxChar *GetDsn() { return Dsn; }; + const wxChar *GetDsn() { return Dsn; } - const wxChar *GetUid() { return Uid; }; - const wxChar *GetUserID() { return Uid; }; + const wxChar *GetUid() { return Uid; } + const wxChar *GetUserID() { return Uid; } - const wxChar *GetAuthStr() { return AuthStr; }; - const wxChar *GetPassword() { return AuthStr; }; + const wxChar *GetAuthStr() { return AuthStr; } + const wxChar *GetPassword() { return AuthStr; } - const wxChar *GetConnectionStr() { return ConnectionStr; }; - bool UseConnectionStr() { return useConnectionStr; }; + const wxChar *GetConnectionStr() { return ConnectionStr; } + bool UseConnectionStr() { return useConnectionStr; } - const wxChar *GetDescription() { return Description; }; - const wxChar *GetFileType() { return FileType; }; - const wxChar *GetDefaultDir() { return DefaultDir; }; + const wxChar *GetDescription() { return Description; } + const wxChar *GetFileType() { return FileType; } + const wxChar *GetDefaultDir() { return DefaultDir; } - void SetHenv(const HENV henv) { Henv = henv; }; + void SetHenv(const HENV henv) { Henv = henv; } void SetDsn(const wxString &dsn); void SetUserID(const wxString &userID); - void SetUid(const wxString &uid) { SetUserID(uid); }; + void SetUid(const wxString &uid) { SetUserID(uid); } void SetPassword(const wxString &password); - void SetAuthStr(const wxString &authstr) { SetPassword(authstr); }; + void SetAuthStr(const wxString &authstr) { SetPassword(authstr); } void SetConnectionStr(const wxString &connectStr); - void SetDescription(const wxString &desc) { Description = desc; }; - void SetFileType(const wxString &fileType) { FileType = fileType; }; - void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; }; + void SetDescription(const wxString &desc) { Description = desc; } + void SetFileType(const wxString &fileType) { FileType = fileType; } + void SetDefaultDir(const wxString &defDir) { DefaultDir = defDir; } }; // class wxDbConnectInf @@ -363,10 +374,10 @@ struct WXDLLIMPEXP_ODBC wxDbSqlTypeInfo class WXDLLIMPEXP_ODBC wxDbColFor { public: - wxString s_Field; // Formated String for Output - wxString s_Format[7]; // Formated Objects - TIMESTAMP has the biggest (7) - wxString s_Amount[7]; // Formated Objects - amount of things that can be formatted - int i_Amount[7]; // Formated Objects - TT MM YYYY HH MM SS m + wxString s_Field; // Formatted String for Output + wxString s_Format[7]; // Formatted Objects - TIMESTAMP has the biggest (7) + wxString s_Amount[7]; // Formatted Objects - amount of things that can be formatted + int i_Amount[7]; // Formatted Objects - TT MM YYYY HH MM SS m int i_Nation; // 0 = timestamp , 1=EU, 2=UK, 3=International, 4=US int i_dbDataType; // conversion of the 'sqlDataType' to the generic data type used by these classes SWORD i_sqlDataType; @@ -514,7 +525,7 @@ private: bool getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo); bool setConnectionOptions(void); void logError(const wxString &errMsg, const wxString &SQLState); - const wxChar *convertUserID(const wxChar *userID, wxString &UserID); + void convertUserID(const wxChar *userID, wxString &UserID); bool determineDataTypes(bool failOnDataTypeUnsupported); void initialize(); bool open(bool failOnDataTypeUnsupported=true); @@ -542,12 +553,13 @@ private: wxDbSqlTypeInfo typeInfFloat; wxDbSqlTypeInfo typeInfDate; wxDbSqlTypeInfo typeInfBlob; + wxDbSqlTypeInfo typeInfMemo; #endif public: - void setCached(bool cached) { dbIsCached = cached; }; // This function must only be called by wxDbGetConnection() and wxDbCloseConnections!!! - bool IsCached() { return dbIsCached; }; + 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); } @@ -613,7 +625,7 @@ public: wxChar errorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN]; #endif wxChar errorMsg[SQL_MAX_MESSAGE_LENGTH]; - SDWORD nativeError; + SQLINTEGER nativeError; wxChar sqlState[20]; #if wxODBC_BACKWARD_COMPATABILITY @@ -636,6 +648,8 @@ public: // Data Source Name, User ID, Password and whether open should fail on data type not supported bool Open(const wxString& inConnectStr, bool failOnDataTypeUnsupported=true); + ///This version of Open will open the odbc source selection dialog. Cast a wxWindow::GetHandle() to SQLHWND to use. + bool Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnDataTypeUnsupported=true); bool Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthStr, bool failOnDataTypeUnsupported=true); bool Open(wxDbConnectInf *dbConnectInf, bool failOnDataTypeUnsupported=true); bool Open(wxDb *copyDb); // pointer to a wxDb whose connection info should be copied rather than re-queried @@ -650,7 +664,7 @@ public: bool ExecSql(const wxString &pSqlStmt); bool ExecSql(const wxString &pSqlStmt, wxDbColInf** columns, short& numcols); 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, SQLLEN FAR *cbReturned); bool Grant(int privileges, const wxString &tableName, const wxString &userList = wxT("PUBLIC")); int TranslateSqlState(const wxString &SQLState); wxDbInf *GetCatalog(const wxChar *userID=NULL); @@ -679,6 +693,7 @@ public: wxDbSqlTypeInfo GetTypeInfFloat() {return typeInfFloat;} wxDbSqlTypeInfo GetTypeInfDate() {return typeInfDate;} wxDbSqlTypeInfo GetTypeInfBlob() {return typeInfBlob;} + wxDbSqlTypeInfo GetTypeInfMemo() {return typeInfMemo;} // tableName can refer to a table, view, alias or synonym bool TableExists(const wxString &tableName, const wxChar *userID=NULL, @@ -709,6 +724,9 @@ public: bool FwdOnlyCursors(void) {return fwdOnlyCursors;} + // return the string with all special SQL characters escaped + wxString EscapeSqlChars(const wxString& value); + // These two functions are provided strictly for use by wxDbTable. // DO NOT USE THESE FUNCTIONS, OR MEMORY LEAKS MAY OCCUR void incrementTableCount() { nTables++; return; } @@ -787,7 +805,7 @@ wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMaxLength, wxChar *DsDesc, // Change this to 0 to remove use of all deprecated functions #if wxODBC_BACKWARD_COMPATABILITY //################################################################################# -//############### DEPRECATED functions for backward compatability ################# +//############### DEPRECATED functions for backward compatibility ################# //################################################################################# // Backward compability structures/classes. This will eventually go away