remove oci, db2, tds and ibase database leftovers

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index b32808e..f6e6261 100644 (file)
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -678,10 +678,6 @@ void QSqlDatabasePrivate::init(const QString &type)
         if (type == QLatin1String("QSQLITE"))
             driver = new QSQLiteDriver();
 #endif
-#ifdef QT_SQL_IBASE
-        if (type == QLatin1String("QIBASE"))
-            driver = new QIBaseDriver();
-#endif
     }
 
     if (!driver) {
@@ -881,9 +877,6 @@ bool QSqlDatabase::rollback()
     connection name must be passed to addDatabase() at connection
     object create time.
 
-    For the QOCI (Oracle) driver, the database name is the TNS
-    Service Name.
-
     For the QODBC driver, the \a name can either be a DSN, a DSN
     filename (in which case the file must have a \c .dsn extension),
     or a connection string.
@@ -1284,35 +1277,16 @@ bool QSqlDatabase::isDriverAvailable(const QString& name)
     \i MYSQL *connection
     \i \c qsql_mysql.cpp
     \row
-    \i QOCI
-    \i QOCIDriver
-    \i OCIEnv *environment, OCISvcCtx *serviceContext
-    \i \c qsql_oci.cpp
-    \row
     \i QODBC
     \i QODBCDriver
     \i SQLHANDLE environment, SQLHANDLE connection
     \i \c qsql_odbc.cpp
     \row
-    \i QDB2
-    \i QDB2
-    \i SQLHANDLE environment, SQLHANDLE connection
-    \i \c qsql_db2.cpp
-    \row
-    \i QTDS
-    \i QTDSDriver
-    \i LOGINREC *loginRecord, DBPROCESS *dbProcess, const QString &hostName
-    \i \c qsql_tds.cpp
-    \row
     \i QSQLITE
     \i QSQLiteDriver
     \i sqlite *connection
     \i \c qsql_sqlite.cpp
     \row
-    \i QIBASE
-    \i QIBaseDriver
-    \i isc_db_handle connection
-    \i \c qsql_ibase.cpp
     \endtable
 
     The host name (or service name) is needed when constructing the

diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/qsqldriver/tst_qsqldriver.cpp
index 84799b8..f319887 100644 (file)
--- a/tests/auto/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/qsqldriver/tst_qsqldriver.cpp
@@ -169,33 +169,23 @@ void tst_QSqlDriver::primaryIndex()
     QSqlIndex index = db.driver()->primaryIndex(tablename);
     QCOMPARE(index.count(), 1);
 
-    if( db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2"))
-        QCOMPARE(index.fieldName(0), QString::fromLatin1("ID"));
-    else
-        QCOMPARE(index.fieldName(0), QString::fromLatin1("id"));
+    QCOMPARE(index.fieldName(0), QString::fromLatin1("id"));
 
 
     //check that we can get the primary index using a quoted tablename
-    if( db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2"))
-        tablename = tablename.toUpper();
-    else if (db.driverName().startsWith("QPSQL"))
+    if (db.driverName().startsWith("QPSQL"))
         tablename = tablename.toLower();
 
     if(!db.driverName().startsWith("QODBC") && !db.databaseName().contains("PostgreSql")) {
         index = db.driver()->primaryIndex(db.driver()->escapeIdentifier(tablename, QSqlDriver::TableName));
         QCOMPARE(index.count(), 1);
     }
-    if( db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2"))
-        QCOMPARE(index.fieldName(0), QString::fromLatin1("ID"));
-    else
-        QCOMPARE(index.fieldName(0), QString::fromLatin1("id"));
+    QCOMPARE(index.fieldName(0), QString::fromLatin1("id"));
 
 
 
     //check that we can not get the primary index using a quoted but incorrect table name casing
-    if( db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2"))
-        tablename = tablename.toLower();
-    else if (db.driverName().startsWith("QPSQL"))
+    if (db.driverName().startsWith("QPSQL"))
         tablename = tablename.toUpper();
 
     index = db.driver()->primaryIndex(db.driver()->escapeIdentifier(tablename, QSqlDriver::TableName));

diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index 8037840..9e8c1bd 100644 (file)
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -258,8 +258,7 @@ void tst_QSqlQuery::cleanup()
         populateTestTables( db );
     }
 
-    if ( QTest::currentTestFailed() && ( db.driverName().startsWith( "QOCI" )
-                                         || db.driverName().startsWith( "QODBC" ) ) ) {
+    if ( QTest::currentTestFailed() && ( db.driverName().startsWith( "QODBC" ) ) ) {
         //since Oracle ODBC totally craps out on error, we init again
         db.close();
         db.open();
@@ -316,7 +315,7 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
     if ( db.driverName().startsWith("QSQLITE") )
         tablenames << qTableName( "record_sqlite", __FILE__ );
 
-    if ( tst_Databases::isSqlServer( db ) || db.driverName().startsWith( "QOCI" ) )
+    if ( tst_Databases::isSqlServer( db ) )
         tablenames << qTableName( "qtest_longstr", __FILE__ );
 
     if (tst_Databases::isSqlServer( db ))
@@ -326,11 +325,6 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
         db.exec("DROP PROCEDURE IF EXISTS "+qTableName("bug6852_proc", __FILE__));
 
     tst_Databases::safeDropTables( db, tablenames );
-
-    if ( db.driverName().startsWith( "QOCI" ) ) {
-        QSqlQuery q( db );
-        q.exec( "DROP PACKAGE " + qTableName("pkg", __FILE__) );
-    }
 }
 
 void tst_QSqlQuery::createTestTables( QSqlDatabase db )

diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index c8fac55..7a24818 100644 (file)
--- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -149,14 +149,12 @@ void tst_QSqlRelationalTableModel::initTestCase()
 {
     foreach (const QString &dbname, dbs.dbNames) {
         QSqlDatabase db=QSqlDatabase::database(dbname);
-        if (db.driverName().startsWith("QIBASE"))
-            db.exec("SET DIALECT 3");
-        else if (tst_Databases::isSqlServer(db)) {
+        if (tst_Databases::isSqlServer(db)) {
             db.exec("SET ANSI_DEFAULTS ON");
             db.exec("SET IMPLICIT_TRANSACTIONS OFF");
-        }
-        else if(tst_Databases::isPostgreSQL(db))
+        } else if(tst_Databases::isPostgreSQL(db)) {
             db.exec("set client_min_messages='warning'");
+        }
         recreateTestTables(db);
     }
 }
@@ -903,32 +901,18 @@ void tst_QSqlRelationalTableModel::insertRecordDuplicateFieldNames()
     model.setRelation(2, QSqlRelation(reltest4, "id", "name"));
     QVERIFY_SQL(model, select());
 
-    if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-        QCOMPARE(model.record(1).value((reltest4+QLatin1String("_name_2")).toUpper()).toString(),
-            QString("Trondheim"));
-    } else {
-        QCOMPARE(model.record(1).value((reltest4+QLatin1String("_name_2"))).toString(),
-            QString("Trondheim"));
-    }
+    QCOMPARE(model.record(1).value((reltest4+QLatin1String("_name_2"))).toString(), QString("Trondheim"));
 
     QSqlRecord rec = model.record();
     rec.setValue(0, 3);
     rec.setValue(1, "Berge");
     rec.setValue(2, 1); // Must insert the key value
 
-    if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-        QCOMPARE(rec.fieldName(0), QLatin1String("ID"));
-        QCOMPARE(rec.fieldName(1), QLatin1String("NAME")); // This comes from main table
-    } else {
-        QCOMPARE(rec.fieldName(0), QLatin1String("id"));
-        QCOMPARE(rec.fieldName(1), QLatin1String("name"));
-    }
+    QCOMPARE(rec.fieldName(0), QLatin1String("id"));
+    QCOMPARE(rec.fieldName(1), QLatin1String("name"));
 
     // The duplicate field names is aliased because it's comes from the relation's display column.
-    if(db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2"))
-        QCOMPARE(rec.fieldName(2), (reltest4+QLatin1String("_name_2")).toUpper());
-    else
-        QCOMPARE(rec.fieldName(2), reltest4+QLatin1String("_name_2"));
+    QCOMPARE(rec.fieldName(2), reltest4+QLatin1String("_name_2"));
 
     QVERIFY(model.insertRecord(-1, rec));
     QCOMPARE(model.data(model.index(2, 2)).toString(), QString("Oslo"));
@@ -1015,7 +999,7 @@ void tst_QSqlRelationalTableModel::casing()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
 
-    if (db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QIBASE") || tst_Databases::isSqlServer(db))
+    if (db.driverName().startsWith("QSQLITE") || tst_Databases::isSqlServer(db))
         QSKIP("The casing test for this database is irrelevant since this database does not treat different cases as separate entities", SkipAll);
 
     QSqlQuery q(db);
@@ -1034,15 +1018,6 @@ void tst_QSqlRelationalTableModel::casing()
     QVERIFY_SQL( q, exec("insert into " + qTableName("casetest1", db.driver()) + " values(2, 'george', 2)"));
     QVERIFY_SQL( q, exec("insert into " + qTableName("casetest1", db.driver()) + " values(4, 'kramer', 2)"));
 
-    if (db.driverName().startsWith("QOCI")) {
-        //try an owner that doesn't exist
-        QSqlRecord rec = db.driver()->record("doug." + qTableName("CASETEST1", db.driver()).toUpper());
-        QCOMPARE( rec.count(), 0);
-
-        //try an owner that does exist
-        rec = db.driver()->record(db.userName() + "." +  qTableName("CASETEST1", db.driver()).toUpper());
-        QCOMPARE( rec.count(), 4);
-    }
     QSqlRecord rec = db.driver()->record(qTableName("CASETEST1", db.driver()).toUpper());
     QCOMPARE( rec.count(), 4);
 
@@ -1086,16 +1061,10 @@ void tst_QSqlRelationalTableModel::escapedRelations()
     model.setTable(reltest1);
 
     //try with relation table name quoted
-    if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-        model.setRelation(2, QSqlRelation(db.driver()->escapeIdentifier(reltest2.toUpper(),QSqlDriver::TableName),
-                            "tid",
-                            "title"));
-    } else {
-        model.setRelation(2, QSqlRelation(db.driver()->escapeIdentifier(reltest2,QSqlDriver::TableName),
-                            "tid",
-                            "title"));
+    model.setRelation(2, QSqlRelation(db.driver()->escapeIdentifier(reltest2,QSqlDriver::TableName),
+                      "tid",
+                      "title"));
 
-    }
     QVERIFY_SQL(model, select());
 
     QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
@@ -1111,15 +1080,9 @@ void tst_QSqlRelationalTableModel::escapedRelations()
 
     //try with index column quoted
     model.setJoinMode(QSqlRelationalTableModel::InnerJoin);
-    if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-        model.setRelation(2, QSqlRelation(reltest2,
-                            db.driver()->escapeIdentifier("tid", QSqlDriver::FieldName).toUpper(),
-                            "title"));
-    } else {
-        model.setRelation(2, QSqlRelation(reltest2,
-                            db.driver()->escapeIdentifier("tid", QSqlDriver::FieldName),
-                            "title"));
-    }
+    model.setRelation(2, QSqlRelation(reltest2,
+                      db.driver()->escapeIdentifier("tid", QSqlDriver::FieldName),
+                      "title"));
     QVERIFY_SQL(model, select());
 
     QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
@@ -1135,16 +1098,9 @@ void tst_QSqlRelationalTableModel::escapedRelations()
 
     //try with display column quoted
     model.setJoinMode(QSqlRelationalTableModel::InnerJoin);
-    if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-
-        model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
-                            db.driver()->escapeIdentifier("title", QSqlDriver::FieldName).toUpper()));
-    } else {
-        model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
-                            db.driver()->escapeIdentifier("title", QSqlDriver::FieldName)));
-    }
+    model.setRelation(2, QSqlRelation(reltest2,
+                      "tid",
+                      db.driver()->escapeIdentifier("title", QSqlDriver::FieldName)));
 
     QVERIFY_SQL(model, select());
 
