diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 06:33:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-07 06:33:00 (GMT) |
| commit | 3f1c42a94d303314d0b63710efcbf4a1566dba7e (patch) | |
| tree | f5c8c2ef282af8e1384234e023e771218bb5e04d | |
| parent | 7327d31b4e20bd4b3e3bad95c2fba3eb7a548dbb (diff) | |
| parent | ddd1e4aefcb8e52125656588b0bb76ec246b5d29 (diff) | |
| download | Qt-3f1c42a94d303314d0b63710efcbf4a1566dba7e.zip Qt-3f1c42a94d303314d0b63710efcbf4a1566dba7e.tar.gz Qt-3f1c42a94d303314d0b63710efcbf4a1566dba7e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix test sql for sql server.
| -rw-r--r-- | tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp index 8a084bb..38e5387 100644 --- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp +++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp @@ -181,7 +181,11 @@ void tst_QSqlTableModel::createTestTables() QVERIFY_SQL( q, exec("create table " + test3 + "(id int, random varchar(20), randomtwo varchar(20))")); - QVERIFY_SQL( q, exec("create table " + qTableName("test4", __FILE__) + "(column1 varchar(50), column2 varchar(50), column3 varchar(50))")); + if(!tst_Databases::isSqlServer(db)) + QVERIFY_SQL( q, exec("create table " + qTableName("test4", __FILE__) + "(column1 varchar(50), column2 varchar(50), column3 varchar(50))")); + else + QVERIFY_SQL( q, exec("create table " + qTableName("test4", __FILE__) + "(column1 varchar(50), column2 varchar(50) NULL, column3 varchar(50))")); + QVERIFY_SQL( q, exec("create table " + qTableName("emptytable", __FILE__) + "(id int)")); |