2 files changed, 20 insertions, 9 deletions
diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index 6d7795b..fe7185a 100644
--- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
@@ -7,13 +7,14 @@ wince*: {
    plugFiles.sources = ../../../plugins/sqldrivers
    plugFiles.path    = .
    DEPLOYMENT += plugFiles 
+   LIBS += -lws2
 }else:symbian {
     contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
         sqlite.path = /sys/bin
         sqlite.sources = sqlite3.dll 
         DEPLOYMENT += sqlite
     }
-}else {
+} else {
    win32-g++ {
         LIBS += -lws2_32
    } else:win32 {
diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index e2dace8..1e23d3d 100644
--- a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -145,8 +145,17 @@ void tst_QSqlRelationalTableModel::recreateTestTables(QSqlDatabase db)
 
 void tst_QSqlRelationalTableModel::initTestCase()
 {
-    foreach (const QString &dbname, dbs.dbNames)
-        recreateTestTables(QSqlDatabase::database(dbname));
+    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)) {
+            QSqlQuery q(db);
+            QVERIFY_SQL(q, exec("SET ANSI_DEFAULTS ON"));
+            QVERIFY_SQL(q, exec("SET IMPLICIT_TRANSACTIONS OFF"));
+        }
+        recreateTestTables(db);
+    }
 }
 
 void tst_QSqlRelationalTableModel::cleanupTestCase()
@@ -167,10 +176,10 @@ void tst_QSqlRelationalTableModel::dropTestTables( QSqlDatabase db )
             << qTableName( "reltest3" )
             << qTableName( "reltest4" )
             << qTableName( "reltest5" )
-            << qTableName( "rel test6", db.driver() )
-            << qTableName( "rel test7", db.driver() )
-            << qTableName("CASETEST1", db.driver() )
-            << qTableName("casetest1", db.driver() );
+            << qTableName( "rel test6" )
+            << qTableName( "rel test7" )
+            << qTableName("CASETEST1" )
+            << qTableName("casetest1" );
     tst_Databases::safeDropTables( db, tableNames );
 }
 
@@ -490,6 +499,7 @@ void tst_QSqlRelationalTableModel::insertWithStrategies()
 
     model.setTable(qTableName("reltest1"));
     model.setRelation(2, QSqlRelation(qTableName("reltest2"), "tid", "title"));
+    model.setSort(0, Qt::AscendingOrder);
 
     if (!db.driverName().startsWith("QTDS"))
         model.setRelation(3, QSqlRelation(qTableName("reltest2"), "tid", "title"));
@@ -914,8 +924,8 @@ void tst_QSqlRelationalTableModel::casing()
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
 
-    if (db.driverName().startsWith("QSQLITE"))
-        QSKIP("The casing test for SQLITE is irrelevant since SQLITE is case insensitive", SkipAll);
+    if (db.driverName().startsWith("QSQLITE") || db.driverName().startsWith("QIBASE") || 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);
     QVERIFY_SQL( q, exec("create table " + qTableName("CASETEST1", db.driver()).toUpper()  +