hide tree root on wxMSW in wxHtmlHelpController

[wxWidgets.git] / src / common / db.cpp

diff --git a/src/common/db.cpp b/src/common/db.cpp
index 57b25f226d1b36a75741e828dae50a329790a7aa..065a0ac9d59dd3d03f754f7e00dabdf2573c0cdc 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -53,7 +53,9 @@
     #include "wx/object.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/object.h"
     #include "wx/list.h"
     #include "wx/utils.h"

-    #include "wx/msgdlg.h"
+    #if wxUSE_GUI
+        #include "wx/msgdlg.h"
+    #endif

     #include "wx/log.h"
 #endif
 #include "wx/filefn.h"
     #include "wx/log.h"
 #endif
 #include "wx/filefn.h"


@@ -601,15 +603,6 @@ bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthSt
                          (UCHAR FAR *) uid.c_str(), SQL_NTS,
                          (UCHAR FAR *) authStr.c_str(), SQL_NTS);
 
                          (UCHAR FAR *) uid.c_str(), SQL_NTS,
                          (UCHAR FAR *) authStr.c_str(), SQL_NTS);
 

-/*
-    if (retcode == SQL_SUCCESS_WITH_INFO)
-        DispAllErrors(henv, hdbc);
-    else if (retcode != SQL_SUCCESS)
-        return(DispAllErrors(henv, hdbc));
-
-    if (retcode == SQL_ERROR)
-        return(DispAllErrors(henv, hdbc));
-*/

     if ((retcode != SQL_SUCCESS) &&
         (retcode != SQL_SUCCESS_WITH_INFO))
         return(DispAllErrors(henv, hdbc));
     if ((retcode != SQL_SUCCESS) &&
         (retcode != SQL_SUCCESS_WITH_INFO))
         return(DispAllErrors(henv, hdbc));


@@ -1403,7 +1396,7 @@ void wxDb::Close(void)
         {
             s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
             s2.Printf(wxT("Orphaned found using pDb:[%p]"),this);
         {
             s.Printf(wxT("(%-20s)     tableID:[%6lu]     pDb:[%p]"), tiu->tableName,tiu->tableID,tiu->pDb);
             s2.Printf(wxT("Orphaned found using pDb:[%p]"),this);

-            wxLogDebug (s,s2);
+            wxLogDebug (s.c_str(),s2.c_str());

         }
         pNode = pNode->Next();
     }
         }
         pNode = pNode->Next();
     }


@@ -1782,7 +1775,7 @@ bool wxDb::Grant(int privileges, const wxString &tableName, const wxString &user
     }
 
     sqlStmt += wxT(" ON ");
     }
 
     sqlStmt += wxT(" ON ");

-    sqlStmt += tableName;
+    sqlStmt += SQLTableName(tableName);

     sqlStmt += wxT(" TO ");
     sqlStmt += userList;
 
     sqlStmt += wxT(" TO ");
     sqlStmt += userList;
 


@@ -2685,7 +2678,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
     // Build a generic SELECT statement which returns 0 rows
     wxString Stmt;
 
     // Build a generic SELECT statement which returns 0 rows
     wxString Stmt;
 

-    Stmt.Printf(wxT("select * from %s where 0=1"), tableName);
+    Stmt.Printf(wxT("select * from \"%s\" where 0=1"), tableName);

 
     // Execute query
     if (SQLExecDirect(hstmt, (UCHAR FAR *) Stmt.c_str(), SQL_NTS) != SQL_SUCCESS)
 
     // Execute query
     if (SQLExecDirect(hstmt, (UCHAR FAR *) Stmt.c_str(), SQL_NTS) != SQL_SUCCESS)


@@ -2757,7 +2750,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
 
 
 /********** wxDb::GetColumnCount() **********/
 
 
 /********** wxDb::GetColumnCount() **********/

