diff options
author | Andy Shaw <andy.shaw@digia.com> | 2012-01-19 21:39:30 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 15:09:03 +0100 |
commit | 5bab4744bad247f3b93792f9ed4b578b0f780296 (patch) | |
tree | 3bbbd704ffb422b75763acf06a21ca3dfd78d5f1 /tests | |
parent | 1175ec444f2453fc773f288f1087fe6bdad340c0 (diff) |
Handle the 'real' datatype correctly in the SQLite driver
The 'real' datatype should be seen as a QVariant::Double type and not as
a QVariant::String type otherwise it does not get presented correctly
when using a non Qt application to access it.
Test is included for QSqlQuery.
Task-number: QTBUG-16373
Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
(cherry picked from commit b23631015c23a49e3b4d296ea0a6266bfce3d4f1)
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 2 | ||||
-rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index c6fb0edeae..7acbf816f1 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -965,7 +965,7 @@ void tst_QSqlDatabase::recordSQLite() FieldDef("integer", QVariant::Int, QVariant(13)), FieldDef("int", QVariant::Int, QVariant(12)), - FieldDef("real", QVariant::String, QVariant(1.234567890123456)), + FieldDef("real", QVariant::Double, QVariant(1.234567890123456)), FieldDef() }; diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 4bc8645f02..b22e876c3c 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -219,6 +219,9 @@ private slots: void sqlite_constraint_data() { generic_data("QSQLITE"); } void sqlite_constraint(); + void sqlite_real_data() { generic_data("QSQLITE"); } + void sqlite_real(); + private: // returns all database connections void generic_data(const QString &engine=QString()); @@ -3309,5 +3312,32 @@ void tst_QSqlQuery::sqlite_constraint() QCOMPARE(q.lastError().databaseText(), QLatin1String("Raised Abort successfully")); } +void tst_QSqlQuery::sqlite_real() +{ + QFETCH(QString, dbName); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + const QString tableName(qTableName("sqliterealtype", __FILE__)); + tst_Databases::safeDropTable( db, tableName ); + + QSqlQuery q(db); + QVERIFY_SQL(q, exec("CREATE TABLE " + tableName + " (id INTEGER, realVal REAL)")); + QVERIFY_SQL(q, exec("INSERT INTO " + tableName + " (id, realVal) VALUES (1, 2.3)")); + QVERIFY_SQL(q, exec("SELECT realVal FROM " + tableName)); + QVERIFY(q.next()); + QCOMPARE(q.value(0).toDouble(), 2.3); + QCOMPARE(q.record().field(0).type(), QVariant::Double); + + q.prepare("INSERT INTO " + tableName + " (id, realVal) VALUES (?, ?)"); + QVariant var((double)5.6); + q.addBindValue(4); + q.addBindValue(var); + QVERIFY_SQL(q, exec()); + + QVERIFY_SQL(q, exec("SELECT realVal FROM " + tableName + " WHERE ID=4")); + QVERIFY(q.next()); + QCOMPARE(q.value(0).toDouble(), 5.6); +} + QTEST_MAIN( tst_QSqlQuery ) #include "tst_qsqlquery.moc" |