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

Added code to handle SQLSERVER, ACCESS, and MSDE allowing spaces in table names and column names (ARRRRGH! -> MS)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11830 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
George Tasker
2001-10-04 16:44:08 +00:00
parent 4f92cd25f1
commit 243d4b3603
4 changed files with 87 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/dbbrowse/browsedb.cpp
View File

@@ -345,7 +345,7 @@ bool BrowserDB::OnSelect(wxString tb_Name, int Quiet)
wxString SQLStmt; wxString SQLStmt;
i_Records = 0; i_Records = 0;
//--------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------
SQLStmt.sprintf("SELECT * FROM %s",tb_Name.c_str()); SQLStmt.sprintf("SELECT * FROM %s",db_BrowserDB->SQLTableName(tb_Name.c_str()));
if (!db_BrowserDB->ExecSql((char *)(SQLStmt.GetData()))) if (!db_BrowserDB->ExecSql((char *)(SQLStmt.GetData())))
{ {
Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str()); Temp0.Printf(_("\n-E-> BrowserDB::OnSelect - ODBC-Error with ExecSql of >%s<.\n-E-> "),tb_Name.c_str());

8
include/wx/db.h
View File

@@ -627,6 +627,14 @@ public:
const wxChar *userID=NULL, const wxChar *schema=NULL, const wxChar *userID=NULL, const wxChar *schema=NULL,
const wxString &path=wxEmptyString); 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 char *tableName);
const wxString SQLColumnName(const char *colName);
void LogError(const wxString &errMsg, const wxString &SQLState = wxEmptyString) void LogError(const wxString &errMsg, const wxString &SQLState = wxEmptyString)
{ logError(errMsg, SQLState); } { logError(errMsg, SQLState); }
void SetDebugErrorMessages(bool state) { silent = !state; } void SetDebugErrorMessages(bool state) { silent = !state; }

43
src/common/db.cpp
View File

@@ -603,15 +603,6 @@ bool wxDb::Open(const wxString &Dsn, const wxString &Uid, const wxString &AuthSt
(UCHAR FAR *) uid.c_str(), SQL_NTS, (UCHAR FAR *) uid.c_str(), SQL_NTS,
(UCHAR FAR *) authStr.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) && if ((retcode != SQL_SUCCESS) &&
(retcode != SQL_SUCCESS_WITH_INFO)) (retcode != SQL_SUCCESS_WITH_INFO))
return(DispAllErrors(henv, hdbc)); return(DispAllErrors(henv, hdbc));
@@ -1784,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 += wxT(" TO ");
sqlStmt += userList; sqlStmt += userList;
@@ -2687,7 +2678,7 @@ wxDbColInf *wxDb::GetColumns(const wxString &tableName, int *numCols, const wxCh
// Build a generic SELECT statement which returns 0 rows // Build a generic SELECT statement which returns 0 rows
wxString Stmt; wxString Stmt;
Stmt.Printf(wxT("select * from %s where 0=1"), tableName); Stmt.Printf(wxT("select * from \"%s\" where 0=1"), tableName);
// Execute query // Execute query
if (SQLExecDirect(hstmt, (UCHAR FAR *) Stmt.c_str(), SQL_NTS) != SQL_SUCCESS) if (SQLExecDirect(hstmt, (UCHAR FAR *) Stmt.c_str(), SQL_NTS) != SQL_SUCCESS)
@@ -3281,6 +3272,34 @@ bool wxDb::TablePrivileges(const wxString &tableName, const wxString &priv, cons
} // wxDb::TablePrivileges } // wxDb::TablePrivileges
const wxString wxDb::SQLTableName(const char *tableName)
{
wxString TableName;
if (Dbms() == dbmsACCESS)
TableName = '"';
TableName += tableName;
if (Dbms() == dbmsACCESS)
TableName += '"';
return TableName;
} // wxDb::SQLTableName()
const wxString wxDb::SQLColumnName(const char *colName)
{
wxString ColName;
if (Dbms() == dbmsACCESS)
ColName = '"';
ColName += colName;
if (Dbms() == dbmsACCESS)
ColName += '"';
return ColName;
} // wxDb::SQLColumnName()
/********** wxDb::SetSqlLogging() **********/ /********** wxDb::SetSqlLogging() **********/
bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool append) bool wxDb::SetSqlLogging(wxDbSqlLogState state, const wxString &filename, bool append)
{ {
@@ -3529,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()); columnName.c_str(), dataTypeName.c_str());
// For varchars only, append the size of the column // For varchars only, append the size of the column

77
src/common/dbtable.cpp
View File

