diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2018-02-22 13:45:34 +0100 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2018-03-17 23:14:34 +0000 |
| commit | 9b68dc19bf3973d3a46439c4b8667ad3beba167d (patch) | |
| tree | e908f4ae759d26a4b117ca578da6f76ef8fb762e /tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | |
| parent | 44137dc65ab1121fc360f6f006b7515648f0bae3 (diff) | |
MySQL: Fix tests
This fixes the following:
- tst_QSqlDatabase::recordMySQL() to account for performance
improvements done for small integral types
- tst_QSqlQuery::nextResult() so that NUMERIC results are seen
as doubles
- tst_QSqlQuery::timeStampParsing() so that MySQL accepts the
CREATE TABLE statement
Change-Id: I68fb1d06dac12d500bb4596463f5bdd65cc9c226
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp')
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index 89978319a0..4130b364f4 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -890,10 +890,10 @@ void tst_QSqlDatabase::recordMySQL() static QDateTime dt(QDate::currentDate(), QTime(1, 2, 3, 0)); static const FieldDef fieldDefs[] = { - FieldDef("tinyint", QVariant::Int, 127), - FieldDef("tinyint unsigned", QVariant::UInt, 255), - FieldDef("smallint", QVariant::Int, 32767), - FieldDef("smallint unsigned", QVariant::UInt, 65535), + FieldDef("tinyint", static_cast<QVariant::Type>(QMetaType::Char), 127), + FieldDef("tinyint unsigned", static_cast<QVariant::Type>(QMetaType::UChar), 255), + FieldDef("smallint", static_cast<QVariant::Type>(QMetaType::Short), 32767), + FieldDef("smallint unsigned", static_cast<QVariant::Type>(QMetaType::UShort), 65535), FieldDef("mediumint", QVariant::Int, 8388607), FieldDef("mediumint unsigned", QVariant::UInt, 16777215), FieldDef("integer", QVariant::Int, 2147483647), |