From 3933bad9841367c78557bf2eeb7ec409d933bb92 Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 28 Jul 2024 16:08:30 +0200 Subject: [PATCH] tests renamed local variables to sqlQuery --- .../mysql_qdatetime/tst_mysql_qdatetime.cpp | 946 +++++++++--------- .../tst_postgresql_qdatetime.cpp | 940 ++++++++--------- .../sqlite_qdatetime/tst_sqlite_qdatetime.cpp | 442 ++++---- .../model_qdatetime/tst_model_qdatetime.cpp | 16 +- 4 files changed, 1172 insertions(+), 1172 deletions(-) diff --git a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp index ae52ae1ba..488531343 100644 --- a/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp +++ b/tests/auto/functional/orm/query/mysql_qdatetime/tst_mysql_qdatetime.cpp @@ -229,43 +229,43 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -303,43 +303,43 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -376,42 +376,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(QString("2022-08-28 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-28 13:14:15")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -449,43 +449,43 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -523,43 +523,43 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZone0200)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZone0200)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -596,43 +596,43 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); - qtQuery.addBindValue(QString("2022-08-29 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-29 13:14:15")); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -673,43 +673,43 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -748,43 +748,43 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -822,42 +822,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(QString("2022-08-28 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-28 13:14:15")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -896,43 +896,43 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -971,43 +971,43 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZone0200)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZone0200)); // QMYSQL driver doesn't care about QDateTime timezone (fixed in Qt v6.8) - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1045,42 +1045,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); - qtQuery.addBindValue(QString("2022-08-29 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-29 13:14:15")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1619,42 +1619,42 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(QDate(2022, 8, 28)); + sqlQuery.addBindValue(QDate(2022, 8, 28)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1677,42 +1677,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(QString("2022-08-28")); + sqlQuery.addBindValue(QString("2022-08-28")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1739,42 +1739,42 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(QDate(2022, 8, 28)); + sqlQuery.addBindValue(QDate(2022, 8, 28)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1799,42 +1799,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(QString("2022-08-28")); + sqlQuery.addBindValue(QString("2022-08-28")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1998,42 +1998,42 @@ void tst_MySql_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_UtcOnServer() c // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`time`) values (?)")); - qtQuery.addBindValue(QTime(17, 2, 59)); + sqlQuery.addBindValue(QTime(17, 2, 59)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2058,42 +2058,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`time`) values (?)")); - qtQuery.addBindValue(QString("17:02:59")); + sqlQuery.addBindValue(QString("17:02:59")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2122,42 +2122,42 @@ void tst_MySql_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_0200OnServer() // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`time`) values (?)")); - qtQuery.addBindValue(QTime(17, 2, 59)); + sqlQuery.addBindValue(QTime(17, 2, 59)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2184,42 +2184,42 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`time`) values (?)")); - qtQuery.addBindValue(QString("17:02:59")); + sqlQuery.addBindValue(QString("17:02:59")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2393,42 +2393,42 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(NullVariant::QDateTime()); + sqlQuery.addBindValue(NullVariant::QDateTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2456,42 +2456,42 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(NullVariant::QDate()); + sqlQuery.addBindValue(NullVariant::QDate()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2514,42 +2514,42 @@ void tst_MySql_QDateTime::insert_Qt_QTime_Null_TimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`time`) values (?)")); - qtQuery.addBindValue(NullVariant::QTime()); + sqlQuery.addBindValue(NullVariant::QTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(timeDbVariant.isNull()); @@ -2576,42 +2576,42 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); - qtQuery.addBindValue(NullVariant::QDateTime()); + sqlQuery.addBindValue(NullVariant::QDateTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2641,42 +2641,42 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`date`) values (?)")); - qtQuery.addBindValue(NullVariant::QDate()); + sqlQuery.addBindValue(NullVariant::QDate()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2701,42 +2701,42 @@ void tst_MySql_QDateTime::insert_Qt_QTime_Null_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); + QVERIFY(sqlQuery.prepare("insert into `datetimes` (`time`) values (?)")); - qtQuery.addBindValue(NullVariant::QTime()); + sqlQuery.addBindValue(NullVariant::QTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(connection); + auto sqlQuery = createSqlQuery(connection); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(timeDbVariant.isNull()); @@ -3060,10 +3060,10 @@ void tst_MySql_QDateTime::setDontConvertTimezone(const QString &connection) void tst_MySql_QDateTime::setTimezone(const QString &connection, const QString &timeZone, Orm::QtTimeZoneConfig &&qtTimeZone) { - const auto qtQuery = DB::unprepared(sl("set time_zone=\"%1\";").arg(timeZone), + const auto sqlQuery = DB::unprepared(sl("set time_zone=\"%1\";").arg(timeZone), connection); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); DB::connection(connection).setQtTimeZone(std::move(qtTimeZone)); } @@ -3078,13 +3078,13 @@ const QString &tst_MySql_QDateTime::utcTimezoneString(const QString &connection) bool tst_MySql_QDateTime::mysqlTimezoneTablesNotPopulated(const QString &connection) { - auto qtQuery = DB::select(sl("select count(*) from `mysql`.`time_zone_name`"), {}, + auto sqlQuery = DB::select(sl("select count(*) from `mysql`.`time_zone_name`"), {}, connection); - if (!qtQuery.first()) + if (!sqlQuery.first()) return true; - const auto tzTableRows = qtQuery.value(0); + const auto tzTableRows = sqlQuery.value(0); // If 0 then TZ tables are empty return tzTableRows.value() == 0; diff --git a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp index b34749b13..9583823d3 100644 --- a/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp +++ b/tests/auto/functional/orm/query/postgresql_qdatetime/tst_postgresql_qdatetime.cpp @@ -200,43 +200,43 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -270,44 +270,44 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue( + sqlQuery.addBindValue( QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -340,43 +340,43 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() co // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QString("2022-08-28 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-28 13:14:15")); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -410,43 +410,43 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -480,44 +480,44 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue( + sqlQuery.addBindValue( QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZoneEUBratislava)); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -550,43 +550,43 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() c // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QString("2022-08-29 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-29 13:14:15")); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -623,43 +623,43 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -694,44 +694,44 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue( + sqlQuery.addBindValue( QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -765,43 +765,43 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() c // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QString("2022-08-28 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-28 13:14:15")); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -836,43 +836,43 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -907,44 +907,44 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue( + sqlQuery.addBindValue( QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZoneEUBratislava)); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -978,43 +978,43 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QString("2022-08-29 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-29 13:14:15")); // QPSQL driver converts the QDateTime time zone to UTC - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1518,42 +1518,42 @@ tst_PostgreSQL_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QDate(2022, 8, 28)); + sqlQuery.addBindValue(QDate(2022, 8, 28)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1574,42 +1574,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QString("2022-08-28")); + sqlQuery.addBindValue(QString("2022-08-28")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1635,42 +1635,42 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QDate(2022, 8, 28)); + sqlQuery.addBindValue(QDate(2022, 8, 28)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1693,42 +1693,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QString("2022-08-28")); + sqlQuery.addBindValue(QString("2022-08-28")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1883,42 +1883,42 @@ tst_PostgreSQL_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_UtcOnServer() c // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(QTime(17, 2, 59)); + sqlQuery.addBindValue(QTime(17, 2, 59)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -1939,42 +1939,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(QString("17:02:59")); + sqlQuery.addBindValue(QString("17:02:59")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2000,42 +2000,42 @@ insert_Qt_QTime_UtcTimezone_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(QTime(17, 2, 59)); + sqlQuery.addBindValue(QTime(17, 2, 59)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2058,42 +2058,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(QString("17:02:59")); + sqlQuery.addBindValue(QString("17:02:59")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -2248,42 +2248,42 @@ insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(NullVariant::QDateTime()); + sqlQuery.addBindValue(NullVariant::QDateTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2309,42 +2309,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() con // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(NullVariant::QDate()); + sqlQuery.addBindValue(NullVariant::QDate()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2365,42 +2365,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QTime_Null_TimeColumn_UtcOnServer() con // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(NullVariant::QTime()); + sqlQuery.addBindValue(NullVariant::QTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(timeDbVariant.isNull()); @@ -2426,42 +2426,42 @@ insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(NullVariant::QDateTime()); + sqlQuery.addBindValue(NullVariant::QDateTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2489,42 +2489,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() co // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(NullVariant::QDate()); + sqlQuery.addBindValue(NullVariant::QDate()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2547,42 +2547,42 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QTime_Null_TimeColumn_0200OnServer() co // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(NullVariant::QTime()); + sqlQuery.addBindValue(NullVariant::QTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); - QCOMPARE(qtQuery.size(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); + QCOMPARE(sqlQuery.size(), 1); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(timeDbVariant.isNull()); @@ -2888,10 +2888,10 @@ void tst_PostgreSQL_QDateTime::setDontConvertTimezone() const void tst_PostgreSQL_QDateTime::setTimezone(const QString &timeZone, QtTimeZoneConfig &&qtTimeZone) const { - const auto qtQuery = DB::unprepared(sl("set time zone '%1';").arg(timeZone), + const auto sqlQuery = DB::unprepared(sl("set time zone '%1';").arg(timeZone), m_connection); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); DB::connection(m_connection).setQtTimeZone(std::move(qtTimeZone)); } diff --git a/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp b/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp index 6f1c32b69..30e4d9ffb 100644 --- a/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp +++ b/tests/auto/functional/orm/query/sqlite_qdatetime/tst_sqlite_qdatetime.cpp @@ -193,43 +193,43 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, TTimeZone::UTC)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); /* QSQLITE driver takes the QDateTime timezone into account, it internally calls .toString(Qt::ISODateWithMs). */ - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -257,43 +257,43 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)); + sqlQuery.addBindValue(QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)); /* QSQLITE driver takes the QDateTime timezone into account, it internally calls .toString(Qt::ISODateWithMs). */ - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -319,41 +319,41 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DatetimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(QString("2022-08-28 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-28 13:14:15")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -380,43 +380,43 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, TTimeZone::UTC)); /* QSQLITE driver takes the QDateTime timezone into account, it internally calls .toString(Qt::ISODateWithMs). */ - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -444,43 +444,43 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZone0200)); + sqlQuery.addBindValue(QDateTime({2022, 8, 29}, {13, 14, 15}, *TimeZone0200)); /* QSQLITE driver takes the QDateTime timezone into account, it internally calls .toString(Qt::ISODateWithMs). */ - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -506,41 +506,41 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimestampColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); - qtQuery.addBindValue(QString("2022-08-29 13:14:15")); + sqlQuery.addBindValue(QString("2022-08-29 13:14:15")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value(*timestamp); + const auto timestampDbVariant = sqlQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -996,41 +996,41 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QDate(2022, 8, 28)); + sqlQuery.addBindValue(QDate(2022, 8, 28)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1051,41 +1051,41 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DateColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(QString("2022-08-28")); + sqlQuery.addBindValue(QString("2022-08-28")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1234,41 +1234,41 @@ void tst_SQLite_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(QTime(17, 2, 59)); + sqlQuery.addBindValue(QTime(17, 2, 59)); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -1289,41 +1289,41 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(QString("17:02:59")); + sqlQuery.addBindValue(QString("17:02:59")); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(!timeDbVariant.isNull()); @@ -1479,41 +1479,41 @@ insert_Qt_QDateTime_Null_DatetimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); - qtQuery.addBindValue(NullVariant::QDateTime()); + sqlQuery.addBindValue(NullVariant::QDateTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value(*datetime); + const auto datetimeDbVariant = sqlQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1540,41 +1540,41 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_Null_DateColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); - qtQuery.addBindValue(NullVariant::QDate()); + sqlQuery.addBindValue(NullVariant::QDate()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value(*date); + const auto dateDbVariant = sqlQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1596,41 +1596,41 @@ void tst_SQLite_QDateTime::insert_Qt_QTime_Null_TimeColumn() const // Insert { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); + QVERIFY(sqlQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); - qtQuery.addBindValue(NullVariant::QTime()); + sqlQuery.addBindValue(NullVariant::QTime()); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); - QCOMPARE(qtQuery.numRowsAffected(), 1); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); + QCOMPARE(sqlQuery.numRowsAffected(), 1); - lastId = qtQuery.lastInsertId().value(); + lastId = sqlQuery.lastInsertId().value(); QVERIFY(lastId != 0); } // Verify { - auto qtQuery = createSqlQuery(); + auto sqlQuery = createSqlQuery(); - QVERIFY(qtQuery.prepare( + QVERIFY(sqlQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); - qtQuery.addBindValue(lastId); + sqlQuery.addBindValue(lastId); - QVERIFY(qtQuery.exec()); + QVERIFY(sqlQuery.exec()); - QVERIFY(!qtQuery.lastError().isValid()); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && qtQuery.isSelect()); + QVERIFY(!sqlQuery.lastError().isValid()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && sqlQuery.isSelect()); - QVERIFY(qtQuery.first()); + QVERIFY(sqlQuery.first()); - QCOMPARE(qtQuery.value(ID).value(), lastId); + QCOMPARE(sqlQuery.value(ID).value(), lastId); - const auto timeDbVariant = qtQuery.value(*time_); + const auto timeDbVariant = sqlQuery.value(*time_); QVERIFY(timeDbVariant.isValid()); QVERIFY(timeDbVariant.isNull()); diff --git a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp index 2832ba801..66b9d99e4 100644 --- a/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp +++ b/tests/auto/functional/orm/tiny/model_qdatetime/tst_model_qdatetime.cpp @@ -1382,13 +1382,13 @@ const QString &tst_Model_QDateTime::utcTimezoneString(const QString &connection) bool tst_Model_QDateTime::mysqlTimezoneTablesNotPopulated(const QString &connection) { - auto qtQuery = DB::select(sl("select count(*) from `mysql`.`time_zone_name`"), {}, - connection); + auto sqlQuery = DB::select(sl("select count(*) from `mysql`.`time_zone_name`"), {}, + connection); - if (!qtQuery.first()) + if (!sqlQuery.first()) return true; - const auto tzTableRows = qtQuery.value(0); + const auto tzTableRows = sqlQuery.value(0); // If 0 then TZ tables are empty return tzTableRows.value() == 0; @@ -1432,11 +1432,11 @@ void tst_Model_QDateTime::setTimezone( const QString &timeZone, Orm::QtTimeZoneConfig &&qtTimeZone, const QString &connection) { - const auto qtQuery = DB::unprepared( - getSetTimezoneQueryString(connection).arg(timeZone), - connection); + const auto sqlQuery = DB::unprepared( + getSetTimezoneQueryString(connection).arg(timeZone), + connection); - QVERIFY(!qtQuery.isValid() && qtQuery.isActive() && !qtQuery.isSelect()); + QVERIFY(!sqlQuery.isValid() && sqlQuery.isActive() && !sqlQuery.isSelect()); DB::setQtTimeZone(std::move(qtTimeZone), connection); }