Window management and sizer layout corrections

[wxWidgets.git] / include / wx / db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index c0763f6fd506e8d1c0e3c32a9ecd904b6af9a45a..5216709500e925e33b5cdc13cc1a66b69b83f7c3 100644 (file)
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -5,6 +5,8 @@
 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by: George Tasker
 //              source such as opening and closing the data source.
 // Author:      Doug Card
 // Modified by: George Tasker

+//              Bart Jourquin
+//              Mark Johnson, wxWindows@mj10777.de

 // Mods:        Dec, 1998:
 //                -Added support for SQL statement logging and database cataloging
 //                     April, 1999
 // Mods:        Dec, 1998:
 //                -Added support for SQL statement logging and database cataloging
 //                     April, 1999


@@ -42,39 +44,47 @@
 // BJO 20000503: introduce new GetColumns members which are more database independant and 
 //               return columns in the order they were created
 #define OLD_GETCOLUMNS 1
 // BJO 20000503: introduce new GetColumns members which are more database independant and 
 //               return columns in the order they were created
 #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"
 
 #include "wx/version.h"
 

-#if wxMAJOR_VERSION == 2
-    #ifdef __GNUG__
+#ifdef __GNUG__

     #pragma interface "db.h"
     #pragma interface "db.h"

-    #endif

 #endif
 
 #include "wx/setup.h"
 
 #endif
 
 #include "wx/setup.h"
 

-#if wxMAJOR_VERSION == 2
-    extern "C" {
+#include "wx/defs.h"
+#include "wx/string.h"
+
+#ifdef __VISUALC__
+// include standard Windows headers
+#if defined(__WXMSW__) && !wxUSE_MFC
+    #ifndef STRICT
+        #define STRICT 1
+    #endif
+
+    #include <windows.h>
+    #include "wx/msw/winundef.h"
+#endif
+
+// 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
+//
+//  Must add "odbccp32.lib" in \wx2\wxWindows\src\makevc.env to the WINLIBS= line
+//
+    #include "sql.h"
+    #include "sqlext.h"
+    #include "odbcinst.h"
+#else
+extern "C" {

     #include "wx/isql.h"
     #include "wx/isqlext.h"
     #include "wx/isql.h"
     #include "wx/isqlext.h"

-// If you use the wxCreateDataSource() function with MSW/VC6,
-// you cannot use the iODBC headers, you must use the VC headers,
-// plus the odbcinst.h header
-    //#include "sql.h"
-    //#include "sqlext.h"
-    //#include "odbcinst.h"
-    }
-#else  // version == 1
-    extern "C" {
-    #include "iodbc.h"
-    #include "isqlext.h"
-    }
+}

 #endif
 
 #endif
 

+

 typedef float SFLOAT;
 typedef double SDOUBLE;
 typedef unsigned int UINT;
 typedef float SFLOAT;
 typedef double SDOUBLE;
 typedef unsigned int UINT;


@@ -86,29 +96,40 @@ typedef unsigned int UINT;
 
 enum enumDummy {enumDum1};
 
 
 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(datatype) (sizeof(datatype) == 1 ? SQL_C_UTINYINT : (sizeof(datatype) == 2 ? SQL_C_USHORT : SQL_C_ULONG))

-//    #define SQL_C_BOOLEAN (sizeof(Bool) == 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)
 #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
+    #elif SQL_VARBINARY
+        #define SQL_C_BLOB SQL_VARBINARY
+    #endif
+#endif
+/*

 #ifndef TRUE
 #ifndef TRUE

-#define TRUE 1
+#define TRUE true

 #endif
 
 #ifndef FALSE
 #endif
 
 #ifndef FALSE

-#define FALSE 0
+#define FALSE false

 #endif
 #endif

-
+*/

 const int wxDB_PATH_MAX                 = 254;
 
 const int wxDB_PATH_MAX                 = 254;
 

-extern char const *SQL_LOG_FILENAME;
-extern char const *SQL_CATALOG_FILENAME;
-
+WXDLLEXPORT_DATA(extern wxChar const *) SQL_LOG_FILENAME;
+WXDLLEXPORT_DATA(extern wxChar const *) SQL_CATALOG_FILENAME;

 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;
 
 // Database Globals
 const int DB_TYPE_NAME_LEN            = 40;

