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 35ed935c4..7398a0a06 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 @@ -143,7 +143,16 @@ namespace { /*! Time zone +02:00. */ Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02:00"))); -} + + /*! QString constant "datetimes" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes")); + /*! QString constant "datetime" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime")); + /*! QString constant "timestamp" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp")); + /*! QString constant "date" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date")); +} // namespace /* private slots */ @@ -206,7 +215,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -269,7 +278,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -330,7 +339,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -393,7 +402,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -456,7 +465,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -518,7 +527,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -584,7 +593,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -648,7 +657,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -710,7 +719,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -774,7 +783,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -838,7 +847,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -900,7 +909,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -928,19 +937,19 @@ void tst_MySql_QDateTime:: insert_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -965,19 +974,19 @@ void tst_MySql_QDateTime:: insert_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1001,18 +1010,18 @@ insert_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const void tst_MySql_QDateTime::insert_QString_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1037,19 +1046,19 @@ void tst_MySql_QDateTime:: insert_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1074,19 +1083,19 @@ void tst_MySql_QDateTime:: insert_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1110,18 +1119,18 @@ insert_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const void tst_MySql_QDateTime::insert_QString_TimestampColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1150,19 +1159,19 @@ insert_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1189,19 +1198,19 @@ insert_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1227,18 +1236,18 @@ void tst_MySql_QDateTime::insert_QString_DatetimeColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1265,19 +1274,19 @@ insert_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1304,19 +1313,19 @@ insert_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1342,18 +1351,18 @@ void tst_MySql_QDateTime::insert_QString_TimestampColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1421,7 +1430,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1477,7 +1486,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1537,7 +1546,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1595,7 +1604,7 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1617,18 +1626,18 @@ void tst_MySql_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate(2022, 8, 28)}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QDate(2022, 8, 28)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1646,18 +1655,18 @@ void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() cons void tst_MySql_QDateTime::insert_QString_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QString("2022-08-28")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QString("2022-08-28")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1679,18 +1688,18 @@ void tst_MySql_QDateTime::insert_QDate_UtcTimezone_DateColumn_0200OnServer() con set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate(2022, 8, 28)}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QDate(2022, 8, 28)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1710,18 +1719,18 @@ void tst_MySql_QDateTime::insert_QString_DateColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QString("2022-08-28")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QString("2022-08-28")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1783,7 +1792,7 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1844,7 +1853,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1904,7 +1913,7 @@ void tst_MySql_QDateTime::insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1967,7 +1976,7 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1989,18 +1998,18 @@ void tst_MySql_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() const void tst_MySql_QDateTime::insert_QDateTime_Null_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", NullVariant::QDateTime()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, NullVariant::QDateTime()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2023,18 +2032,18 @@ void tst_MySql_QDateTime::insert_QDateTime_Null_DatetimeColumn_UtcOnServer() con void tst_MySql_QDateTime::insert_QDate_Null_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", NullVariant::QDate()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, NullVariant::QDate()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2056,18 +2065,18 @@ void tst_MySql_QDateTime::insert_QDateTime_Null_DatetimeColumn_0200OnServer() co set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", NullVariant::QDateTime()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, NullVariant::QDateTime()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2092,18 +2101,18 @@ void tst_MySql_QDateTime::insert_QDate_Null_DateColumn_0200OnServer() const set0200Timezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", NullVariant::QDate()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, NullVariant::QDate()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2133,20 +2142,20 @@ insert_QDateTime_0300Timezone_DatetimeColumn_UtcOnServer_DontConvert() const QtTimeZoneConfig {QtTimeZoneType::DontConvert}); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, QTimeZone("UTC+03:00"))}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -2231,7 +2240,7 @@ bool tst_MySql_QDateTime::mysqlTimezoneTablesNotPopulated() const void tst_MySql_QDateTime::restore(const quint64 lastId, const bool restoreTimezone) const { - const auto [affected, query] = createQuery()->from("datetimes").remove(lastId); + const auto [affected, query] = createQuery()->from(*datetimes).remove(lastId); QVERIFY(!query.lastError().isValid()); QVERIFY(!query.isValid() && query.isActive() && !query.isSelect()); 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 854885edd..3c0968de2 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 @@ -137,6 +137,15 @@ namespace /*! Time zone Europe/Bratislava. */ Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZoneEUBratislava, (QByteArray("Europe/Bratislava"))); + + /*! QString constant "datetimes" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes")); + /*! QString constant "datetime" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime")); + /*! QString constant "timestamp" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp")); + /*! QString constant "date" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date")); } // namespace /* private slots */ @@ -199,7 +208,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -262,7 +271,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -323,7 +332,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_UtcOnServer() co QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -385,7 +394,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -448,7 +457,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -509,7 +518,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_UtcOnServer() c QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -574,7 +583,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -638,7 +647,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -700,7 +709,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DatetimeColumn_0200OnServer() c QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -763,7 +772,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -827,7 +836,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -889,7 +898,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_TimestampColumn_0200OnServer() QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -916,19 +925,19 @@ void tst_PostgreSQL_QDateTime:: insert_QDateTime_UtcTimezone_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -953,20 +962,20 @@ void tst_PostgreSQL_QDateTime:: insert_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -990,18 +999,18 @@ insert_QDateTime_0200Timezone_DatetimeColumn_UtcOnServer() const void tst_PostgreSQL_QDateTime::insert_QString_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1026,19 +1035,19 @@ void tst_PostgreSQL_QDateTime:: insert_QDateTime_UtcTimezone_TimestampColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1063,20 +1072,20 @@ void tst_PostgreSQL_QDateTime:: insert_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1100,18 +1109,18 @@ insert_QDateTime_0200Timezone_TimestampColumn_UtcOnServer() const void tst_PostgreSQL_QDateTime::insert_QString_TimestampColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1140,19 +1149,19 @@ insert_QDateTime_UtcTimezone_DatetimeColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1179,20 +1188,20 @@ insert_QDateTime_0200Timezone_DatetimeColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1218,18 +1227,18 @@ void tst_PostgreSQL_QDateTime::insert_QString_DatetimeColumn_0200OnServer() cons setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1256,19 +1265,19 @@ insert_QDateTime_UtcTimezone_TimestampColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1295,20 +1304,20 @@ insert_QDateTime_0200Timezone_TimestampColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1334,18 +1343,18 @@ void tst_PostgreSQL_QDateTime::insert_QString_TimestampColumn_0200OnServer() con setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -1414,7 +1423,7 @@ tst_PostgreSQL_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn_UtcOnServer() c QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1470,7 +1479,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1531,7 +1540,7 @@ insert_Qt_QDate_UtcTimezone_DateColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1589,7 +1598,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1611,18 +1620,18 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QString_DateColumn_0200OnServer() const void tst_PostgreSQL_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate(2022, 8, 28)}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QDate(2022, 8, 28)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1640,18 +1649,18 @@ void tst_PostgreSQL_QDateTime::insert_QDate_UtcTimezone_DateColumn_UtcOnServer() void tst_PostgreSQL_QDateTime::insert_QString_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QString("2022-08-28")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QString("2022-08-28")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1674,18 +1683,18 @@ insert_QDate_UtcTimezone_DateColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate(2022, 8, 28)}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QDate(2022, 8, 28)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1705,18 +1714,18 @@ void tst_PostgreSQL_QDateTime::insert_QString_DateColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QString("2022-08-28")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QString("2022-08-28")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1779,7 +1788,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn_UtcOnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1840,7 +1849,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_UtcOnServer() con QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1901,7 +1910,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn_0200OnServer() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1964,7 +1973,7 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() co QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1986,18 +1995,18 @@ void tst_PostgreSQL_QDateTime::insert_Qt_QDate_Null_DateColumn_0200OnServer() co void tst_PostgreSQL_QDateTime::insert_QDateTime_Null_DatetimeColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", NullVariant::QDateTime()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, NullVariant::QDateTime()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2020,18 +2029,18 @@ void tst_PostgreSQL_QDateTime::insert_QDateTime_Null_DatetimeColumn_UtcOnServer( void tst_PostgreSQL_QDateTime::insert_QDate_Null_DateColumn_UtcOnServer() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", NullVariant::QDate()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, NullVariant::QDate()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2053,18 +2062,18 @@ void tst_PostgreSQL_QDateTime::insert_QDateTime_Null_DatetimeColumn_0200OnServer setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", NullVariant::QDateTime()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, NullVariant::QDateTime()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -2089,18 +2098,18 @@ void tst_PostgreSQL_QDateTime::insert_QDate_Null_DateColumn_0200OnServer() const setEUBratislavaTimezone(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", NullVariant::QDate()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, NullVariant::QDate()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -2130,20 +2139,20 @@ insert_QDateTime_0300Timezone_DatetimeColumn_UtcOnServer_DontConvert() const QtTimeZoneConfig {QtTimeZoneType::DontConvert}); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZoneEUBratislava)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.size(), 1); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -2205,7 +2214,7 @@ void tst_PostgreSQL_QDateTime::setTimezone(const QString &timeZone, void tst_PostgreSQL_QDateTime::restore(const quint64 lastId, const bool restoreTimezone) const { - const auto [affected, query] = createQuery()->from("datetimes").remove(lastId); + const auto [affected, query] = createQuery()->from(*datetimes).remove(lastId); QVERIFY(!query.lastError().isValid()); QVERIFY(!query.isValid() && query.isActive() && !query.isSelect()); 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 2eb71890f..c137d1c3a 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,6 +133,15 @@ namespace Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone02, (QByteArray("UTC+02"))); /*! Time zone +02:00. */ Q_GLOBAL_STATIC_WITH_ARGS(QTimeZone, TimeZone0200, (QByteArray("UTC+02"))); + + /*! QString constant "datetimes" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetimes, ("datetimes")); + /*! QString constant "datetime" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime, ("datetime")); + /*! QString constant "timestamp" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp")); + /*! QString constant "date" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date")); } // namespace /* private slots */ @@ -195,7 +204,7 @@ insert_Qt_QDateTime_UtcTimezone_DatetimeColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -258,7 +267,7 @@ insert_Qt_QDateTime_0200Timezone_DatetimeColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -318,7 +327,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DatetimeColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -381,7 +390,7 @@ insert_Qt_QDateTime_UtcTimezone_TimestampColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -444,7 +453,7 @@ insert_Qt_QDateTime_0200Timezone_TimestampColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -504,7 +513,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_TimestampColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto timestampDbVariant = qtQuery.value("timestamp"); + const auto timestampDbVariant = qtQuery.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -532,17 +541,17 @@ void tst_SQLite_QDateTime:: insert_QDateTime_UtcTimezone_DatetimeColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -565,17 +574,17 @@ void tst_SQLite_QDateTime:: insert_QDateTime_0200Timezone_DatetimeColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -597,16 +606,16 @@ insert_QDateTime_0200Timezone_DatetimeColumn_OnReturnQDateTime() const void tst_SQLite_QDateTime::insert_QString_DatetimeColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -629,17 +638,17 @@ void tst_SQLite_QDateTime:: insert_QDateTime_UtcTimezone_TimestampColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -662,17 +671,17 @@ void tst_SQLite_QDateTime:: insert_QDateTime_0200Timezone_TimestampColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -694,16 +703,16 @@ insert_QDateTime_0200Timezone_TimestampColumn_OnReturnQDateTime() const void tst_SQLite_QDateTime::insert_QString_TimestampColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -730,17 +739,17 @@ insert_QDateTime_UtcTimezone_DatetimeColumn_OffReturnQDateTime() const disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -767,17 +776,17 @@ insert_QDateTime_0200Timezone_DatetimeColumn_OffReturnQDateTime() const disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -803,16 +812,16 @@ void tst_SQLite_QDateTime::insert_QString_DatetimeColumn_OffReturnQDateTime() co disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -839,17 +848,17 @@ insert_QDateTime_UtcTimezone_TimestampColumn_OffReturnQDateTime() const disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -876,17 +885,17 @@ insert_QDateTime_0200Timezone_TimestampColumn_OffReturnQDateTime() const disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -912,16 +921,16 @@ void tst_SQLite_QDateTime::insert_QString_TimestampColumn_OffReturnQDateTime() c disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"timestamp", QString("2022-08-28 13:14:15")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*timestamp, QString("2022-08-28 13:14:15")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "timestamp"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *timestamp}); QCOMPARE(query.value(ID).value(), lastId); - const auto timestampDbVariant = query.value("timestamp"); + const auto timestampDbVariant = query.value(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -988,7 +997,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_UtcTimezone_DateColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1043,7 +1052,7 @@ void tst_SQLite_QDateTime::insert_Qt_QString_DateColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1066,16 +1075,16 @@ void tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate(2022, 8, 28)}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QDate(2022, 8, 28)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1093,16 +1102,16 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OnReturnQDateTime() co void tst_SQLite_QDateTime::insert_QString_DateColumn_OnReturnQDateTime() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QString("2022-08-28")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QString("2022-08-28")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1125,16 +1134,16 @@ tst_SQLite_QDateTime::insert_QDate_UtcTimezone_DateColumn_OffReturnQDateTime() c disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QDate(2022, 8, 28)}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QDate(2022, 8, 28)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1155,16 +1164,16 @@ void tst_SQLite_QDateTime::insert_QString_DateColumn_OffReturnQDateTime() const disableReturnQDateTime(); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", QString("2022-08-28")}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, QString("2022-08-28")}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1227,7 +1236,7 @@ insert_Qt_QDateTime_Null_DatetimeColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto datetimeDbVariant = qtQuery.value("datetime"); + const auto datetimeDbVariant = qtQuery.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1288,7 +1297,7 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_Null_DateColumn() const QCOMPARE(qtQuery.value(ID).value(), lastId); - const auto dateDbVariant = qtQuery.value("date"); + const auto dateDbVariant = qtQuery.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1311,16 +1320,16 @@ void tst_SQLite_QDateTime::insert_Qt_QDate_Null_DateColumn() const void tst_SQLite_QDateTime::insert_QDateTime_Null_DatetimeColumn() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", NullVariant::QDateTime()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, NullVariant::QDateTime()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1348,16 +1357,16 @@ void tst_SQLite_QDateTime::insert_QDateTime_Null_DatetimeColumn() const void tst_SQLite_QDateTime::insert_QDate_Null_DateColumn() const { // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"date", NullVariant::QDate()}}); + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*date, NullVariant::QDate()}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "date"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *date}); QCOMPARE(query.value(ID).value(), lastId); - const auto dateDbVariant = query.value("date"); + const auto dateDbVariant = query.value(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1388,17 +1397,17 @@ insert_QDateTime_0300Timezone_DatetimeColumn_UtcOnServer_DontConvert() const QtTimeZoneConfig {QtTimeZoneType::DontConvert}); // Insert - quint64 lastId = createQuery()->from("datetimes").insertGetId( - {{"datetime", + quint64 lastId = createQuery()->from(*datetimes).insertGetId( + {{*datetime, QDateTime({2022, 8, 28}, {13, 14, 15}, *TimeZone0200)}}); // Verify { - auto query = createQuery()->from("datetimes").find(lastId, {ID, "datetime"}); + auto query = createQuery()->from(*datetimes).find(lastId, {ID, *datetime}); QCOMPARE(query.value(ID).value(), lastId); - const auto datetimeDbVariant = query.value("datetime"); + const auto datetimeDbVariant = query.value(*datetime); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -1440,7 +1449,7 @@ tst_SQLite_QDateTime::createQuery() const void tst_SQLite_QDateTime::restore(const quint64 lastId) const { - const auto [affected, query] = createQuery()->from("datetimes").remove(lastId); + const auto [affected, query] = createQuery()->from(*datetimes).remove(lastId); QVERIFY(!query.lastError().isValid()); QVERIFY(!query.isValid() && query.isActive() && !query.isSelect()); 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 0dae16046..ec9fa34c1 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 @@ -106,6 +106,16 @@ private Q_SLOTS: const QString &connection = {}) const; }; +namespace +{ + /*! QString constant "datetime" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, datetime_, ("datetime")); + /*! QString constant "timestamp" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, timestamp, ("timestamp")); + /*! QString constant "date" (perf. reason, one time initialization). */ + Q_GLOBAL_STATIC_WITH_ARGS(QString, date, ("date")); +} // namespace + /* private slots */ void tst_Model_QDateTime::initTestCase_data() const @@ -139,10 +149,10 @@ create_QDateTime_UtcTimezone_DatetimeAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["datetime"] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); + datetime[*datetime_] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -159,7 +169,7 @@ create_QDateTime_UtcTimezone_DatetimeAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -192,11 +202,11 @@ create_QDateTime_0200Timezone_DatetimeAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["datetime"] = QDateTime({2022, 8, 28}, {13, 14, 15}, + datetime[*datetime_] = QDateTime({2022, 8, 28}, {13, 14, 15}, timezone0200(connection)); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 11:14:15")); @@ -213,7 +223,7 @@ create_QDateTime_0200Timezone_DatetimeAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -245,10 +255,10 @@ void tst_Model_QDateTime::create_QString_DatetimeAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["datetime"] = QString("2022-08-28 13:14:15"); + datetime[*datetime_] = QString("2022-08-28 13:14:15"); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -265,7 +275,7 @@ void tst_Model_QDateTime::create_QString_DatetimeAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -298,10 +308,10 @@ create_QDateTime_UtcTimezone_TimestampAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["timestamp"] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); + datetime[*timestamp] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("timestamp"); + const auto attribute = datetime.getAttributeFromArray(*timestamp); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -318,7 +328,7 @@ create_QDateTime_UtcTimezone_TimestampAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto timestampDbVariant = datetime->getAttribute("timestamp"); + const auto timestampDbVariant = datetime->getAttribute(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -351,11 +361,11 @@ create_QDateTime_0200Timezone_TimestampAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["timestamp"] = QDateTime({2022, 8, 28}, {13, 14, 15}, - timezone0200(connection)); + datetime[*timestamp] = QDateTime({2022, 8, 28}, {13, 14, 15}, + timezone0200(connection)); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("timestamp"); + const auto attribute = datetime.getAttributeFromArray(*timestamp); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 11:14:15")); @@ -372,7 +382,7 @@ create_QDateTime_0200Timezone_TimestampAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto timestampDbVariant = datetime->getAttribute("timestamp"); + const auto timestampDbVariant = datetime->getAttribute(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -404,10 +414,10 @@ void tst_Model_QDateTime::create_QString_TimestampAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["timestamp"] = QString("2022-08-28 13:14:15"); + datetime[*timestamp] = QString("2022-08-28 13:14:15"); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("timestamp"); + const auto attribute = datetime.getAttributeFromArray(*timestamp); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -424,7 +434,7 @@ void tst_Model_QDateTime::create_QString_TimestampAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto timestampDbVariant = datetime->getAttribute("timestamp"); + const auto timestampDbVariant = datetime->getAttribute(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -465,10 +475,10 @@ create_QDateTime_UtcTimezone_DatetimeAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["datetime"] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); + datetime[*datetime_] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 15:14:15")); @@ -485,7 +495,7 @@ create_QDateTime_UtcTimezone_DatetimeAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -524,11 +534,11 @@ create_QDateTime_0200Timezone_DatetimeAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["datetime"] = QDateTime({2022, 8, 28}, {13, 14, 15}, + datetime[*datetime_] = QDateTime({2022, 8, 28}, {13, 14, 15}, timezone0200(connection)); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -545,7 +555,7 @@ create_QDateTime_0200Timezone_DatetimeAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -583,10 +593,10 @@ void tst_Model_QDateTime::create_QString_DatetimeAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["datetime"] = QString("2022-08-28 13:14:15"); + datetime[*datetime_] = QString("2022-08-28 13:14:15"); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -603,7 +613,7 @@ void tst_Model_QDateTime::create_QString_DatetimeAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull()); @@ -642,10 +652,10 @@ create_QDateTime_UtcTimezone_TimestampAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["timestamp"] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); + datetime[*timestamp] = QDateTime({2022, 8, 28}, {13, 14, 15}, Qt::UTC); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("timestamp"); + const auto attribute = datetime.getAttributeFromArray(*timestamp); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 15:14:15")); @@ -662,7 +672,7 @@ create_QDateTime_UtcTimezone_TimestampAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto timestampDbVariant = datetime->getAttribute("timestamp"); + const auto timestampDbVariant = datetime->getAttribute(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -701,11 +711,11 @@ create_QDateTime_0200Timezone_TimestampAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["timestamp"] = QDateTime({2022, 8, 28}, {13, 14, 15}, - timezone0200(connection)); + datetime[*timestamp] = QDateTime({2022, 8, 28}, {13, 14, 15}, + timezone0200(connection)); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("timestamp"); + const auto attribute = datetime.getAttributeFromArray(*timestamp); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -722,7 +732,7 @@ create_QDateTime_0200Timezone_TimestampAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto timestampDbVariant = datetime->getAttribute("timestamp"); + const auto timestampDbVariant = datetime->getAttribute(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -760,10 +770,10 @@ void tst_Model_QDateTime::create_QString_TimestampAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["timestamp"] = QString("2022-08-28 13:14:15"); + datetime[*timestamp] = QString("2022-08-28 13:14:15"); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("timestamp"); + const auto attribute = datetime.getAttributeFromArray(*timestamp); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -780,7 +790,7 @@ void tst_Model_QDateTime::create_QString_TimestampAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto timestampDbVariant = datetime->getAttribute("timestamp"); + const auto timestampDbVariant = datetime->getAttribute(*timestamp); QVERIFY(timestampDbVariant.isValid()); QVERIFY(!timestampDbVariant.isNull()); @@ -816,10 +826,10 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_UtcOnServer() c // Insert { Datetime datetime; - datetime["date"] = QDate(2022, 8, 28); + datetime[*date] = QDate(2022, 8, 28); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("date"); + const auto attribute = datetime.getAttributeFromArray(*date); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28")); @@ -836,7 +846,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_UtcOnServer() c QVERIFY(datetime); QVERIFY(datetime->exists); - const auto dateDbVariant = datetime->getAttribute("date"); + const auto dateDbVariant = datetime->getAttribute(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -863,10 +873,10 @@ void tst_Model_QDateTime::create_QString_DateAttribute_UtcOnServer() const { Datetime datetime; // Will use isStandardDateFormat() - datetime["date"] = QString("2022-08-28"); + datetime[*date] = QString("2022-08-28"); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("date"); + const auto attribute = datetime.getAttributeFromArray(*date); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28")); @@ -883,7 +893,7 @@ void tst_Model_QDateTime::create_QString_DateAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto dateDbVariant = datetime->getAttribute("date"); + const auto dateDbVariant = datetime->getAttribute(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -913,10 +923,10 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_0200OnServer() // Insert { Datetime datetime; - datetime["date"] = QDate(2022, 8, 28); + datetime[*date] = QDate(2022, 8, 28); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("date"); + const auto attribute = datetime.getAttributeFromArray(*date); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28")); @@ -933,7 +943,7 @@ void tst_Model_QDateTime::create_QDate_UtcTimezone_DateAttribute_0200OnServer() QVERIFY(datetime); QVERIFY(datetime->exists); - const auto dateDbVariant = datetime->getAttribute("date"); + const auto dateDbVariant = datetime->getAttribute(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -962,10 +972,10 @@ void tst_Model_QDateTime::create_QString_DateAttribute_0200OnServer() const { Datetime datetime; // Will use isStandardDateFormat() - datetime["date"] = QString("2022-08-28"); + datetime[*date] = QString("2022-08-28"); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("date"); + const auto attribute = datetime.getAttributeFromArray(*date); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28")); @@ -982,7 +992,7 @@ void tst_Model_QDateTime::create_QString_DateAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto dateDbVariant = datetime->getAttribute("date"); + const auto dateDbVariant = datetime->getAttribute(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(!dateDbVariant.isNull()); @@ -1012,10 +1022,10 @@ void tst_Model_QDateTime::create_QDateTime_Null_DatetimeAttribute_UtcOnServer() // Insert { Datetime datetime; - datetime["datetime"] = NullVariant::QDateTime(); + datetime[*datetime_] = NullVariant::QDateTime(); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QVERIFY(attribute.isValid() && attribute.isNull()); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QDateTime); @@ -1032,7 +1042,7 @@ void tst_Model_QDateTime::create_QDateTime_Null_DatetimeAttribute_UtcOnServer() QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1073,10 +1083,10 @@ void tst_Model_QDateTime::create_QDate_Null_DateAttribute_UtcOnServer() const // Insert { Datetime datetime; - datetime["date"] = NullVariant::QDate(); + datetime[*date] = NullVariant::QDate(); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("date"); + const auto attribute = datetime.getAttributeFromArray(*date); QVERIFY(attribute.isValid() && attribute.isNull()); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QDate); @@ -1093,7 +1103,7 @@ void tst_Model_QDateTime::create_QDate_Null_DateAttribute_UtcOnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto dateDbVariant = datetime->getAttribute("date"); + const auto dateDbVariant = datetime->getAttribute(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1137,10 +1147,10 @@ void tst_Model_QDateTime::create_QDateTime_Null_DatetimeAttribute_0200OnServer() // Insert { Datetime datetime; - datetime["datetime"] = NullVariant::QDateTime(); + datetime[*datetime_] = NullVariant::QDateTime(); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QVERIFY(attribute.isValid() && attribute.isNull()); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QDateTime); @@ -1157,7 +1167,7 @@ void tst_Model_QDateTime::create_QDateTime_Null_DatetimeAttribute_0200OnServer() QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(datetimeDbVariant.isNull()); @@ -1200,10 +1210,10 @@ void tst_Model_QDateTime::create_QDate_Null_DateAttribute_0200OnServer() const // Insert { Datetime datetime; - datetime["date"] = NullVariant::QDate(); + datetime[*date] = NullVariant::QDate(); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("date"); + const auto attribute = datetime.getAttributeFromArray(*date); QVERIFY(attribute.isValid() && attribute.isNull()); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QDate); @@ -1220,7 +1230,7 @@ void tst_Model_QDateTime::create_QDate_Null_DateAttribute_0200OnServer() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto dateDbVariant = datetime->getAttribute("date"); + const auto dateDbVariant = datetime->getAttribute(*date); QVERIFY(dateDbVariant.isValid()); QVERIFY(dateDbVariant.isNull()); @@ -1265,11 +1275,11 @@ create_QDateTime_0300Timezone_DatetimeAttribute_UtcOnServer_DontConvert() const // Insert { Datetime datetime; - datetime["datetime"] = QDateTime({2022, 8, 28}, {13, 14, 15}, + datetime[*datetime_] = QDateTime({2022, 8, 28}, {13, 14, 15}, QTimeZone("UTC+03:00")); // Check whether a stored value and type are correct - const auto attribute = datetime.getAttributeFromArray("datetime"); + const auto attribute = datetime.getAttributeFromArray(*datetime_); QCOMPARE(Helpers::qVariantTypeId(attribute), QMetaType::QString); QCOMPARE(attribute.value(), QString("2022-08-28 13:14:15")); @@ -1286,7 +1296,7 @@ create_QDateTime_0300Timezone_DatetimeAttribute_UtcOnServer_DontConvert() const QVERIFY(datetime); QVERIFY(datetime->exists); - const auto datetimeDbVariant = datetime->getAttribute("datetime"); + const auto datetimeDbVariant = datetime->getAttribute(*datetime_); QVERIFY(datetimeDbVariant.isValid()); QVERIFY(!datetimeDbVariant.isNull());