SQL/Tests: remove some unused functions

remove toHex() as it's not used at all and qTableName() with two params.
Also remove some SQLite 2 specific stuff

Change-Id: If285febdfbee5833f7174d70f386bd54674bd539
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

4 files changed, 5 insertions, 40 deletions

diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 3110ae9dd6..8b1f443ae8 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -70,32 +70,6 @@ inline static QString qTableName(const QString &prefix, const char *sourceFileNa
     return escape ? db.driver()->escapeIdentifier(tableStr, QSqlDriver::TableName) : tableStr;
 }
 
-inline static QString qTableName(const QString& prefix, QSqlDatabase db)
-{
-    QString tableStr;
-    if (db.driverName().toLower().contains("ODBC"))
-        tableStr += QLatin1String("_odbc");
-    return fixupTableName(QString(db.driver()->escapeIdentifier(prefix + tableStr + QLatin1Char('_') +
-                          qGetHostName(), QSqlDriver::TableName)),db);
-}
-
-inline static QString toHex( const QString& binary )
-{
-    QString str;
-    static char const hexchars[] = "0123456789ABCDEF";
-
-    for ( int i = 0; i < binary.size(); i++ ) {
-        ushort code = binary.at(i).unicode();
-        str += (QChar)(hexchars[ (code >> 12) & 0x0F ]);
-        str += (QChar)(hexchars[ (code >> 8) & 0x0F ]);
-        str += (QChar)(hexchars[ (code >> 4) & 0x0F ]);
-        str += (QChar)(hexchars[ code & 0x0F ]);
-    }
-
-    return str;
-}
-
-
 class tst_Databases
 {
 
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 255418d159..a6005afac0 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -2128,9 +2128,6 @@ void tst_QSqlDatabase::sqlite_bindAndFetchUInt()
     QFETCH(QString, dbName);
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
-    if (db.driverName().startsWith("QSQLITE2"))
-        QSKIP("SQLite3 specific test");
-
     QSqlQuery q(db);
     const QString tableName(qTableName("uint_test", __FILE__, db));
     QVERIFY_SQL(q, exec(QString("CREATE TABLE %1(uint_field UNSIGNED INTEGER)").arg(tableName)));
@@ -2244,9 +2241,6 @@ void tst_QSqlDatabase::sqlite_enableRegexp()
     QFETCH(QString, dbName);
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
-    if (db.driverName().startsWith("QSQLITE2"))
-        QSKIP("SQLite3 specific test");
-
     db.close();
     db.setConnectOptions("QSQLITE_ENABLE_REGEXP");
     QVERIFY_SQL(db, open());
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index 2ee9c170ba..5bd30948c8 100644
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
@@ -89,10 +89,11 @@ void tst_QSqlDriver::cleanupTestCase()
 {
     foreach (const QString &dbName, dbs.dbNames) {
         QSqlDatabase db = QSqlDatabase::database(dbName);
-        tst_Databases::safeDropTable(db, qTableName("relTEST1", __FILE__, db));
+        QStringList tables = {qTableName("relTEST1", __FILE__, db)};
         const QSqlDriver::DbmsType dbType = tst_Databases::getDatabaseType(db);
         if (dbType == QSqlDriver::Oracle)
-            tst_Databases::safeDropTable(db, qTableName("clobTable", __FILE__, db));
+            tables.push_back(qTableName("clobTable", __FILE__, db));
+        tst_Databases::safeDropTables(db, tables);
     }
     dbs.close();
 }
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index 8f8a872da5..582d60182f 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -1228,12 +1228,8 @@ void tst_QSqlQuery::numRowsAffected()
     QSqlQuery q2(db);
     QVERIFY_SQL(q2, exec(QLatin1String("insert into %1 values (42001, 'homer', 'marge')")
                          .arg(qtest)));
-
-    if (!db.driverName().startsWith("QSQLITE2")) {
-        // SQLite 2.x accumulates changed rows in nested queries. See task 33794
-        QCOMPARE(q2.numRowsAffected(), 1);
-        QCOMPARE(q2.numRowsAffected(), 1); // yes, we check twice
-    }
+    QCOMPARE(q2.numRowsAffected(), 1);
+    QCOMPARE(q2.numRowsAffected(), 1); // yes, we check twice
 }
 
 void tst_QSqlQuery::size()