-const int DB_MAX_STATEMENT_LEN        = 2048;
-const int DB_MAX_WHERE_CLAUSE_LEN     = 1024;
+const int DB_MAX_STATEMENT_LEN        = 4096;
+const int DB_MAX_WHERE_CLAUSE_LEN     = 2048;

 const int DB_MAX_ERROR_MSG_LEN        = 512;
 const int DB_MAX_ERROR_HISTORY        = 5;
 const int DB_MAX_TABLE_NAME_LEN       = 128;
 const int DB_MAX_ERROR_MSG_LEN        = 512;
 const int DB_MAX_ERROR_HISTORY        = 5;
 const int DB_MAX_TABLE_NAME_LEN       = 128;


@@ -118,6 +139,7 @@ const int DB_DATA_TYPE_VARCHAR        = 1;
 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_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_SELECT_KEYFIELDS         = 1;
 const int DB_SELECT_WHERE             = 2;
 
 const int DB_SELECT_KEYFIELDS         = 1;
 const int DB_SELECT_WHERE             = 2;


@@ -237,46 +259,104 @@ enum wxODBC_ERRORS
     DB_ERR_TIMEOUT_EXPIRED                             // SqlState = 'S1T00'
 };
 
     DB_ERR_TIMEOUT_EXPIRED                             // SqlState = 'S1T00'
 };
 

+#ifndef MAXNAME
+#define MAXNAME         31
+#endif
+
+#ifndef SQL_MAX_AUTHSTR_LEN
+// There does not seem to be a standard for this, so I am
+// defaulting to the value that MS uses
+#define SQL_MAX_AUTHSTR_LEN MAXNAME
+#endif

 
 

-struct wxDbConnectInf
+class WXDLLEXPORT wxDbConnectInf

 {
 {

-    HENV Henv;
-    char Dsn[SQL_MAX_DSN_LENGTH+1];                    // Data Source Name
-    char Uid[20+1];                                    // User ID
-    char AuthStr[20+1];                                // Authorization string (password)
+    private:
+        bool freeHenvOnDestroy;

 
 

-    char description[SQL_MAX_DSN_LENGTH+1];            // Not sure what the max length is
-    char fileType[SQL_MAX_DSN_LENGTH+1];               // Not sure what the max length is
+    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)

 
 

-    // Optionals needed for some databases like dBase
-    char defaultDir[wxDB_PATH_MAX];                      // Directory that db file resides in
-};
+        wxString Description;                              // Not sure what the max length is
+        wxString FileType;                                 // Not sure what the max length is
+
+        // Optionals needed for some databases like dBase
+        wxString DefaultDir;                               // Directory that db file resides in
+
+    public:
+
+        wxDbConnectInf();
+        wxDbConnectInf(HENV henv, const wxString &dsn, const wxString &userID=wxEmptyString, 
+                       const wxString &password=wxEmptyString, const wxString &defaultDir=wxEmptyString, 
+                       const wxString &description=wxEmptyString, const wxString &fileType=wxEmptyString);
+
+        ~wxDbConnectInf();

 
 

-struct wxDbSqlTypeInfo
+        bool             Initialize();
+
+        bool             AllocHenv();
+        void             FreeHenv();
+
+        // Accessors
+        const HENV       &GetHenv()          { return Henv; };
+
+        const wxChar    *GetDsn()           { return Dsn; };
+
+        const wxChar    *GetUid()           { return Uid; };
+        const wxChar    *GetUserID()        { return Uid; };
+
+        const wxChar    *GetAuthStr()       { return AuthStr; };
+        const wxChar    *GetPassword()      { return AuthStr; };
+
+        const wxChar    *GetDescription()   { return Description; };
+        const wxChar    *GetFileType()      { return FileType; };
+        const wxChar    *GetDefaultDir()    { return DefaultDir; };
+
+        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             SetPassword(const wxString &password);
+        void             SetAuthStr(const wxString &authstr)    { SetPassword(authstr); };
+
+        void             SetDescription(const wxString &desc)   { Description   = desc;     };
+        void             SetFileType(const wxString &fileType)  { FileType      = fileType; };
+        void             SetDefaultDir(const wxString &defDir)  { DefaultDir    = defDir;   };
+};  // class wxDbConnectInf
+
+
+struct WXDLLEXPORT wxDbSqlTypeInfo

 {
 {

-    char    TypeName[DB_TYPE_NAME_LEN];
-    int     FsqlType;
-    long    Precision;
-    short   CaseSensitive;
-//    short MinimumScale;
-    short   MaximumScale;
+    wxString    TypeName;
+    SWORD       FsqlType;
+    long        Precision;
+    short       CaseSensitive;
+//    short     MinimumScale;
+    short       MaximumScale;

 };
 
 
 class WXDLLEXPORT wxDbColFor
 {
 public:
 };
 
 
 class WXDLLEXPORT wxDbColFor
 {
 public:

-    wxString       s_Field;             // Formated String for Output
-    wxString       s_Format[7];         // Formated Objects - TIMESTAMP has the biggest (7)
-    wxString       s_Menge[7];          // Formated Objects - amount of things that can be formatted
-    int            i_Menge[7];          // Formated 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
+    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
+    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;
 
     wxDbColFor();
     ~wxDbColFor();
 
     SWORD          i_sqlDataType;
 
     wxDbColFor();
     ~wxDbColFor();
 

+    void           Initialize();

     int            Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits);
 };
 
     int            Format(int Nation, int dbDataType, SWORD sqlDataType, short columnSize, short decimalDigits);
 };
 