@@ -1161,15 +1117,9 @@ void tst_QSqlRelationalTableModel::escapedRelations()
 
     //try with tablename and index and display columns quoted in the relation
     model.setJoinMode(QSqlRelationalTableModel::InnerJoin);
-    if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-        model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
-                            db.driver()->escapeIdentifier("title", QSqlDriver::FieldName).toUpper()));
-    } else {
-        model.setRelation(2, QSqlRelation(reltest2,
-                            "tid",
-                            db.driver()->escapeIdentifier("title", QSqlDriver::FieldName)));
-    }
+    model.setRelation(2, QSqlRelation(reltest2,
+                      "tid",
+                      db.driver()->escapeIdentifier("title", QSqlDriver::FieldName)));
     QVERIFY_SQL(model, select());
 
     QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
@@ -1194,11 +1144,7 @@ void tst_QSqlRelationalTableModel::escapedTableName()
     {
         QSqlRelationalTableModel model(0, db);
 
-        if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-            model.setTable(db.driver()->escapeIdentifier(reltest1.toUpper(), QSqlDriver::TableName));
-        } else {
-            model.setTable(db.driver()->escapeIdentifier(reltest1, QSqlDriver::TableName));
-        }
+        model.setTable(db.driver()->escapeIdentifier(reltest1, QSqlDriver::TableName));
         model.setSort(0, Qt::AscendingOrder);
         model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
         QVERIFY_SQL(model, select());
