diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
tree | a326819f23e2421723f144522f9362ba608d6bb1 /tests/auto/sql | |
parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'tests/auto/sql')
-rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 4533284a0f..3aa23c504d 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -238,6 +238,9 @@ private slots: void QTBUG_53969_data() { generic_data("QMYSQL"); } void QTBUG_53969(); + void gisPointDatatype_data() { generic_data("QMYSQL"); } + void gisPointDatatype(); + void sqlite_constraint_data() { generic_data("QSQLITE"); } void sqlite_constraint(); @@ -4080,6 +4083,25 @@ void tst_QSqlQuery::QTBUG_53969() } } +void tst_QSqlQuery::gisPointDatatype() +{ + QFETCH(QString, dbName); + QSqlDatabase db = QSqlDatabase::database(dbName); + CHECK_DATABASE(db); + + QSqlQuery sqlQuery(db); + const auto tableName = qTableName("qtbug72140", __FILE__, db); + tst_Databases::safeDropTable(db, tableName); + QString sqlCommand = QStringLiteral("CREATE TABLE %1 (`lonlat_point` POINT NULL) ENGINE = InnoDB;").arg(tableName); + QVERIFY(sqlQuery.exec(sqlCommand)); + sqlCommand = QStringLiteral("INSERT INTO %1(lonlat_point) VALUES(ST_GeomFromText('POINT(1 1)'));").arg(tableName); + QVERIFY(sqlQuery.exec(sqlCommand)); + sqlCommand = QStringLiteral("SELECT * FROM %1;").arg(tableName); + QVERIFY(sqlQuery.exec(sqlCommand)); + QCOMPARE(sqlQuery.record().field(0).type(), QVariant::Type::ByteArray); + QVERIFY(sqlQuery.next()); +} + void tst_QSqlQuery::oraOCINumber() { QFETCH( QString, dbName ); |