@@ -284,48 +364,61 @@ public:
 class WXDLLEXPORT wxDbColInf
 {
 public:
 class WXDLLEXPORT wxDbColInf
 {
 public:

-    char         catalog[128+1];
-    char         schema[128+1];
-    char         tableName[DB_MAX_TABLE_NAME_LEN+1];
-    char         colName[DB_MAX_COLUMN_NAME_LEN+1];
+    wxChar       catalog[128+1];
+    wxChar       schema[128+1];
+    wxChar       tableName[DB_MAX_TABLE_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        bufferLength;
     short        decimalDigits;
     short        numPrecRadix;
     short        nullable;
     SWORD        columnSize;
     SWORD        bufferLength;
     short        decimalDigits;
     short        numPrecRadix;
     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
  // mj10777.19991224 : new
     int          PkCol;       // Primary key column       0=No; 1= First Key, 2 = Second Key etc.
     int          dbDataType;  // conversion of the 'sqlDataType' to the generic data type used by these classes
  // mj10777.19991224 : new
     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();

 
 

+    bool Initialize();
+};

 
 
 class WXDLLEXPORT wxDbTableInf        // Description of a Table
 {
 public:
 
 
 class WXDLLEXPORT wxDbTableInf        // Description of a Table
 {
 public:

-    char        tableName[DB_MAX_TABLE_NAME_LEN+1];
-    char        tableType[254+1];           // "TABLE" or "SYSTEM TABLE" etc.
-    char        tableRemarks[254+1];
-    int         numCols;                    // How many Columns does this Table have: GetColumnCount(..);
+    wxChar      tableName[DB_MAX_TABLE_NAME_LEN+1];
+    wxChar      tableType[254+1];           // "TABLE" or "SYSTEM TABLE" etc.
+    wxChar      tableRemarks[254+1];
+    UWORD       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();
+
+    bool             Initialize();

 };
 
 
 class WXDLLEXPORT wxDbInf     // Description of a Database
 {
 public:
 };
 
 
 class WXDLLEXPORT wxDbInf     // Description of a Database
 {
 public:

-    char          catalog[128+1];
-    char          schema[128+1];
+    wxChar        catalog[128+1];
+    wxChar        schema[128+1];

     int           numTables;           // How many tables does this database have
     wxDbTableInf *pTableInf;           // pTableInf = new wxDbTableInf[numTables];
     int           numTables;           // How many tables does this database have
     wxDbTableInf *pTableInf;           // pTableInf = new wxDbTableInf[numTables];

+
+    wxDbInf();
+    ~wxDbInf();
+
+    bool          Initialize();

 };
 
 
 };
 
 


@@ -350,7 +443,10 @@ enum wxDBMS
     dbmsACCESS,
     dbmsDBASE,
     dbmsINFORMIX,
     dbmsACCESS,
     dbmsDBASE,
     dbmsINFORMIX,

-    dbmsVIRTUOSO
+    dbmsVIRTUOSO,
+    dbmsDB2,
+    dbmsINTERBASE,
+    dbmsPERVASIVE_SQL

 };
 
 
 };
 
 


