summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-09-09 05:39:56 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-09-09 05:39:56 (GMT)
commit08a6e65ce3b5cf45d10dd951606c6cb44b753daf (patch)
tree329189f1299e66ea9615956735e9b1d4dee02072 /tests/auto/qsqldatabase/tst_qsqldatabase.cpp
parentcb4a0bf7d3df41a21cc2d015811eedf134daf3d7 (diff)
parent62d1b1db21d2660bd5f2322cb9f09cf2598bf90b (diff)
downloadQt-08a6e65ce3b5cf45d10dd951606c6cb44b753daf.zip
Qt-08a6e65ce3b5cf45d10dd951606c6cb44b753daf.tar.gz
Qt-08a6e65ce3b5cf45d10dd951606c6cb44b753daf.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qsqldatabase/tst_qsqldatabase.cpp')
-rw-r--r--tests/auto/qsqldatabase/tst_qsqldatabase.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index 1a6f29e..675b170 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -2034,7 +2034,10 @@ void tst_QSqlDatabase::odbc_testqGetString()
CHECK_DATABASE(db);
QSqlQuery q(db);
- QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("testqGetString") + "(id int, vcvalue varchar(65538))"));
+ if (tst_Databases::isSqlServer(db))
+ QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("testqGetString") + "(id int, vcvalue varchar(MAX))"));
+ else
+ QVERIFY_SQL(q, exec("CREATE TABLE " + qTableName("testqGetString") + "(id int, vcvalue varchar(65538))"));
QString largeString;
largeString.fill('A', 65536);