Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added support (barely tested) for MaxDB from MySQL

Browse Source 
Added dbmsFutureX to the database enumerations to allow for adding support for new databases between releases of wxWidgets


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2005-03-14 14:41:12 +00:00
parent 2889677e28
commit f6a9f9ad28
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/db.cpp
View File

@@ -576,9 +576,10 @@ const wxChar *wxDb::convertUserID(const wxChar *userID, wxString &UserID)
|| Dbms() == dbmsXBASE_SEQUITER ) || Dbms() == dbmsXBASE_SEQUITER )
UserID.Empty(); UserID.Empty();
// Oracle user names may only be in uppercase, so force // Some databases require user names to be specified in uppercase,
// the name to uppercase // so force the name to uppercase
if (Dbms() == dbmsORACLE) if ((Dbms() == dbmsORACLE) ||
(Dbms() == dbmsMAXDB))
UserID = UserID.Upper(); UserID = UserID.Upper();
return UserID.c_str(); return UserID.c_str();
@@ -3949,6 +3950,8 @@ wxDBMS wxDb::Dbms(void)
return((wxDBMS)(dbmsType = dbmsXBASE_SEQUITER)); return((wxDBMS)(dbmsType = dbmsXBASE_SEQUITER));
if (!wxStricmp(baseName,wxT("MySQL"))) if (!wxStricmp(baseName,wxT("MySQL")))
return((wxDBMS)(dbmsType = dbmsMY_SQL)); return((wxDBMS)(dbmsType = dbmsMY_SQL));
if (!wxStricmp(baseName,wxT("MaxDB")))
return((wxDBMS)(dbmsType = dbmsMAXDB));
baseName[3] = 0; baseName[3] = 0;
if (!wxStricmp(baseName,wxT("DB2"))) if (!wxStricmp(baseName,wxT("DB2")))

1
src/common/dbtable.cpp
View File

@@ -1853,6 +1853,7 @@ bool wxDbTable::DropIndex(const wxString &indexName)
(pDb->Dbms() == dbmsSYBASE_ASE && !wxStrcmp(pDb->sqlState,wxT("37000"))) || (pDb->Dbms() == dbmsSYBASE_ASE && !wxStrcmp(pDb->sqlState,wxT("37000"))) ||
(pDb->Dbms() == dbmsMS_SQL_SERVER && !wxStrcmp(pDb->sqlState,wxT("S1000"))) || (pDb->Dbms() == dbmsMS_SQL_SERVER && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
(pDb->Dbms() == dbmsINTERBASE && !wxStrcmp(pDb->sqlState,wxT("S1000"))) || (pDb->Dbms() == dbmsINTERBASE && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
(pDb->Dbms() == dbmsMAXDB && !wxStrcmp(pDb->sqlState,wxT("S1000"))) ||
(pDb->Dbms() == dbmsFIREBIRD && !wxStrcmp(pDb->sqlState,wxT("HY000"))) || (pDb->Dbms() == dbmsFIREBIRD && !wxStrcmp(pDb->sqlState,wxT("HY000"))) ||
(pDb->Dbms() == dbmsSYBASE_ASE && !wxStrcmp(pDb->sqlState,wxT("S0002"))) || // Base table not found (pDb->Dbms() == dbmsSYBASE_ASE && !wxStrcmp(pDb->sqlState,wxT("S0002"))) || // Base table not found
(pDb->Dbms() == dbmsMY_SQL && !wxStrcmp(pDb->sqlState,wxT("42S12"))) || // tested by Christopher Ludwik Marino-Cebulski using v3.23.21beta (pDb->Dbms() == dbmsMY_SQL && !wxStrcmp(pDb->sqlState,wxT("42S12"))) || // tested by Christopher Ludwik Marino-Cebulski using v3.23.21beta