@@ -361,25 +457,31 @@ enum wxDBMS
 // why the connection failed.  Note: as each wxDb object is closed, it
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.
 // why the connection failed.  Note: as each wxDb object is closed, it
 // will overwrite the errors of the previously destroyed wxDb object in
 // this variable.

-extern char DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];
+
+WXDLLEXPORT_DATA(extern wxChar) DBerrorList[DB_MAX_ERROR_HISTORY][DB_MAX_ERROR_MSG_LEN];

 
 
 class WXDLLEXPORT wxDb
 {
 private:
     bool             dbIsOpen;
 
 
 class WXDLLEXPORT wxDb
 {
 private:
     bool             dbIsOpen;

-    char            *dsn;             // Data source name
-    char            *uid;             // User ID
-    char            *authStr;         // Authorization string (password)
+    bool             dbIsCached;      // Was connection created by caching functions
+    wxString         dsn;             // Data source name
+    wxString         uid;             // User ID
+    wxString         authStr;         // Authorization string (password)

     FILE            *fpSqlLog;        // Sql Log file pointer
     wxDbSqlLogState  sqlLogState;     // On or Off
     bool             fwdOnlyCursors;
     FILE            *fpSqlLog;        // Sql Log file pointer
     wxDbSqlLogState  sqlLogState;     // On or Off
     bool             fwdOnlyCursors;

+    wxDBMS           dbmsType;        // Type of datasource - i.e. Oracle, dBase, SQLServer, etc

 
     // Private member functions
     bool             getDbInfo(void);
     bool             getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo);
     bool             setConnectionOptions(void);
 
     // Private member functions
     bool             getDbInfo(void);
     bool             getDataTypeInfo(SWORD fSqlType, wxDbSqlTypeInfo &structSQLTypeInfo);
     bool             setConnectionOptions(void);

-    void             logError(const char *errMsg, const char *SQLState);
+    void             logError(const wxString &errMsg, const wxString &SQLState);
+    const wxChar    *convertUserID(const wxChar *userID, wxString &UserID);
+    void             initialize();
+

 #if !wxODBC_BACKWARD_COMPATABILITY
     // ODBC handles
     HENV  henv;        // ODBC Environment handle
 #if !wxODBC_BACKWARD_COMPATABILITY
     // ODBC handles
     HENV  henv;        // ODBC Environment handle


@@ -393,7 +495,7 @@ private:
     unsigned int nTables;
 
     // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
     unsigned int nTables;
 
     // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.

-        //
+     //

     // This information is obtained from the ODBC driver by use of the
     // SQLGetTypeInfo() function.  The key piece of information is the
     // type name the data source uses for each logical data type.
     // This information is obtained from the ODBC driver by use of the
     // SQLGetTypeInfo() function.  The key piece of information is the
     // type name the data source uses for each logical data type.


@@ -402,9 +504,17 @@ private:
     wxDbSqlTypeInfo typeInfInteger;
     wxDbSqlTypeInfo typeInfFloat;
     wxDbSqlTypeInfo typeInfDate;
     wxDbSqlTypeInfo typeInfInteger;
     wxDbSqlTypeInfo typeInfFloat;
     wxDbSqlTypeInfo typeInfDate;

+    wxDbSqlTypeInfo typeInfBlob;

 #endif
 
 public:
 #endif
 
 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); }
+

 #if wxODBC_BACKWARD_COMPATABILITY
     // ODBC handles
     HENV  henv;        // ODBC Environment handle
 #if wxODBC_BACKWARD_COMPATABILITY
     // ODBC handles
     HENV  henv;        // ODBC Environment handle