@@ -1241,11 +1187,7 @@ void tst_QSqlRelationalTableModel::escapedTableName()
     {
         QSqlRelationalTableModel model(0, db);
 
-        if (db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2")) {
-            model.setTable(db.driver()->escapeIdentifier(reltest1.toUpper(), QSqlDriver::TableName));
-        } else {
-            model.setTable(db.driver()->escapeIdentifier(reltest1, QSqlDriver::TableName));
-        }
+        model.setTable(db.driver()->escapeIdentifier(reltest1, QSqlDriver::TableName));
         model.setSort(0, Qt::AscendingOrder);
         model.setRelation(2, QSqlRelation(reltest2, "tid", "title"));
         model.setJoinMode(QSqlRelationalTableModel::LeftJoin);

diff --git a/tests/auto/qsqlthread/tst_qsqlthread.cpp b/tests/auto/qsqlthread/tst_qsqlthread.cpp
index 68ca0b9..9597b56 100644 (file)
--- a/tests/auto/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/qsqlthread/tst_qsqlthread.cpp
@@ -41,8 +41,6 @@
 #include <QtSql>
 
 const QString qtest(qTableName("qtest", __FILE__));
-// set this define if Oracle is built with threading support
-//#define QOCI_THREADED
 
 class tst_QSqlThread : public QObject
 {

diff --git a/tests/benchmarks/sql/kernel/qsqlquery/main.cpp b/tests/benchmarks/sql/kernel/qsqlquery/main.cpp
index 7a524e8..1a84e4d 100644 (file)
--- a/tests/benchmarks/sql/kernel/qsqlquery/main.cpp
+++ b/tests/benchmarks/sql/kernel/qsqlquery/main.cpp
@@ -118,8 +118,7 @@ void tst_QSqlQuery::cleanup()
         populateTestTables( db );
     }
 
-    if ( QTest::currentTestFailed() && ( db.driverName().startsWith( QLatin1String("QOCI") )
-                                         || db.driverName().startsWith( QLatin1String("QODBC") ) ) ) {
+    if ( QTest::currentTestFailed() && ( db.driverName().startsWith( QLatin1String("QODBC") ) ) ) {
         //since Oracle ODBC totally craps out on error, we init again
         db.close();
         db.open();
@@ -177,7 +176,7 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
     if ( db.driverName().startsWith( QLatin1String("QSQLITE") ) )
         tablenames << qTableName( QLatin1String("record_sqlite"), __FILE__ );
 
-    if ( tst_Databases::isSqlServer( db ) || db.driverName().startsWith( QLatin1String("QOCI") ) )
+    if ( tst_Databases::isSqlServer( db ) ) )
         tablenames << qTableName( QLatin1String("qtest_longstr"), __FILE__ );
 
     if (tst_Databases::isSqlServer( db ))
@@ -187,11 +186,6 @@ void tst_QSqlQuery::dropTestTables( QSqlDatabase db )
         db.exec( QLatin1String("DROP PROCEDURE IF EXISTS ") + qTableName( QLatin1String("bug6852_proc"), __FILE__));
 
     tst_Databases::safeDropTables( db, tablenames );
-
-    if ( db.driverName().startsWith( QLatin1String("QOCI") ) ) {
-        QSqlQuery q( db );
-        q.exec( QLatin1String("DROP PACKAGE ") + qTableName( QLatin1String("pkg"), __FILE__) );
-    }
 }
 
 void tst_QSqlQuery::createTestTables( QSqlDatabase db )