X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/209875803df0460405bac340d8b4fdae7603fb10..e5ee4c908b9dbcf07f0441aa74d8635b7343be4d:/include/wx/db.h

diff --git a/include/wx/db.h b/include/wx/db.h
index 708d6d74b2..5216709500 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -54,8 +54,20 @@
 
 #include "wx/setup.h"
 
-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
@@ -66,10 +78,12 @@ extern "C" {
     #include "sqlext.h"
     #include "odbcinst.h"
 #else
+extern "C" {
     #include "wx/isql.h"
     #include "wx/isqlext.h"
-#endif
 }
+#endif
+
 
 typedef float SFLOAT;
 typedef double SDOUBLE;
@@ -98,7 +112,7 @@ enum enumDummy {enumDum1};
         #define SQL_C_BLOB SQL_VARBINARY
     #endif
 #endif
-
+/*
 #ifndef TRUE
 #define TRUE true
 #endif
@@ -106,12 +120,11 @@ enum enumDummy {enumDum1};
 #ifndef FALSE
 #define FALSE false
 #endif
-
+*/
 const int wxDB_PATH_MAX                 = 254;
 
-extern wxChar const *SQL_LOG_FILENAME;
-extern wxChar 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;
@@ -444,7 +457,8 @@ 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.
-extern wxChar 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
@@ -586,7 +600,7 @@ public:
     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 wxString &viewName, const wxString &colList, const wxString &pSqlStmt, bool attemptDrop=true);
+    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);
@@ -600,7 +614,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;}
@@ -624,11 +638,19 @@ 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 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; }
     bool         SetSqlLogging(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME, 
-                               bool append = false);
+                               bool append = FALSE);
     bool         WriteSqlLog(const wxString &logMsg);
 
     wxDBMS       Dbms(void);
@@ -683,12 +705,13 @@ 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
+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
 bool  WXDLLEXPORT  wxDbSqlLog(wxDbSqlLogState state, const wxString &filename = SQL_LOG_FILENAME);
@@ -697,7 +720,7 @@ bool  WXDLLEXPORT  wxDbSqlLog(wxDbSqlLogState state, const wxString &filename =
 #if 0
 // MSW/VC6 ONLY!!!  Experimental
 int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const wxString &description=wxEmptyString,
-                                     bool sysDSN=false, const wxString &defDir=wxEmptyString, wxWindow *parent=NULL);
+                                     bool sysDSN=FALSE, const wxString &defDir=wxEmptyString, wxWindow *parent=NULL);
 #endif
 
 // This routine allows you to query a driver manager
@@ -705,7 +728,7 @@ int WXDLLEXPORT wxDbCreateDataSource(const wxString &driverName, const wxString
 // 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, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
-                                   SWORD DsDescMax, DWORD direction = SQL_FETCH_NEXT);
+                                   SWORD DsDescMax, UWORD direction = SQL_FETCH_NEXT);
 
 
 // Change this to 0 to remove use of all deprecated functions