@@ -422,16 +532,17 @@ public:
     // datasource when the datasource is first opened.
     struct
     {
     // datasource when the datasource is first opened.
     struct
     {

-        char   dbmsName[40];                             // Name of the dbms product
-        char   dbmsVer[64];                              // Version # of the dbms product
-        char   driverName[40];                           // Driver name
-        char   odbcVer[60];                              // ODBC version of the driver
-        char   drvMgrOdbcVer[60];                        // ODBC version of the driver manager
-        char   driverVer[60];                            // Driver version
-        char   serverName[80];                           // Server Name, typically a connect string
-        char   databaseName[128];                        // Database filename
-        char   outerJoins[2];                            // Indicates whether the data source supports outer joins
-        char   procedureSupport[2];                      // Indicates whether the data source supports stored procedures
+        wxChar dbmsName[40];                             // Name of the dbms product
+        wxChar dbmsVer[64];                              // Version # of the dbms product
+        wxChar driverName[40];                           // Driver name
+        wxChar odbcVer[60];                              // ODBC version of the driver
+        wxChar drvMgrOdbcVer[60];                        // ODBC version of the driver manager
+        wxChar driverVer[60];                            // Driver version
+        wxChar serverName[80];                           // Server Name, typically a connect string
+        wxChar databaseName[128];                        // Database filename
+        wxChar outerJoins[2];                            // Indicates whether the data source supports outer joins
+        wxChar procedureSupport[2];                      // Indicates whether the data source supports stored procedures
+        wxChar accessibleTables[2];                      // Indicates whether the data source only reports accessible tables in SQLTables.

         UWORD  maxConnections;                           // Maximum # of connections the data source supports
         UWORD  maxStmts;                                 // Maximum # of HSTMTs per HDBC
         UWORD  apiConfLvl;                               // ODBC API conformance level
         UWORD  maxConnections;                           // Maximum # of connections the data source supports
         UWORD  maxStmts;                                 // Maximum # of HSTMTs per HDBC
         UWORD  apiConfLvl;                               // ODBC API conformance level


@@ -440,7 +551,7 @@ public:
         UWORD  cursorCommitBehavior;                     // Indicates how cursors are affected by a db commit
         UWORD  cursorRollbackBehavior;                   // Indicates how cursors are affected by a db rollback
         UWORD  supportNotNullClause;                     // Indicates if data source supports NOT NULL clause
         UWORD  cursorCommitBehavior;                     // Indicates how cursors are affected by a db commit
         UWORD  cursorRollbackBehavior;                   // Indicates how cursors are affected by a db rollback
         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 txnIsolationOptions;                      // Transaction isolation level options available
         UDWORD fetchDirections;                          // Fetch directions supported
         UDWORD txnIsolation;                             // Default transaction isolation level supported by the driver
         UDWORD txnIsolationOptions;                      // Transaction isolation level options available
         UDWORD fetchDirections;                          // Fetch directions supported


@@ -464,7 +575,7 @@ public:
 
 #if wxODBC_BACKWARD_COMPATABILITY
     // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.
 
 #if wxODBC_BACKWARD_COMPATABILITY
     // Information about logical data types VARCHAR, INTEGER, FLOAT and DATE.

-        //
+     //

     // This information is obtained from the ODBC driver by use of the
     // SQLGetTypeInfo() function.  The key piece of information is the
     // type name the data source uses for each logical data type.
     // This information is obtained from the ODBC driver by use of the
     // SQLGetTypeInfo() function.  The key piece of information is the
     // type name the data source uses for each logical data type.


@@ -473,52 +584,80 @@ public:
     wxDbSqlTypeInfo typeInfInteger;
     wxDbSqlTypeInfo typeInfFloat;
     wxDbSqlTypeInfo typeInfDate;
     wxDbSqlTypeInfo typeInfInteger;
     wxDbSqlTypeInfo typeInfFloat;
     wxDbSqlTypeInfo typeInfDate;

+    wxDbSqlTypeInfo typeInfBlob;

 #endif
 
     // Public member functions
 #endif
 
     // Public member functions

-    wxDb(HENV &aHenv, bool FwdOnlyCursors=(bool)TRUE);
-    bool         Open(char *Dsn, char *Uid, char *AuthStr);  // Data Source Name, User ID, Password
+    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);
+    bool         Open(wxDb *copyDb);  // pointer to a wxDb whose connection info should be copied rather than re-queried

     void         Close(void);
     bool         CommitTrans(void);
     bool         RollbackTrans(void);
     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);
     void         DispNextError(void);
     void         Close(void);
     bool         CommitTrans(void);
     bool         RollbackTrans(void);
     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);
     void         DispNextError(void);