@@ -763,14 +763,15 @@ bool wxDbTable::Open(bool checkPrivileges, bool checkTableExists)
if (!queryOnly && noCols > 0) if (!queryOnly && noCols > 0)
{ {
bool needComma = FALSE; bool needComma = FALSE;
sqlStmt.Printf(wxT("INSERT INTO %s ("), tableName.c_str()); sqlStmt.Printf(wxT("INSERT INTO %s ("), pDb->SQLTableName(tableName.c_str()));
for (i = 0; i < noCols; i++) for (i = 0; i < noCols; i++)
{ {
if (! colDefs[i].InsertAllowed) if (! colDefs[i].InsertAllowed)
continue; continue;
if (needComma) if (needComma)
sqlStmt += wxT(","); sqlStmt += wxT(",");
sqlStmt += colDefs[i].ColName; sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
// sqlStmt += colDefs[i].ColName;
needComma = TRUE; needComma = TRUE;
} }
needComma = FALSE; needComma = FALSE;
@@ -914,11 +915,11 @@ void wxDbTable::BuildDeleteStmt(wxString &pSqlStmt, int typeOfDel, const wxStrin
// delete all records from the database in this case. // delete all records from the database in this case.
if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0)) if (typeOfDel == DB_DEL_WHERE && (pWhereClause.Length() == 0))
{ {
pSqlStmt.Printf(wxT("DELETE FROM %s"), tableName.c_str()); pSqlStmt.Printf(wxT("DELETE FROM %s"), pDb->SQLTableName(tableName.c_str()));
return; return;
} }
pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "), tableName.c_str()); pSqlStmt.Printf(wxT("DELETE FROM %s WHERE "), pDb->SQLTableName(tableName.c_str()));
// Append the WHERE clause to the SQL DELETE statement // Append the WHERE clause to the SQL DELETE statement
switch(typeOfDel) switch(typeOfDel)
@@ -1000,10 +1001,12 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
// If joining tables, the base table column names must be qualified to avoid ambiguity // If joining tables, the base table column names must be qualified to avoid ambiguity
if (appendFromClause || pDb->Dbms() == dbmsACCESS) if (appendFromClause || pDb->Dbms() == dbmsACCESS)
{ {
pSqlStmt += queryTableName; pSqlStmt += pDb->SQLTableName(queryTableName.c_str());
// pSqlStmt += queryTableName;
pSqlStmt += wxT("."); pSqlStmt += wxT(".");
} }
pSqlStmt += colDefs[i].ColName; pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
// pSqlStmt += colDefs[i].ColName;
if (i + 1 < noCols) if (i + 1 < noCols)
pSqlStmt += wxT(","); pSqlStmt += wxT(",");
} }
@@ -1016,7 +1019,8 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
if (appendFromClause || pDb->Dbms() == dbmsACCESS) if (appendFromClause || pDb->Dbms() == dbmsACCESS)
{ {
pSqlStmt += wxT(","); pSqlStmt += wxT(",");
pSqlStmt += queryTableName; pSqlStmt += pDb->SQLTableName(queryTableName);
// pSqlStmt += queryTableName;
pSqlStmt += wxT(".ROWID"); pSqlStmt += wxT(".ROWID");
} }
else else
@@ -1025,7 +1029,8 @@ void wxDbTable::BuildSelectStmt(wxString &pSqlStmt, int typeOfSelect, bool disti
// Append the FROM tablename portion // Append the FROM tablename portion
pSqlStmt += wxT(" FROM "); pSqlStmt += wxT(" FROM ");
pSqlStmt += queryTableName; pSqlStmt += pDb->SQLTableName(queryTableName);
// pSqlStmt += queryTableName;
// Sybase uses the HOLDLOCK keyword to lock a record during query. // Sybase uses the HOLDLOCK keyword to lock a record during query.
// The HOLDLOCK keyword follows the table name in the from clause. // The HOLDLOCK keyword follows the table name in the from clause.
@@ -1112,7 +1117,7 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
bool firstColumn = TRUE; bool firstColumn = TRUE;
pSqlStmt.Printf(wxT("UPDATE %s SET "), tableName.Upper().c_str()); pSqlStmt.Printf(wxT("UPDATE %s SET "), pDb->SQLTableName(tableName.Upper().c_str()));
// Append a list of columns to be updated // Append a list of columns to be updated
int i; int i;
@@ -1125,7 +1130,9 @@ void wxDbTable::BuildUpdateStmt(wxString &pSqlStmt, int typeOfUpd, const wxStrin
pSqlStmt += wxT(","); pSqlStmt += wxT(",");
else else
firstColumn = FALSE; firstColumn = FALSE;
pSqlStmt += colDefs[i].ColName;
pSqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
// pSqlStmt += colDefs[i].ColName;
pSqlStmt += wxT(" = ?"); pSqlStmt += wxT(" = ?");
} }
} }
@@ -1205,10 +1212,12 @@ void wxDbTable::BuildWhereClause(wxString &pWhereClause, int typeOfWhere,
// Concatenate where phrase for the column // Concatenate where phrase for the column
if (qualTableName.Length()) if (qualTableName.Length())
{ {
pWhereClause += qualTableName; pWhereClause += pDb->SQLTableName(qualTableName);
// pWhereClause += qualTableName;
pWhereClause += wxT("."); pWhereClause += wxT(".");
} }
pWhereClause += colDefs[i].ColName; pWhereClause += pDb->SQLColumnName(colDefs[i].ColName);
// pWhereClause += colDefs[i].ColName;
if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR)) if (useLikeComparison && (colDefs[i].SqlCtype == SQL_C_CHAR))
pWhereClause += wxT(" LIKE "); pWhereClause += wxT(" LIKE ");
else else
@@ -1331,7 +1340,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
// Build a CREATE TABLE string from the colDefs structure. // Build a CREATE TABLE string from the colDefs structure.
bool needComma = FALSE; bool needComma = FALSE;
sqlStmt.Printf(wxT("CREATE TABLE %s ("), tableName.c_str());
sqlStmt.Printf(wxT("CREATE TABLE %s ("), pDb->SQLTableName(tableName.c_str()));
for (i = 0; i < noCols; i++) for (i = 0; i < noCols; i++)
{ {
@@ -1342,7 +1352,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
if (needComma) if (needComma)
sqlStmt += wxT(","); sqlStmt += wxT(",");
// Column Name // Column Name
sqlStmt += colDefs[i].ColName; sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
// sqlStmt += colDefs[i].ColName;
sqlStmt += wxT(" "); sqlStmt += wxT(" ");
// Column Type // Column Type
switch(colDefs[i].DbDataType) switch(colDefs[i].DbDataType)
@@ -1415,10 +1426,12 @@ bool wxDbTable::CreateTable(bool attemptDrop)
if (pDb->Dbms() == dbmsDB2) if (pDb->Dbms() == dbmsDB2)
{ {
wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters.")); wxASSERT_MSG((tableName && wxStrlen(tableName) <= 13), wxT("DB2 table/index names must be no longer than 13 characters in length.\n\nTruncating table name to 13 characters."));
sqlStmt += tableName.substr(0, 13); sqlStmt += pDb->SQLTableName(tableName.substr(0, 13).c_str());
// sqlStmt += tableName.substr(0, 13);
} }
else else
sqlStmt += tableName; sqlStmt += pDb->SQLTableName(tableName.c_str());
// sqlStmt += tableName;
sqlStmt += wxT("_PIDX PRIMARY KEY ("); sqlStmt += wxT("_PIDX PRIMARY KEY (");
break; break;
@@ -1432,7 +1445,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
{ {
if (j++) // Multi part key, comma separate names if (j++) // Multi part key, comma separate names
sqlStmt += wxT(","); sqlStmt += wxT(",");
sqlStmt += colDefs[i].ColName; sqlStmt += pDb->SQLColumnName(colDefs[i].ColName);
// sqlStmt += colDefs[i].ColName;
} }
} }
sqlStmt += wxT(")"); sqlStmt += wxT(")");
@@ -1442,7 +1456,8 @@ bool wxDbTable::CreateTable(bool attemptDrop)
pDb->Dbms() == dbmsSYBASE_ASE) pDb->Dbms() == dbmsSYBASE_ASE)
{ {
sqlStmt += wxT(" CONSTRAINT "); sqlStmt += wxT(" CONSTRAINT ");
sqlStmt += tableName; sqlStmt += pDb->SQLTableName(tableName);
// sqlStmt += tableName;
sqlStmt += wxT("_PIDX"); sqlStmt += wxT("_PIDX");
} }
} }
@@ -1487,7 +1502,7 @@ bool wxDbTable::DropTable()
wxString sqlStmt; wxString sqlStmt;
sqlStmt.Printf(wxT("DROP TABLE %s"), tableName.c_str()); sqlStmt.Printf(wxT("DROP TABLE %s"), pDb->SQLTableName(tableName.c_str()));
pDb->WriteSqlLog(sqlStmt); pDb->WriteSqlLog(sqlStmt);
@@ -1495,9 +1510,6 @@ bool wxDbTable::DropTable()
cout << endl << sqlStmt.c_str() << endl; cout << endl << sqlStmt.c_str() << endl;
#endif #endif
RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS); RETCODE retcode = SQLExecDirect(hstmt, (UCHAR FAR *) sqlStmt.c_str(), SQL_NTS);
if (retcode != SQL_SUCCESS) if (retcode != SQL_SUCCESS)
{ {
@@ -1603,16 +1615,19 @@ bool wxDbTable::CreateIndex(const wxString &idxName, bool unique, UWORD noIdxCol
sqlStmt += wxT("UNIQUE "); sqlStmt += wxT("UNIQUE ");
sqlStmt += wxT("INDEX "); sqlStmt += wxT("INDEX ");
sqlStmt += idxName; sqlStmt += pDb->SQLTableName(idxName);
sqlStmt += wxT(" ON "); sqlStmt += wxT(" ON ");
sqlStmt += tableName;
sqlStmt += pDb->SQLTableName(tableName);
// sqlStmt += tableName;
sqlStmt += wxT(" ("); sqlStmt += wxT(" (");
// Append list of columns making up index // Append list of columns making up index
int i; int i;
for (i = 0; i < noIdxCols; i++) for (i = 0; i < noIdxCols; i++)
{ {
sqlStmt += pIdxDefs[i].ColName; sqlStmt += pDb->SQLColumnName(pIdxDefs[i].ColName);
// sqlStmt += pIdxDefs[i].ColName;
// Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns // Postgres and SQL Server 7 do not support the ASC/DESC keywords for index columns
if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (strncmp(pDb->dbInf.dbmsVer,"07",2)==0)) && if (!((pDb->Dbms() == dbmsMS_SQL_SERVER) && (strncmp(pDb->dbInf.dbmsVer,"07",2)==0)) &&
@@ -1672,12 +1687,12 @@ bool wxDbTable::DropIndex(const wxString &idxName)
if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL || if (pDb->Dbms() == dbmsACCESS || pDb->Dbms() == dbmsMY_SQL ||
pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/) pDb->Dbms() == dbmsDBASE /*|| Paradox needs this syntax too when we add support*/)
sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),idxName.c_str(), tableName.c_str()); sqlStmt.Printf(wxT("DROP INDEX %s ON %s"),pDb->SQLTableName(idxName.c_str()), pDb->SQLTableName(tableName.c_str()));
else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) || else if ((pDb->Dbms() == dbmsMS_SQL_SERVER) ||
(pDb->Dbms() == dbmsSYBASE_ASE)) (pDb->Dbms() == dbmsSYBASE_ASE))
sqlStmt.Printf(wxT("DROP INDEX %s.%s"),tableName.c_str(), idxName.c_str()); sqlStmt.Printf(wxT("DROP INDEX %s.%s"), pDb->SQLTableName(tableName.c_str()), pDb->SQLTableName(idxName.c_str()));
else else
sqlStmt.Printf(wxT("DROP INDEX %s"),idxName.c_str()); sqlStmt.Printf(wxT("DROP INDEX %s"),pDb->SQLTableName(idxName.c_str()));
pDb->WriteSqlLog(sqlStmt); pDb->WriteSqlLog(sqlStmt);
@@ -2226,7 +2241,8 @@ ULONG wxDbTable::Count(const wxString &args)
sqlStmt = wxT("SELECT COUNT("); sqlStmt = wxT("SELECT COUNT(");
sqlStmt += args; sqlStmt += args;
sqlStmt += wxT(") FROM "); sqlStmt += wxT(") FROM ");
sqlStmt += queryTableName; sqlStmt += pDb->SQLTableName(queryTableName);
// sqlStmt += queryTableName;
#if wxODBC_BACKWARD_COMPATABILITY #if wxODBC_BACKWARD_COMPATABILITY
if (from && wxStrlen(from)) if (from && wxStrlen(from))
#else #else
@@ -2318,7 +2334,8 @@ bool wxDbTable::Refresh(void)
// based on the key fields. // based on the key fields.
if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS) if (SQLGetData(hstmt, (UWORD)(noCols+1), SQL_C_CHAR, (UCHAR*) rowid, wxDB_ROWID_LEN, &cb) == SQL_SUCCESS)
{ {
whereClause += queryTableName; whereClause += pDb->SQLTableName(queryTableName);
// whereClause += queryTableName;
whereClause += wxT(".ROWID = '"); whereClause += wxT(".ROWID = '");
whereClause += rowid; whereClause += rowid;
whereClause += wxT("'"); whereClause += wxT("'");