Fix the behaviour of sql classes regarding quoted identifiers

If no quotes around identifiers are provided by the programmer,
identifiers are treated identically to how the underlying engine
would behave.  i.e. some engines uppercase the identifiers
others lowercase them.  If the programmer wants case sensitivty
and/or use whitespaces they will need to quote their identifiers.
The previous (incorrect) behaviour always quoted the identifiers.
Originally committed to 4.5, but removed due to BC concerns, this
is a reintegration into mainline for inclusion in 4.6

Reviewed-by: Bill King

1 files changed, 16 insertions, 18 deletions

diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h
index b1933033fc..a490a2f322 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/qsqldatabase/tst_databases.h
@@ -105,11 +105,7 @@ inline static QString qTableName( const QString& prefix, QSqlDriver* driver = 0
 
 inline static bool testWhiteSpaceNames( const QString &name )
 {
-/*    return name.startsWith( "QPSQL" )
-           || name.startsWith( "QODBC" )
-           || name.startsWith( "QSQLITE" )
-           || name.startsWith( "QMYSQL" );*/
-    return name != QLatin1String("QSQLITE2");
+    return name != QLatin1String("QTDS7");
 }
 
 inline static QString toHex( const QString& binary )
@@ -211,7 +207,7 @@ public:
 //      This requires a local ODBC data source to be configured( pointing to a MySql database )
 //         addDb( "QODBC", "mysqlodbc", "troll", "trond" );
 //         addDb( "QODBC", "SqlServer", "troll", "trond" );
-//         addDb( "QTDS7", "testdb", "troll", "trondk", "horsehead.nokia.troll.no" );
+//         addDb( "QTDS7", "testdb", "troll", "trondk", "horsehead" );
 //         addDb( "QODBC", "silencetestdb", "troll", "trond", "silence" );
 //         addDb( "QODBC", "horseheadtestdb", "troll", "trondk", "horsehead" );
 
@@ -221,7 +217,7 @@ public:
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3309, "CLIENT_COMPRESS=1;CLIENT_SSL=1" ); // MySQL 5.0.18 Linux
 //         addDb( "QMYSQL3", "testdb", "troll", "trond", "iceblink.nokia.troll.no" ); // MySQL 5.0.13 Windows
 //         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql4-nokia.trolltech.com.au" ); // MySQL 4.1.22-2.el4  linux
-//         addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql5-nokia.trolltech.com.au" ); // MySQL 5.0.45-7.el5 linux
+//        addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "mysql5-nokia.trolltech.com.au" ); // MySQL 5.0.45-7.el5 linux
 
 //         addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no" ); // V7.2 NOT SUPPORTED!
 //         addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 5434 ); // V7.2 NOT SUPPORTED! Multi-byte
@@ -242,8 +238,8 @@ public:
 //         addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "firebird2-nokia.trolltech.com.au" ); // Firebird 2.1.1
 
 //      use in-memory database to prevent local files
-//         addDb("QSQLITE", ":memory:");
-        addDb( "QSQLITE", QDir::toNativeSeparators(QDir::tempPath()+"/foo.db") );
+        addDb("QSQLITE", ":memory:");
+//        addDb( "QSQLITE", QDir::toNativeSeparators(QDir::tempPath()+"/foo.db") );
 //         addDb( "QSQLITE2", QDir::toNativeSeparators(QDir::tempPath()+"/foo2.db") );
 //         addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=iceblink.nokia.troll.no\\ICEBLINK", "troll", "trond", "" );
 //         addDb( "QODBC3", "DRIVER={SQL Native Client};SERVER=silence.nokia.troll.no\\SQLEXPRESS", "troll", "trond", "" );
@@ -320,16 +316,18 @@ public:
         QSqlQuery q( db );
         QStringList dbtables=db.tables();
 
-        foreach(const QString &tableName, tableNames) {
+        foreach(QString tableName, tableNames)
+        {
             wasDropped = true;
-            foreach(const QString dbtablesName, dbtables) {
-                if(dbtablesName.toUpper() == tableName.toUpper()) {
-                    dbtables.removeAll(dbtablesName);
-                    wasDropped = q.exec("drop table " + db.driver()->escapeIdentifier( dbtablesName, QSqlDriver::TableName ));
-                    if(!wasDropped)
-                        wasDropped = q.exec("drop table " + dbtablesName);
-                }
-            }
+            QString table=tableName;
+            if ( db.driver()->isIdentifierEscaped(table, QSqlDriver::TableName))
+                table = db.driver()->stripDelimiters(table, QSqlDriver::TableName);
+
+            if ( dbtables.contains( table, Qt::CaseSensitive ) )
+                wasDropped = q.exec( "drop table " + tableName);
+            else if ( dbtables.contains( table, Qt::CaseInsensitive ) )
+                wasDropped = q.exec( "drop table " + tableName);
+
             if ( !wasDropped )
                 qWarning() << dbToString(db) << "unable to drop table" << tableName << ':' << q.lastError().text() << "tables:" << dbtables;
         }