-    bool         CreateView(const char *viewName, const char *colList, const char *pSqlStmt, bool attemptDrop=TRUE);
-    bool         DropView(const char *viewName);
-    bool         ExecSql(const char *pSqlStmt);
+    bool         CreateView(const wxString &viewName, const wxString &colList, const wxString &pSqlStmt, bool attemptDrop=TRUE);
+    bool         DropView(const wxString &viewName);
+    bool         ExecSql(const wxString &pSqlStmt);

     bool         GetNext(void);
     bool         GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned);
     bool         GetNext(void);
     bool         GetData(UWORD colNo, SWORD cType, PTR pData, SDWORD maxLen, SDWORD FAR *cbReturned);

-    bool         Grant(int privileges, const char *tableName, const char *userList = "PUBLIC");
-    int          TranslateSqlState(const wxChar *SQLState);
-    wxDbInf     *GetCatalog(char *userID);
-    bool         Catalog(const char *userID=NULL, const char *fileName = SQL_CATALOG_FILENAME);
-    int          GetKeyFields(char *tableName, wxDbColInf* colInf, int nocols);
-
-    wxDbColInf  *GetColumns(char *tableName[], const char *userID=NULL);
-    wxDbColInf  *GetColumns(char *tableName, int *numCols, const char *userID=NULL); 
-
-    int          GetColumnCount(char *tableName, const char *userID=NULL);
-    char        *GetDatabaseName(void) {return dbInf.dbmsName;}
-    char        *GetDataSource(void)   {return dsn;}
-    char        *GetUsername(void)     {return uid;}
-    char        *GetPassword(void)     {return authStr;}
-    bool         IsOpen(void)          {return dbIsOpen;}
-    HENV         GetHENV(void)         {return henv;}
-    HDBC         GetHDBC(void)         {return hdbc;}
-    HSTMT        GetHSTMT(void)        {return hstmt;}
-    int          GetTableCount()       {return nTables;};  // number of tables using this connection
-    wxDbSqlTypeInfo GetTypeInfVarchar(){return typeInfVarchar;}
-    wxDbSqlTypeInfo GetTypeInfInteger(){return typeInfInteger;}
-    wxDbSqlTypeInfo GetTypeInfFloat()  {return typeInfFloat;}
-    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
-    void         LogError(const char *errMsg, const char *SQLState = 0) {logError(errMsg, SQLState);}
+    bool         Grant(int privileges, const wxString &tableName, const wxString &userList = wxT("PUBLIC"));
+    int          TranslateSqlState(const wxString &SQLState);
+    wxDbInf     *GetCatalog(const wxChar *userID=NULL);
+    bool         Catalog(const wxChar *userID=NULL, const wxString &fileName=SQL_CATALOG_FILENAME);
+    int          GetKeyFields(const wxString &tableName, wxDbColInf* colInf, UWORD noCols);
+
+    wxDbColInf  *GetColumns(wxChar *tableName[], const wxChar *userID=NULL);
+    wxDbColInf  *GetColumns(const wxString &tableName, UWORD *numCols, 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;}
+    const wxString &GetUsername(void)      {return uid;}
+    const wxString &GetPassword(void)      {return authStr;}
+    bool            IsOpen(void)           {return dbIsOpen;}
+    HENV            GetHENV(void)          {return henv;}
+    HDBC            GetHDBC(void)          {return hdbc;}
+    HSTMT           GetHSTMT(void)         {return hstmt;}
+    int             GetTableCount()        {return nTables;}  // number of tables using this connection
+    wxDbSqlTypeInfo GetTypeInfVarchar()    {return typeInfVarchar;}
+    wxDbSqlTypeInfo GetTypeInfInteger()    {return typeInfInteger;}
+    wxDbSqlTypeInfo GetTypeInfFloat()      {return typeInfFloat;}
+    wxDbSqlTypeInfo GetTypeInfDate()       {return typeInfDate;}
+    wxDbSqlTypeInfo GetTypeInfBlob()       {return typeInfBlob;}
+
+    // tableName can refer to a table, view, alias or synonym
+    bool         TableExists(const wxString &tableName, const wxChar *userID=NULL, 
+                             const wxString &tablePath=wxEmptyString);
+    bool         TablePrivileges(const wxString &tableName, const wxString &priv, 
+                                 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 wxChar *tableName);
+    const wxString  SQLColumnName(const wxChar *colName);
+
+    void         LogError(const wxString &errMsg, const wxString &SQLState = wxEmptyString) 
+                        { 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         WriteSqlLog(const wxChar *logMsg);
+    bool         SetSqlLogging(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME, 
+                               bool append = FALSE);
+    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=wxEmptyString);
+

     bool         FwdOnlyCursors(void)  {return fwdOnlyCursors;}
 
     // These two functions are provided strictly for use by wxDbTable.
     bool         FwdOnlyCursors(void)  {return fwdOnlyCursors;}
 
     // These two functions are provided strictly for use by wxDbTable.