-UWORD wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)
+int wxDb::GetColumnCount(const wxString &tableName, const wxChar *userID)

 /*
  * Returns a count of how many columns are in a table.
  * If an error occurs in computing the number of columns
 /*
  * Returns a count of how many columns are in a table.
  * If an error occurs in computing the number of columns


@@ -2978,7 +2971,7 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
     wxChar    colName[DB_MAX_COLUMN_NAME_LEN+1];
     SWORD     sqlDataType;
     wxChar    typeName[30+1];
     wxChar    colName[DB_MAX_COLUMN_NAME_LEN+1];
     SWORD     sqlDataType;
     wxChar    typeName[30+1];

-    SWORD     precision, length;
+    SDWORD    precision, length;

 
     FILE *fp = fopen(fileName.c_str(),wxT("wt"));
     if (fp == NULL)
 
     FILE *fp = fopen(fileName.c_str(),wxT("wt"));
     if (fp == NULL)


@@ -3020,8 +3013,12 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
     tblNameSave.Empty();
     int cnt = 0;
 
     tblNameSave.Empty();
     int cnt = 0;
 

-    while ((retcode = SQLFetch(hstmt)) == SQL_SUCCESS)
+    while (TRUE)

     {
     {

+        retcode = SQLFetch(hstmt);
+        if (retcode != SQL_SUCCESS && retcode != SQL_SUCCESS_WITH_INFO)
+            break;
+

         if (wxStrcmp(tblName, tblNameSave.c_str()))
         {
             if (cnt)
         if (wxStrcmp(tblName, tblNameSave.c_str()))
         {
             if (cnt)


@@ -3042,12 +3039,12 @@ bool wxDb::Catalog(const wxChar *userID, const wxString &fileName)
             tblNameSave = tblName;
         }
 
             tblNameSave = tblName;
         }
 

-      GetData(3,SQL_C_CHAR,  (UCHAR *)tblName,     DB_MAX_TABLE_NAME_LEN+1, &cb);
-      GetData(4,SQL_C_CHAR,  (UCHAR *)colName,     DB_MAX_COLUMN_NAME_LEN+1,&cb);
-      GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType,0,                       &cb);
-      GetData(6,SQL_C_CHAR,  (UCHAR *)typeName,    sizeof(typeName),        &cb);
-      GetData(7,SQL_C_SSHORT,(UCHAR *)&precision,  0,                       &cb);
-      GetData(8,SQL_C_SSHORT,(UCHAR *)&length,     0,                       &cb);
+      GetData(3,SQL_C_CHAR,  (UCHAR *) tblName,     DB_MAX_TABLE_NAME_LEN+1, &cb);
+      GetData(4,SQL_C_CHAR,  (UCHAR *) colName,     DB_MAX_COLUMN_NAME_LEN+1,&cb);
+      GetData(5,SQL_C_SSHORT,(UCHAR *)&sqlDataType, 0,                       &cb);
+      GetData(6,SQL_C_CHAR,  (UCHAR *) typeName,    sizeof(typeName),        &cb);
+      GetData(7,SQL_C_SLONG, (UCHAR *)&precision,   0,                       &cb);
+      GetData(8,SQL_C_SLONG, (UCHAR *)&length,      0,                       &cb);

 
         outStr.Printf(wxT("%-32s %-32s (%04d)%-15s %9d %9d\n"),
             tblName, colName, sqlDataType, typeName, precision, length);
 
         outStr.Printf(wxT("%-32s %-32s (%04d)%-15s %9d %9d\n"),
             tblName, colName, sqlDataType, typeName, precision, length);


@@ -3275,6 +3272,34 @@ bool wxDb::TablePrivileges(const wxString &tableName, const wxString &priv, cons
 }  // wxDb::TablePrivileges
 
 
 }  // wxDb::TablePrivileges
 
 

+const wxString wxDb::SQLTableName(const wxChar *tableName)
+{
+    wxString TableName;
+
+    if (Dbms() == dbmsACCESS)
+        TableName = '"';
+    TableName += tableName;
+    if (Dbms() == dbmsACCESS)
+        TableName += '"';
+
+    return TableName;
+}  // wxDb::SQLTableName()
+
+
+const wxString wxDb::SQLColumnName(const wxChar *colName)
+{
+    wxString ColName;
+
+    if (Dbms() == dbmsACCESS)
+        ColName = '"';
+    ColName += colName;
+    if (Dbms() == dbmsACCESS)
+        ColName += '"';
+
+    return ColName;
+}  // wxDb::SQLColumnName()
+
+

 /********** wxDb::SetSqlLogging() **********/
 bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool append)
 {
 /********** wxDb::SetSqlLogging() **********/
 bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool append)
 {


@@ -3523,7 +3548,7 @@ bool wxDb::ModifyColumn(const wxString &tableName, const wxString &columnName,
     }
 
     // create the SQL statement
     }
 
     // create the SQL statement

-    sqlStmt.Printf(wxT("ALTER TABLE %s %s %s %s"), tableName.c_str(), alterSlashModify.c_str(),
+    sqlStmt.Printf(wxT("ALTER TABLE \"%s\" \"%s\" \"%s\" %s"), tableName.c_str(), alterSlashModify.c_str(),

               columnName.c_str(), dataTypeName.c_str());
 
     // For varchars only, append the size of the column
               columnName.c_str(), dataTypeName.c_str());
 
     // For varchars only, append the size of the column


@@ -3696,8 +3721,10 @@ int WXDLLEXPORT wxDbConnectionsInUse(void)
 
 /********** wxDbLogExtendedErrorMsg() **********/
 // DEBUG ONLY function
 
 /********** wxDbLogExtendedErrorMsg() **********/
 // DEBUG ONLY function

-const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *pDb,
-                             char *ErrFile, int ErrLine)
+const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText,
+                                                  wxDb *pDb,
+                                                  const wxChar *ErrFile,
+                                                  int ErrLine)

 {
     static wxString msg;
     msg = userText;
 {
     static wxString msg;
     msg = userText;


@@ -3716,7 +3743,7 @@ const wxChar WXDLLEXPORT *wxDbLogExtendedErrorMsg(const wxChar *userText, wxDb *
 
     msg.Append (wxT("\nODBC errors:\n"));
     msg += wxT("\n");
 
     msg.Append (wxT("\nODBC errors:\n"));
     msg += wxT("\n");

-    
+

     // Display errors for this connection
     int i;
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)
     // Display errors for this connection
     int i;
     for (i = 0; i < DB_MAX_ERROR_HISTORY; i++)


@@ -3845,7 +3872,7 @@ int wxDbCreateDataSource(const wxString &driverName, const wxString &dsn, const
 
 /********** wxDbGetDataSource() **********/
 bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,
 
 /********** wxDbGetDataSource() **********/
 bool wxDbGetDataSource(HENV henv, wxChar *Dsn, SWORD DsnMax, wxChar *DsDesc,

-                       SWORD DsDescMax, DWORD direction)
+                       SWORD DsDescMax, UWORD direction)

 /*
  * Dsn and DsDesc will contain the data source name and data source
  * description upon return
 /*
  * Dsn and DsDesc will contain the data source name and data source
  * description upon return