From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 16 Aug 2002 12:43:07 +0000 (+0000)
Subject: Applied patch [ 566816 ] adds xBase type for Sequiter's SQL/ODBC
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9f4de2dcf82443596074427fbfcc5f38d606267a

Applied patch [ 566816 ] adds xBase type for Sequiter's SQL/ODBC


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16545 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/db.h b/include/wx/db.h
index 16d239a63b..cebf1e4579 100644
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -452,7 +452,8 @@ enum wxDBMS
     dbmsVIRTUOSO,
     dbmsDB2,
     dbmsINTERBASE,
-    dbmsPERVASIVE_SQL
+    dbmsPERVASIVE_SQL,
+    dbmsXBASE_SEQUITER
 };
 
 
diff --git a/src/common/db.cpp b/src/common/db.cpp
index 15160d5951..085e6cad5c 100644
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -562,7 +562,8 @@ const wxChar *wxDb::convertUserID(const wxChar *userID, wxString &UserID)
         UserID.Empty();
 
     // dBase does not use user names, and some drivers fail if you try to pass one
-    if (Dbms() == dbmsDBASE)
+    if ( Dbms() == dbmsDBASE
+         || Dbms() == dbmsXBASE_SEQUITER )
         UserID.Empty();
 
     // Oracle user names may only be in uppercase, so force
@@ -3498,6 +3499,9 @@ wxDBMS wxDb::Dbms(void)
     if (!wxStricmp(baseName,wxT("DBASE")))
         return((wxDBMS)(dbmsType = dbmsDBASE));
 
+    if (!wxStricmp(baseName,wxT("xBase")))
+        return((wxDBMS)(dbmsType = dbmsXBASE_SEQUITER));
+    
     if (!wxStricmp(baseName,wxT("MySQL")))
         return((wxDBMS)(dbmsType = dbmsMY_SQL));
 
@@ -3565,6 +3569,7 @@ bool wxDb::ModifyColumn(const wxString &tableName, const wxString &columnName,
         case dbmsPOSTGRES :
         case dbmsACCESS :
         case dbmsDBASE :
+        case dbmsXBASE_SEQUITER :
         default :
             alterSlashModify = "MODIFY";
             break;
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 49e2c2348d..03d947568a 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -1417,7 +1417,9 @@ bool wxDbTable::CreateTable(bool attemptDrop)
             break;
         }
     }
-    if (j && pDb->Dbms() != dbmsDBASE)  // Found a keyfield
+    if (j && (pDb->Dbms() != dbmsDBASE) 
+		  && (pDb->Dbms() != dbmsXBASE_SEQUITER)
+	   )  // Found a keyfield
     {
         switch (pDb->Dbms())
         {
@@ -1711,7 +1713,8 @@ bool wxDbTable::DropIndex(const wxString &idxName)
                        pDb->SQLTableName(idxName.c_str()).c_str(),
                        pDb->SQLTableName(tableName.c_str()).c_str());
     else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
-             (pDb->Dbms() == dbmsSYBASE_ASE))
+             (pDb->Dbms() == dbmsSYBASE_ASE) ||
+			 (pDb->Dbms() == dbmsXBASE_SEQUITER))
         sqlStmt.Printf(wxT("DROP INDEX %s.%s"),
                        pDb->SQLTableName(tableName.c_str()).c_str(),
                        pDb->SQLTableName(idxName.c_str()).c_str());