@@ -535,19 +674,22 @@ public:
 // or for multiple database support.
 struct wxDbList
 {
 // or for multiple database support.
 struct wxDbList
 {

-    wxDbList *PtrPrev;                      // Pointer to previous item in the list
-    wxChar    Dsn[SQL_MAX_DSN_LENGTH+1];    // Data Source Name
-    wxDb     *PtrDb;                        // Pointer to the wxDb object
-    bool      Free;                         // Is item free or in use?
-    wxDbList *PtrNext;                      // Pointer to next item in the list
+    wxDbList *PtrPrev;       // Pointer to previous item in the list
+    wxString  Dsn;           // Data Source Name
+    wxString  Uid;           // User ID
+    wxString  AuthStr;       // Authorization string (password)
+    wxDb     *PtrDb;         // Pointer to the wxDb object
+    bool      Free;          // Is item free or in use?
+    wxDbList *PtrNext;       // Pointer to next item in the list

 };
 
 };
 

+

 #ifdef __WXDEBUG__
 #include "wx/object.h"
 class wxTablesInUse : public wxObject
 {
     public:
 #ifdef __WXDEBUG__
 #include "wx/object.h"
 class wxTablesInUse : public wxObject
 {
     public:

-        const char    *tableName;
+        const wxChar  *tableName;

         ULONG          tableID;
         class wxDb    *pDb;
 };  // wxTablesInUse
         ULONG          tableID;
         class wxDb    *pDb;
 };  // wxTablesInUse


@@ -563,22 +705,30 @@ void  WXDLLEXPORT  wxDbCloseConnections(void);
 int   WXDLLEXPORT  wxDbConnectionsInUse(void);
 
 
 int   WXDLLEXPORT  wxDbConnectionsInUse(void);
 
 

+// 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,
+                                                  const wxChar *ErrFile,
+                                                  int ErrLine);
+
+

 // This function sets the sql log state for all open wxDb objects
 // This function sets the sql log state for all open wxDb objects

-bool wxDbSqlLog(wxDbSqlLogState state, const wxChar *filename = SQL_LOG_FILENAME);
+bool  WXDLLEXPORT  wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);

 
 
 #if 0
 // MSW/VC6 ONLY!!!  Experimental
 
 
 #if 0
 // MSW/VC6 ONLY!!!  Experimental

-int WXDLLEXPORT wxDbCreateDataSource(const char *driverName, const char *dsn, const char *description="",
-                                     bool sysDSN=FALSE, const char *defDir="", wxWindow *parent=NULL);
+int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description=wxEmptyString,
+                                     bool sysDSN=FALSE, const wxString &defDir=wxEmptyString, wxWindow *parent=NULL);

 #endif
 
 // This routine allows you to query a driver manager
 // for a list of available datasources.  Call this routine
 // the first time using SQL_FETCH_FIRST.  Continue to call it
 // using SQL_FETCH_NEXT until you've exhausted the list.
 #endif
 
 // This routine allows you to query a driver manager
 // for a list of available datasources.  Call this routine
 // the first time using SQL_FETCH_FIRST.  Continue to call it
 // using SQL_FETCH_NEXT until you've exhausted the list.

-bool WXDLLEXPORT wxDbGetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
-                                   UWORD direction = SQL_FETCH_NEXT);
+bool WXDLLEXPORT wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
+                                   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


@@ -614,7 +764,7 @@ bool  WXDLLEXPORT  FreeDbConnection(wxDB *pDb);
 void  WXDLLEXPORT  CloseDbConnections(void);
 int   WXDLLEXPORT  NumberDbConnectionsInUse(void);
 
 void  WXDLLEXPORT  CloseDbConnections(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,
                                UWORD direction = SQL_FETCH_NEXT);
 
 bool WXDLLEXPORT GetDataSource(HENV henv, char *Dsn, SWORD DsnMax, char *DsDesc, SWORD DsDescMax,
                                UWORD direction = SQL_FETCH_NEXT);