diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-15 08:58:59 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-15 08:58:59 (GMT) |
| commit | d245034a54d20a3ff59575158dbf8705547648a7 (patch) | |
| tree | 6fdbf2718e6613e8af60b0fa4e77ba9b1f41660a /tests/auto/q3sqlselectcursor | |
| parent | 16dab236acbd35c351c1ac1d36dbf018db0d278c (diff) | |
| parent | 376a5a845ba6d19751a58ea79a8d5701c4ba4d13 (diff) | |
| download | Qt-d245034a54d20a3ff59575158dbf8705547648a7.zip Qt-d245034a54d20a3ff59575158dbf8705547648a7.tar.gz Qt-d245034a54d20a3ff59575158dbf8705547648a7.tar.bz2 | |
Merge commit 'origin/4.6' into mmfphonon
Conflicts:
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qcoreevent.h
Diffstat (limited to 'tests/auto/q3sqlselectcursor')
| -rw-r--r-- | tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp b/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp index 5893687..68e8ce8 100644 --- a/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp +++ b/tests/auto/q3sqlselectcursor/tst_q3sqlselectcursor.cpp @@ -107,9 +107,15 @@ void tst_Q3SqlSelectCursor::createTestTables( QSqlDatabase db ) if ( !db.isValid() ) return; QSqlQuery q( db ); + if(tst_Databases::isPostgreSQL(db)) + QVERIFY_SQL( q, exec("set client_min_messages='warning'")); // please never ever change this table; otherwise fix all tests ;) - QVERIFY_SQL(q, exec( "create table " + qTableName( "qtest" ) + " ( id int not null, t_varchar varchar(40) not null," - "t_char char(40), t_numeric numeric(6, 3), primary key (id, t_varchar) )" )); + if (tst_Databases::isMSAccess(db)) + QVERIFY_SQL(q, exec( "create table " + qTableName( "qtest" ) + " ( id int not null, t_varchar varchar(40) not null," + "t_char char(40), t_numeric number, primary key (id, t_varchar) )" )); + else + QVERIFY_SQL(q, exec( "create table " + qTableName( "qtest" ) + " ( id int not null, t_varchar varchar(40) not null," + "t_char char(40), t_numeric numeric(6, 3), primary key (id, t_varchar) )" )); } void tst_Q3SqlSelectCursor::dropTestTables( QSqlDatabase db ) |