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 2202f7736..ae52ae1ba 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 @@ -156,7 +156,7 @@ private Q_SLOTS: createQuery(const QString &connection); /*! Create a raw QSqlQuery instance for the given connection. */ [[nodiscard]] inline static TSqlQuery - createQtQuery(const QString &connection); + createSqlQuery(const QString &connection); /* QDateTime with/without timezone */ /*! Set the MySQL timezone session variable to the UTC value. */ @@ -229,7 +229,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -248,7 +248,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -303,7 +303,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -322,7 +322,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -376,7 +376,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -394,7 +394,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -449,7 +449,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); @@ -468,7 +468,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); @@ -523,7 +523,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); @@ -542,7 +542,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); @@ -596,7 +596,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); @@ -615,7 +615,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); @@ -673,7 +673,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -692,7 +692,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -748,7 +748,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -767,7 +767,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -822,7 +822,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -840,7 +840,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -896,7 +896,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); @@ -915,7 +915,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); @@ -971,7 +971,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); @@ -990,7 +990,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); @@ -1045,7 +1045,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`timestamp`) values (?)")); @@ -1063,7 +1063,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `timestamp` from `datetimes` where `id` = ?")); @@ -1619,7 +1619,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); @@ -1637,7 +1637,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); @@ -1677,7 +1677,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); @@ -1695,7 +1695,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); @@ -1739,7 +1739,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); @@ -1757,7 +1757,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); @@ -1799,7 +1799,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); @@ -1817,7 +1817,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); @@ -1998,7 +1998,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_UtcOnServer() c // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); @@ -2016,7 +2016,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_UtcOnServer() c // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); @@ -2058,7 +2058,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); @@ -2076,7 +2076,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); @@ -2122,7 +2122,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_0200OnServer() // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); @@ -2140,7 +2140,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_0200OnServer() // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); @@ -2184,7 +2184,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); @@ -2202,7 +2202,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); @@ -2393,7 +2393,7 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -2411,7 +2411,7 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -2456,7 +2456,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); @@ -2474,7 +2474,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); @@ -2514,7 +2514,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_Null_TimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); @@ -2532,7 +2532,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_Null_TimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); @@ -2576,7 +2576,7 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`datetime`) values (?)")); @@ -2594,7 +2594,7 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `datetime` from `datetimes` where `id` = ?")); @@ -2641,7 +2641,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`date`) values (?)")); @@ -2659,7 +2659,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `date` from `datetimes` where `id` = ?")); @@ -2701,7 +2701,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_Null_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare("insert into `datetimes` (`time`) values (?)")); @@ -2719,7 +2719,7 @@ void tst_MySql_QDateTime::insert_Qt_QTime_Null_TimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(connection); + auto qtQuery = createSqlQuery(connection); QVERIFY(qtQuery.prepare( "select `id`, `time` from `datetimes` where `id` = ?")); @@ -3034,7 +3034,7 @@ tst_MySql_QDateTime::createQuery(const QString &connection) return DB::query(connection); } -TSqlQuery tst_MySql_QDateTime::createQtQuery(const QString &connection) +TSqlQuery tst_MySql_QDateTime::createSqlQuery(const QString &connection) { return DB::sqlQuery(connection); } 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 0ed9ec0f1..b34749b13 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 @@ -140,7 +140,7 @@ private Q_SLOTS: /*! Create a QueryBuilder instance for the given connection. */ [[nodiscard]] inline std::shared_ptr createQuery() const; /*! Create a raw QSqlQuery instance for the given connection. */ - [[nodiscard]] inline TSqlQuery createQtQuery() const; + [[nodiscard]] inline TSqlQuery createSqlQuery() const; /* QDateTime with/without timezone */ /*! Set the PostgreSQL timezone session variable to the UTC value. */ @@ -200,7 +200,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -218,7 +218,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -270,7 +270,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -290,7 +290,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -340,7 +340,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() co // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -359,7 +359,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() co // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -410,7 +410,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -429,7 +429,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -480,7 +480,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -500,7 +500,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -550,7 +550,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() c // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -569,7 +569,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() c // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -623,7 +623,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -641,7 +641,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -694,7 +694,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -714,7 +714,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -765,7 +765,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() c // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -784,7 +784,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() c // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -836,7 +836,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -855,7 +855,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -907,7 +907,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -927,7 +927,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -978,7 +978,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -997,7 +997,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -1518,7 +1518,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1536,7 +1536,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1574,7 +1574,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1592,7 +1592,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1635,7 +1635,7 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1653,7 +1653,7 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1693,7 +1693,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1711,7 +1711,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1883,7 +1883,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_UtcOnServer() c // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -1901,7 +1901,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn_UtcOnServer() c // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -1939,7 +1939,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -1957,7 +1957,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -2000,7 +2000,7 @@ insert_Qt_QTime_UtcTimezone_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -2018,7 +2018,7 @@ insert_Qt_QTime_UtcTimezone_TimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -2058,7 +2058,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -2076,7 +2076,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -2248,7 +2248,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -2266,7 +2266,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -2309,7 +2309,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() con // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -2327,7 +2327,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() con // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -2365,7 +2365,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QTime_Null_TimeColumn_UtcOnServer() con // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -2383,7 +2383,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QTime_Null_TimeColumn_UtcOnServer() con // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -2426,7 +2426,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -2444,7 +2444,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -2489,7 +2489,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() co // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -2507,7 +2507,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() co // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -2547,7 +2547,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QTime_Null_TimeColumn_0200OnServer() co // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -2565,7 +2565,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QTime_Null_TimeColumn_0200OnServer() co // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -2862,7 +2862,7 @@ tst_PostgreSQL_QDateTime::createQuery() const return DB::query(m_connection); } -TSqlQuery tst_PostgreSQL_QDateTime::createQtQuery() const +TSqlQuery tst_PostgreSQL_QDateTime::createSqlQuery() const { return DB::sqlQuery(m_connection); } 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 341d4f141..6f1c32b69 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 @@ -133,7 +133,7 @@ private Q_SLOTS: /*! Create QueryBuilder instance for the given connection. */ [[nodiscard]] inline std::shared_ptr createQuery() const; /*! Create a raw QSqlQuery instance for the given connection. */ - [[nodiscard]] inline TSqlQuery createQtQuery() const; + [[nodiscard]] inline TSqlQuery createSqlQuery() const; /* QDateTime with/without timezone */ /*! Restore the database after a QDateTime-related test. */ @@ -193,7 +193,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -211,7 +211,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -257,7 +257,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -277,7 +277,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -319,7 +319,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DatetimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -337,7 +337,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DatetimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -380,7 +380,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -400,7 +400,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -444,7 +444,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -464,7 +464,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -506,7 +506,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimestampColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("timestamp") values (?))")); @@ -524,7 +524,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimestampColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "timestamp" from "datetimes" where "id" = ?)")); @@ -996,7 +996,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1014,7 +1014,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1051,7 +1051,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DateColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1069,7 +1069,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DateColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1234,7 +1234,7 @@ void tst_SQLite_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -1252,7 +1252,7 @@ void tst_SQLite_QDateTime::insert_Qt_QTime_UtcTimezone_TimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -1289,7 +1289,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -1307,7 +1307,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -1479,7 +1479,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("datetime") values (?))")); @@ -1497,7 +1497,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "datetime" from "datetimes" where "id" = ?)")); @@ -1540,7 +1540,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_Null_DateColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("date") values (?))")); @@ -1558,7 +1558,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_Null_DateColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "date" from "datetimes" where "id" = ?)")); @@ -1596,7 +1596,7 @@ void tst_SQLite_QDateTime::insert_Qt_QTime_Null_TimeColumn() const // Insert { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare(R"(insert into "datetimes" ("time") values (?))")); @@ -1614,7 +1614,7 @@ void tst_SQLite_QDateTime::insert_Qt_QTime_Null_TimeColumn() const // Verify { - auto qtQuery = createQtQuery(); + auto qtQuery = createSqlQuery(); QVERIFY(qtQuery.prepare( R"(select "id", "time" from "datetimes" where "id" = ?)")); @@ -1803,7 +1803,7 @@ tst_SQLite_QDateTime::createQuery() const return DB::query(m_connection); } -TSqlQuery tst_SQLite_QDateTime::createQtQuery() const +TSqlQuery tst_SQLite_QDateTime::createSqlQuery() const { return DB::sqlQuery(m_connection); }