diff options
| -rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 30 |
3 files changed, 32 insertions, 1 deletions
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp index a73cd0f158..962fc97dfc 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.cpp +++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp @@ -95,6 +95,7 @@ static QVariant::Type qGetColumnType(const QString &tpName) return QVariant::Int; if (typeName == QLatin1String("double") || typeName == QLatin1String("float") + || typeName == QLatin1String("real") || typeName.startsWith(QLatin1String("numeric"))) return QVariant::Double; if (typeName == QLatin1String("blob")) 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" |