mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-05-07 17:19:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed Qt <6.4 support since TinyORM v0.39.0 🎉🕺

Browse Source 
Minimum required Qt version is now v6.4!

Day of celebration is today 😁 as I can drop all QStringLiteral()-s and
can start using u""_s and ''_L1 from now, everywhere! 🙌🕺

 - used the QVERIFY_THROWS_EXCEPTION() everywhere
This commit is contained in:
silverqx
2024-08-30 15:42:59 +02:00
parent 2be001204f
commit 0264aac988
27 changed files with 131 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -59,7 +59,7 @@ set(minRecGCCVersion 10.2)
set(minRecClangVersion 12)
set(minReqClangClVersion 14.0.3)
# Packages
set(minReqQtVersion 6.2)
set(minReqQtVersion 6.4)
# Unused
# As the range-v3 uses exact version policy in the package config file so passing version
# makes real problems on CI pipelines where different OS images can have installed
TinyORM.pro
+1 -1
View File
@@ -8,7 +8,7 @@ TEMPLATE = subdirs
# 16.10/16.11 (1929) - to support #pragma system_header
tinyMinReqMsvc = 19.29
tinyMinReqQt = 6.2
tinyMinReqQt = 6.4
tinyMinReqClangCl = 14.0.3
tinyMinRecClang = 12
tinyMinRecGCC = 10.2
docs/dependencies.mdx
+8 -7
View File
@@ -2,7 +2,7 @@
sidebar_position: 1
sidebar_label: 🔧 Dependencies
hide_table_of_contents: true
description: Library dependencies are MySQL Connector/C 8, range-v3 >=0.11.0, tabulate and the Qt framework version used during development was 5.15.2 and >=6.2. The code was developed on MSVC 16.9-16.11, MSVC 17.2-17.9, GCC 11.2-14.2, and Clang 11-18.
description: Library dependencies are MySQL Connector/C 8, range-v3 >=0.11.0, tabulate and the Qt framework version used during development was >=6.4. The code was developed on MSVC 16.9-16.11, MSVC 17.2-17.9, GCC 11.2-14.2, and Clang 11-18.
keywords: [c++ orm, dependencies, tinyorm]
---
@@ -11,18 +11,19 @@ import Link from '@docusaurus/Link'
# Dependencies
The code was developed on MSVC 16.9-16.11, MSVC 17.2-17.9, GCC 11.2-14.2, and Clang 11-18, so may be assumed it will work on future releases of these compilers. Minimum required ISO C++ standard is C++20.
The Qt framework version used during development was ~5.15.2~ and >=6.2.
The Qt framework version used during development was `>=6.4`.
##### Required
- minimum ISO C++ standard is C++20
- &gt;= [Qt Framework 6.2](https://www.qt.io/download-qt-installer) - [`QtCore`](https://doc.qt.io/qt/qtcore-module.html) and [`QtSql`](https://doc.qt.io/qt/qtsql-index.html) modules
- minimum ISO C++ standard is [C++20](https://en.cppreference.com/w/cpp/20) <small>[[1](https://en.wikipedia.org/wiki/C++20)]</small>
- &gt;= [Qt Framework v6.4](https://www.qt.io/download-qt-installer) - [`QtCore`](https://doc.qt.io/qt/qtcore-module.html) and [`QtSql`](https://doc.qt.io/qt/qtsql-index.html) modules
- &gt;= [range-v3 0.11.0](https://github.com/ericniebler/range-v3)
- [tabulate](https://github.com/p-ranav/tabulate)
:::danger
Support for __Qt v5.15__ was removed since __TinyORM v0.38.0__. 🎉🙌
:::
##### Removed Support
- __Qt &lt;6.4__ since __TinyORM v0.39.0__
- __Qt v5.15__ since __TinyORM v0.38.0__ 🎉🙌
:::warning
Be aware that the standard support for the last release of the __Qt v5__ series ended on __26. May 2023__. [[1](https://endoflife.date/qt)][[2](https://www.qt.io/blog/qt-5.15-support-ends)]
qmake/TinyOrm.pri
+1 -1
View File
@@ -66,7 +66,7 @@ include($$TINYORM_SOURCE_TREE/qmake/support/variables.pri)
# Req - requirement, throws error
# Rec - recommended, shows info message
tinyMinReqQt = 6.2
tinyMinReqQt = 6.4
# Unused
#tinyMinReqRangeV3Version = 0.12.0
#tinyMinReqTabulateVersion = 1.5.0
qmake/common/common.pri
+1
View File
@@ -6,6 +6,7 @@ load(private/tiny_dotenv)
# Common Configuration ( also for tests )
# ---
# Don't remove even after Qt <6.4 support is removed
versionAtLeast(QT_VERSION, 6.2.4): \
CONFIG *= c++20
else: \
qmake/tom.pri
+1 -1
View File
@@ -66,7 +66,7 @@ include($$TINYORM_SOURCE_TREE/qmake/support/variables.pri)
# Req - requirement, throws error
# Rec - recommended, shows info message
tinyMinReqQt = 6.2
tinyMinReqQt = 6.4
# Unused
#tinyMinReqRangeV3Version = 0.12.0
#tinyMinReqTabulateVersion = 1.5.0
tests/TinyUtils/src/macros.hpp
-14
View File
@@ -2,23 +2,9 @@
#ifndef TINYUTILS_MACROS_HPP
#define TINYUTILS_MACROS_HPP
#include <QtGlobal>
#ifndef sl
/*! Alias for the QStringLiteral(). */
# define sl(str) QStringLiteral(str)
#endif
#ifndef TVERIFY_THROWS_EXCEPTION
# if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
/*! Alias for QVERIFY_THROWS_EXCEPTION() (temporary workaround for Qt v6.8). */
# define TVERIFY_THROWS_EXCEPTION(exceptiontype, ...) \
QVERIFY_THROWS_EXCEPTION(exceptiontype, __VA_ARGS__)
# else
/*! Alias for QVERIFY_EXCEPTION_THROWN(). */
# define TVERIFY_THROWS_EXCEPTION(exceptiontype, expression) \
QVERIFY_EXCEPTION_THROWN(expression, exceptiontype)
# endif
#endif
#endif // TINYUTILS_MACROS_HPP
tests/auto/functional/drivers/sqldatabasemanager/tst_sqldatabasemanager.cpp
+5 -5
View File
@@ -409,7 +409,7 @@ void tst_SqlDatabaseManager::MySQL_addExistingConnection_ThrowException() const
QCOMPARE(Databases::driversConnectionNames().size(), 1);
QVERIFY(Databases::driversOpenedConnectionNames().isEmpty());
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
InvalidArgumentError,
Databases::createDriversConnectionTemp(
Databases::MYSQL_DRIVERS,
@@ -464,7 +464,7 @@ void tst_SqlDatabaseManager::MySQL_enableOptionalMetadata_ThrowException() const
u"CLIENT_OPTIONAL_RESULTSET_METADATA"_s}) // Must support option without the value (=ON/OFF; w/o value == ON)
.join(SEMICOLON));
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
// Restore
/* This will generate expected warning about the connection is still in use
@@ -497,7 +497,7 @@ void tst_SqlDatabaseManager::MySQL_enableOptionalMetadata_ThrowException() const
u"MYSQL_OPT_OPTIONAL_RESULTSET_METADATA=ON"_s})
.join(SEMICOLON));
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
// Restore
/* This will generate expected warning about the connection is still in use
@@ -541,7 +541,7 @@ void tst_SqlDatabaseManager::MySQL_disableOptionalMetadata_CLIENT_OPTIONAL() con
u"CLIENT_OPTIONAL_RESULTSET_METADATA=OFF"_s}) // Must support option without the value (=ON/OFF; w/o value == ON)
.join(SEMICOLON));
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
// Restore
/* This will generate expected warning about the connection is still in use
@@ -629,7 +629,7 @@ void tst_SqlDatabaseManager::MySQL_MariaDB_disableOptionalMetadata_MYSQL_OPT() c
u"MYSQL_OPT_OPTIONAL_RESULTSET_METADATA=OFF"_s})
.join(SEMICOLON));
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, connection.open());
// Restore
/* This will generate expected warning about the connection is still in use
tests/auto/functional/drivers/sqlquery_normal/tst_sqlquery_normal.cpp
+16 -16
View File
@@ -1035,12 +1035,12 @@ void tst_SqlQuery_Normal::finish_And_detachFromResultSet() const
QVERIFY(users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), query);
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY(!users.next());
QVERIFY(!users.previous());
@@ -1308,12 +1308,12 @@ void tst_SqlQuery_Normal::select_reExecute_SameQuery_AfterFinish() const
QVERIFY(users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), query);
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY(!users.next());
QVERIFY(!users.previous());
@@ -1425,12 +1425,12 @@ void tst_SqlQuery_Normal::select_executeAnotherQuery_OnSameInstance_AfterFinish(
QVERIFY(query.isSelect());
QVERIFY(!query.isValid());
QCOMPARE(query.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, query.size());
QVERIFY_THROWS_EXCEPTION(LogicError, query.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
QCOMPARE(query.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(query.executedQuery(), queryString);
TVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
QVERIFY(!query.next());
QVERIFY(!query.previous());
@@ -1510,7 +1510,7 @@ void tst_SqlQuery_Normal::insert_update_delete() const
QVERIFY(users.isActive());
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QCOMPARE(users.numRowsAffected(), 1);
QCOMPARE(users.executedQuery(), query);
@@ -1576,7 +1576,7 @@ void tst_SqlQuery_Normal::insert_update_delete() const
QVERIFY(users.isActive());
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QCOMPARE(users.numRowsAffected(), 1);
QCOMPARE(users.executedQuery(), query);
}
@@ -1634,7 +1634,7 @@ void tst_SqlQuery_Normal::insert_update_delete() const
QVERIFY(users.isActive());
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QCOMPARE(users.numRowsAffected(), 1);
QCOMPARE(users.executedQuery(), query);
}
@@ -1725,12 +1725,12 @@ void tst_SqlQuery_Normal::clear() const
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.isEmpty());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.isEmpty());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), QString());
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY(users.boundValues().isEmpty());
}
tests/auto/functional/drivers/sqlquery_prepared/tst_sqlquery_prepared.cpp
+23 -23
View File
@@ -856,7 +856,7 @@ void tst_SqlQuery_Prepared::select_BoundLessValues() const
QCOMPARE(boundValues.size(), 1);
QCOMPARE(boundValues, QVariantList {1});
TVERIFY_THROWS_EXCEPTION(QueryError, users.exec());
QVERIFY_THROWS_EXCEPTION(QueryError, users.exec());
}
namespace
@@ -1201,12 +1201,12 @@ void tst_SqlQuery_Prepared::finish_And_detachFromResultSet() const
QVERIFY(users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), query);
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
// Test bound values
{
@@ -1496,12 +1496,12 @@ void tst_SqlQuery_Prepared::select_reExecute_SameQuery_AfterFinish() const
QVERIFY(users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), query);
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
// Test bound values
QVERIFY(users.boundValues().isEmpty());
@@ -1619,12 +1619,12 @@ void tst_SqlQuery_Prepared::select_executeAnotherQuery_OnSameInstance_AfterFinis
QVERIFY(query.isSelect());
QVERIFY(!query.isValid());
QCOMPARE(query.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, query.size());
QVERIFY_THROWS_EXCEPTION(LogicError, query.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
QCOMPARE(query.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(query.executedQuery(), queryString);
TVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
// Test bound values
QVERIFY(query.boundValues().isEmpty());
@@ -1990,12 +1990,12 @@ void tst_SqlQuery_Prepared::
QVERIFY(users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), query);
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY(!users.next());
QVERIFY(!users.previous());
@@ -2121,12 +2121,12 @@ void tst_SqlQuery_Prepared::
QVERIFY(query.isSelect());
QVERIFY(!query.isValid());
QCOMPARE(query.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, query.size());
QVERIFY_THROWS_EXCEPTION(LogicError, query.size());
// Behaves the same as the size() for SELECT queries
TVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, query.numRowsAffected());
QCOMPARE(query.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(query.executedQuery(), queryString);
TVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, query.lastInsertId());
// Test bound values
const auto boundValues = query.boundValues();
@@ -2238,7 +2238,7 @@ void tst_SqlQuery_Prepared::insert_update_delete() const
QVERIFY(users.isActive());
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QCOMPARE(users.numRowsAffected(), 1);
QCOMPARE(users.executedQuery(), query);
@@ -2324,7 +2324,7 @@ void tst_SqlQuery_Prepared::insert_update_delete() const
QVERIFY(users.isActive());
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QCOMPARE(users.numRowsAffected(), 1);
QCOMPARE(users.executedQuery(), query);
}
@@ -2402,7 +2402,7 @@ void tst_SqlQuery_Prepared::insert_update_delete() const
QVERIFY(users.isActive());
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QCOMPARE(users.numRowsAffected(), 1);
QCOMPARE(users.executedQuery(), query);
}
@@ -2511,12 +2511,12 @@ void tst_SqlQuery_Prepared::clear() const
QVERIFY(!users.isSelect());
QVERIFY(!users.isValid());
QCOMPARE(users.at(), BeforeFirstRow);
TVERIFY_THROWS_EXCEPTION(LogicError, users.isEmpty());
TVERIFY_THROWS_EXCEPTION(LogicError, users.size());
TVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QVERIFY_THROWS_EXCEPTION(LogicError, users.isEmpty());
QVERIFY_THROWS_EXCEPTION(LogicError, users.size());
QVERIFY_THROWS_EXCEPTION(LogicError, users.numRowsAffected());
QCOMPARE(users.numericalPrecisionPolicy(), LowPrecisionDouble);
QCOMPARE(users.executedQuery(), QString());
TVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY_THROWS_EXCEPTION(LogicError, users.lastInsertId());
QVERIFY(users.boundValues().isEmpty());
}
tests/auto/functional/orm/databasemanager/tst_databasemanager.cpp
+1 -1
View File
@@ -811,7 +811,7 @@ void tst_DatabaseManager::SQLite_CheckDatabaseExists_True() const
.toUtf8().constData(), );
// Verify
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
SQLiteDatabaseDoesNotExistError,
m_dm->connection(*connectionName)
.statement(sl("create table tbl1 (one varchar(10), two smallint)")));
tests/auto/functional/orm/query/querybuilder/tst_querybuilder.cpp
+7 -7
View File
@@ -1313,7 +1313,7 @@ void tst_QueryBuilder::upsert_EmptyUpdate() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
InvalidArgumentError,
createQuery(connection)->from("tag_properties")
.upsert({{{"tag_id", 1}, {"color", "pink"}, {"position", 0}},
@@ -1672,7 +1672,7 @@ void tst_QueryBuilder::sole_RecordsNotFoundError() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RecordsNotFoundError,
createQuery(connection)->from("torrents")
.whereEq(NAME, dummy_NONEXISTENT)
@@ -1683,7 +1683,7 @@ void tst_QueryBuilder::sole_MultipleRecordsFoundError() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
MultipleRecordsFoundError,
createQuery(connection)->from("torrents").whereEq("user_id", 1).sole());
}
@@ -1704,7 +1704,7 @@ void tst_QueryBuilder::soleValue_RecordsNotFoundError() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RecordsNotFoundError,
createQuery(connection)->from("torrents")
.whereEq(NAME, dummy_NONEXISTENT)
@@ -1715,7 +1715,7 @@ void tst_QueryBuilder::soleValue_MultipleRecordsFoundError() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
MultipleRecordsFoundError,
createQuery(connection)->from("torrents")
.whereEq("user_id", 1)
@@ -1808,7 +1808,7 @@ void tst_QueryBuilder::chunk_EnforceOrderBy() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
createQuery(connection)->from("file_property_properties")
.chunk(3, [](SqlQuery &/*unused*/, const qint64 /*unused*/)
@@ -1902,7 +1902,7 @@ void tst_QueryBuilder::each_EnforceOrderBy() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
createQuery(connection)->from("file_property_properties")
.each([](SqlQuery &/*unused*/, const qint64 /*unused*/)
tests/auto/functional/orm/schema/psql_schemabuilder_f/tst_postgresql_schemabuilder_f.cpp
+1 -1
View File
@@ -109,7 +109,7 @@ void tst_PostgreSQL_SchemaBuilder_f::
.toUtf8().constData(), );
// Verify
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
SearchPathEmptyError,
Schema::on(*connectionName).hasTable(sl("users")));
tests/auto/functional/orm/tiny/castattributes/tst_castattributes.cpp
+2 -2
View File
@@ -510,7 +510,7 @@ void tst_CastAttributes::cast_QByteArray_to_QDateTime_ThrowException() const
type.mergeCasts({{"binary", CastType::QDateTime}});
TVERIFY_THROWS_EXCEPTION(InvalidFormatError,
QVERIFY_THROWS_EXCEPTION(InvalidFormatError,
type.getAttribute("binary"));
}
@@ -526,7 +526,7 @@ void tst_CastAttributes::cast_QDateTime_to_QByteArray_ThrowException() const
type.mergeCasts({{"datetime", CastType::QByteArray}});
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
type.getAttribute("datetime"));
}
tests/auto/functional/orm/tiny/collection_models/tst_collection_models.cpp
+3 -3
View File
@@ -2667,7 +2667,7 @@ void tst_Collection_Models::load_lvalue_NonExistentRelation_Failed() const
// Verify before
verify();
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
albums.load("albumImages-NON_EXISTENT"));
// Verify after
@@ -2906,7 +2906,7 @@ void tst_Collection_Models::load_rvalue_NonExistentRelation_Failed() const
// Verify before
verify();
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
std::move(albums).load("albumImages-NON_EXISTENT"));
// Verify after
@@ -3133,7 +3133,7 @@ void tst_Collection_Models::where_InvalidComparisonOperator_ThrowException() con
QVERIFY(Common::verifyIds(images, {2, 3, 4, 5, 6}));
// Verify
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
images.where(ID, dummy_NONEXISTENT, 10));
}
tests/auto/functional/orm/tiny/collection_relations/tst_collection_relations.cpp
+3 -3
View File
@@ -3117,7 +3117,7 @@ void tst_Collection_Relations::load_lvalue_NonExistentRelation_Failed() const
// Verify before
verify();
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
albumsInit.load("albumImages-NON_EXISTENT"));
// Verify after
@@ -3378,7 +3378,7 @@ void tst_Collection_Relations::load_rvalue_NonExistentRelation_Failed() const
// Verify before
verify();
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
std::move(albumsInit).load("albumImages-NON_EXISTENT"));
// Verify after
@@ -3653,7 +3653,7 @@ void tst_Collection_Relations::where_InvalidComparisonOperator_ThrowException()
QVERIFY(Common::verifyIds(images, {2, 3, 4, 5, 6}));
// Verify
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
images.where(ID, dummy_NONEXISTENT, 10));
}
tests/auto/functional/orm/tiny/model/tst_model.cpp
+4 -4
View File
@@ -392,7 +392,7 @@ void tst_Model::save_Update_Failed() const
peer->setAttribute("total_seeds-NON_EXISTENT", 15);
TVERIFY_THROWS_EXCEPTION(QueryError, peer->save());
QVERIFY_THROWS_EXCEPTION(QueryError, peer->save());
QVERIFY(peer->exists);
}
@@ -835,8 +835,8 @@ void tst_Model::findOrFail_NotFoundFailed() const
ConnectionOverride::connection = connection;
TVERIFY_THROWS_EXCEPTION(ModelNotFoundError, Torrent::findOrFail(999999));
TVERIFY_THROWS_EXCEPTION(ModelNotFoundError, Torrent::findOrFail(999999, {ID, NAME}));
QVERIFY_THROWS_EXCEPTION(ModelNotFoundError, Torrent::findOrFail(999999));
QVERIFY_THROWS_EXCEPTION(ModelNotFoundError, Torrent::findOrFail(999999, {ID, NAME}));
}
void tst_Model::findMany() const
@@ -1352,7 +1352,7 @@ void tst_Model::create_Failed() const
const auto addedOn = QDateTime({2021, 2, 1}, {20, 22, 10}, TTimeZone::UTC);
Torrent torrent;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
(torrent = Torrent::create({
{"name-NON_EXISTENT", "test100"},
{SIZE_, 100},
tests/auto/functional/orm/tiny/model_conn_indep/tst_model_connection_independent.cpp
+8 -8
View File
@@ -210,14 +210,14 @@ void tst_Model_Connection_Independent::
defaultAttributeValues_WithQDateTime_DefaultCtor() const
{
// Default constructor must throw because of the QDateTime
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError, Torrent_With_QDateTime());
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError, Torrent_With_QDateTime());
}
void tst_Model_Connection_Independent::
defaultAttributeValues_WithQDateTime_ConvertingAttributesCtor() const
{
// Attributes converting constructor must throw because of the QDateTime
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
Torrent_With_QDateTime({
{NAME, "test22"},
{NOTE, "Torrent::instance()"},
@@ -229,7 +229,7 @@ defaultAttributeValues_WithQDateTime_ListInitializationCtor() const
{
/* List initialization using the std::initializer_list<AttributeItem> must throw
because of the QDateTime. */
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
(Torrent_With_QDateTime {
{NAME, "test22"},
{NOTE, "Torrent::instance()"},
@@ -965,7 +965,7 @@ tst_Model_Connection_Independent::massAssignment_TotallyGuarded_Exception() cons
Torrent_TotallyGuarded torrent;
QVERIFY(!torrent.exists);
TVERIFY_THROWS_EXCEPTION(MassAssignmentError, torrent.fill({{NAME, "test150"}}));
QVERIFY_THROWS_EXCEPTION(MassAssignmentError, torrent.fill({{NAME, "test150"}}));
}
void tst_Model_Connection_Independent::
@@ -2218,14 +2218,14 @@ void tst_Model_Connection_Independent::sole() const
void tst_Model_Connection_Independent::sole_RecordsNotFoundError() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RecordsNotFoundError,
FilePropertyProperty::whereEq(NAME, dummy_NONEXISTENT)->sole());
}
void tst_Model_Connection_Independent::sole_MultipleRecordsFoundError() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
MultipleRecordsFoundError,
FilePropertyProperty::whereEq("file_property_id", 5)->sole());
}
@@ -2258,14 +2258,14 @@ void tst_Model_Connection_Independent::soleValue() const
void tst_Model_Connection_Independent::soleValue_RecordsNotFoundError() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RecordsNotFoundError,
FilePropertyProperty::whereEq(NAME, dummy_NONEXISTENT)->soleValue(NAME));
}
void tst_Model_Connection_Independent::soleValue_MultipleRecordsFoundError() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
MultipleRecordsFoundError,
FilePropertyProperty::soleValue(NAME));
}
tests/auto/functional/orm/tiny/model_relations/tst_model_relations.cpp
+9 -9
View File
@@ -417,23 +417,23 @@ void tst_Model_Relations::getRelation_EagerLoad_Failed() const
Torrent torrent;
// Many relation
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RelationNotLoadedError,
(torrent.getRelation<TorrentPreviewableFile>("torrentFiles")));
// One relation, obtained as QList, also possible
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RelationNotLoadedError,
(torrent.getRelation<TorrentPeer>("torrentFiles")));
// Many relation
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RelationNotLoadedError,
(torrent.getRelation<TorrentPeer, One>("torrentFiles")));
// BelongsTo relation
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RelationNotLoadedError,
(TorrentPeer().getRelation<Torrent, One>("torrent")));
// BelongsToMany relation
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RelationNotLoadedError,
(torrent.getRelation<Tag>("tags")));
}
@@ -444,7 +444,7 @@ void tst_Model_Relations::eagerLoad_Failed() const
ConnectionOverride::connection = connection;
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
TorrentEager_Failed::find(1));
}
@@ -933,7 +933,7 @@ void tst_Model_Relations::with_Vector_MoreRelations() const
QCOMPARE(typeid (file), typeid (TorrentPreviewableFile *));
// No TorrentPreviewableFileProperty loaded
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
(file->getRelation<TorrentPreviewableFileProperty, One>(
"fileProperty")));
@@ -946,7 +946,7 @@ void tst_Model_Relations::with_NonExistentRelation_Failed() const
ConnectionOverride::connection = connection;
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
Torrent::with("torrentFiles-NON_EXISTENT")->find(1));
}
@@ -1793,7 +1793,7 @@ void tst_Model_Relations::load_NonExistentRelation_Failed() const
QVERIFY(torrent->getRelations().empty());
TVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
QVERIFY_THROWS_EXCEPTION(RelationMappingNotFoundError,
torrent->load("torrentFiles-NON_EXISTENT"));
QVERIFY(torrent->getRelations().empty());
}
tests/auto/functional/orm/tiny/relations_insrt_updt/tst_relations_inserting_updating.cpp
+12 -12
View File
@@ -233,7 +233,7 @@ void tst_Relations_Inserting_Updating::save_OnHasOneOrMany_Failed() const
});
QVERIFY(!file.exists);
TVERIFY_THROWS_EXCEPTION(QueryError, torrent->torrentFiles()->save(file));
QVERIFY_THROWS_EXCEPTION(QueryError, torrent->torrentFiles()->save(file));
QVERIFY(!file.exists);
QVERIFY(!file[ID]->isValid());
QCOMPARE(file["torrent_id"], QVariant(1));
@@ -402,7 +402,7 @@ void tst_Relations_Inserting_Updating::saveMany_OnHasOneOrMany_Failed() const
std::move(file2),
};
ModelsCollection<TorrentPreviewableFile> savedFiles;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
savedFiles = torrent->torrentFiles()->saveMany(filesToSave));
QVERIFY(savedFiles.isEmpty());
}
@@ -502,7 +502,7 @@ void tst_Relations_Inserting_Updating::create_OnHasOneOrMany_Failed() const
};
TorrentPreviewableFile file;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
file = torrent->torrentFiles()->create(fileAttribtues));
QVERIFY(!file.exists);
QVERIFY(file.getAttributes().isEmpty());
@@ -520,7 +520,7 @@ void tst_Relations_Inserting_Updating::create_OnHasOneOrMany_WithRValue_Failed()
TorrentPreviewableFile file;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
file = torrent->torrentFiles()->create({
{"file_index", 1},
{"filepath", "test1_file1.mkv"},
@@ -689,7 +689,7 @@ void tst_Relations_Inserting_Updating::createMany_OnHasOneOrMany_Failed() const
};
ModelsCollection<TorrentPreviewableFile> savedFiles;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
savedFiles = torrent->torrentFiles()
->createMany(fileAttributesToSave));
QVERIFY(savedFiles.isEmpty());
@@ -707,7 +707,7 @@ tst_Relations_Inserting_Updating::createMany_OnHasOneOrMany_WithRValue_Failed()
QVERIFY(torrent->exists);
ModelsCollection<TorrentPreviewableFile> savedFiles;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
savedFiles = torrent->torrentFiles()->createMany({{
{"file_index", 1},
{"filepath", "test1_file1.mkv"},
@@ -836,7 +836,7 @@ void tst_Relations_Inserting_Updating::save_OnBelongsToMany_Failed() const
Tag tag({{NAME, "tag1"}});
QVERIFY(!tag.exists);
TVERIFY_THROWS_EXCEPTION(QueryError, torrent->tags()->save(tag));
QVERIFY_THROWS_EXCEPTION(QueryError, torrent->tags()->save(tag));
QVERIFY(!tag.exists);
QVERIFY(!tag[ID]->isValid());
@@ -999,7 +999,7 @@ void tst_Relations_Inserting_Updating::saveMany_OnBelongsToMany_Failed() const
ModelsCollection<Tag> tagsToSave {std::move(tag1), std::move(tag2)};
ModelsCollection<Tag> savedTags;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
savedTags = torrent->tags()->saveMany(tagsToSave));
QVERIFY(savedTags.isEmpty());
@@ -1112,7 +1112,7 @@ void tst_Relations_Inserting_Updating::create_OnBelongsToMany_Failed() const
QList<AttributeItem> tagAttributes {{NAME, "tag1"}};
Tag tag;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
tag = torrent->tags()->create(tagAttributes));
QVERIFY(!tag.exists);
QVERIFY(tag.getAttributes().isEmpty());
@@ -1138,7 +1138,7 @@ void tst_Relations_Inserting_Updating::create_OnBelongsToMany_WithRValue_Failed(
Tag tag;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
tag = torrent->tags()->create({{NAME, "tag1"}}));
QVERIFY(!tag.exists);
QVERIFY(tag.getAttributes().isEmpty());
@@ -1287,7 +1287,7 @@ void tst_Relations_Inserting_Updating::createMany_OnBelongsToMany_Failed() const
ModelsCollection<Tag> tags;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
tags = torrent->tags()->createMany(tagAttributes,
{{{"active", false}}}));
QVERIFY(tags.isEmpty());
@@ -1314,7 +1314,7 @@ tst_Relations_Inserting_Updating::createMany_OnBelongsToMany_WithRValue_Failed()
ModelsCollection<Tag> tags;
TVERIFY_THROWS_EXCEPTION(QueryError,
QVERIFY_THROWS_EXCEPTION(QueryError,
tags = torrent->tags()->createMany({{{NAME, "tag1"}},
{{NAME, "tag1"}}},
tests/auto/functional/orm/tiny/tinybuilder/tst_tinybuilder.cpp
+3 -3
View File
@@ -166,9 +166,9 @@ void tst_TinyBuilder::firstOrFail_NotFoundFailed() const
ConnectionOverride::connection = connection;
TVERIFY_THROWS_EXCEPTION(ModelNotFoundError,
QVERIFY_THROWS_EXCEPTION(ModelNotFoundError,
Torrent::whereEq(ID, 999999)->firstOrFail());
TVERIFY_THROWS_EXCEPTION(ModelNotFoundError,
QVERIFY_THROWS_EXCEPTION(ModelNotFoundError,
Torrent::whereEq(ID, 999999)->firstOrFail({ID, NAME}));
}
@@ -275,7 +275,7 @@ void tst_TinyBuilder::update_Failed() const
ConnectionOverride::connection = connection;
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
QueryError,
Torrent::whereEq(ID, 3)->update({{"progress-NON_EXISTENT", 333}}));
}
tests/auto/unit/orm/databaseconnection/tst_databaseconnection.cpp
+1 -1
View File
@@ -866,7 +866,7 @@ void tst_DatabaseConnection::scalar_MultipleColumnsSelectedError() const
{
QFETCH_GLOBAL(QString, connection); // NOLINT(modernize-type-traits)
TVERIFY_THROWS_EXCEPTION(MultipleColumnsSelectedError,
QVERIFY_THROWS_EXCEPTION(MultipleColumnsSelectedError,
DB::connection(connection).scalar(
"select id, name from torrents order by id"));
}
tests/auto/unit/orm/query/mysql_querybuilder/tst_mysql_querybuilder.cpp
+3 -3
View File
@@ -3012,16 +3012,16 @@ void tst_MySql_QueryBuilder::whereRowValues() const
void tst_MySql_QueryBuilder::whereRowValues_Empty() const
{
// Different size
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
InvalidArgumentError,
createQuery()->select("*").from("torrents")
.whereRowValues({NAME}, EQ, {"test3", 3}));
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
InvalidArgumentError,
createQuery()->select("*").from("torrents")
.whereRowValues({}, EQ, {"test3", 3}));
// Empty columns/values
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
InvalidArgumentError,
createQuery()->select("*").from("torrents")
.whereRowValues({}, EQ, {}));
tests/auto/unit/orm/schema/mysql_schemabuilder/tst_mysql_schemabuilder.cpp
+1 -1
View File
@@ -835,7 +835,7 @@ void tst_MySql_SchemaBuilder::renameColumn() const
void tst_MySql_SchemaBuilder::dropAllTypes() const
{
TVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
QVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
}
void tst_MySql_SchemaBuilder::getAllTables() const
tests/auto/unit/orm/schema/postgresql_schemabuilder/tst_postgresql_schemabuilder.cpp
+5 -5
View File
@@ -776,7 +776,7 @@ void tst_PostgreSQL_SchemaBuilder::renameColumn() const
void tst_PostgreSQL_SchemaBuilder::dropAllTypes() const
{
TVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
QVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
}
void tst_PostgreSQL_SchemaBuilder::getAllTables() const
@@ -904,7 +904,7 @@ void tst_PostgreSQL_SchemaBuilder::hasTable_DatabaseDiffers_ThrowException() con
// Verify
DB::connection(m_connection).pretend([](auto &connection)
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
InvalidArgumentError,
Schema::on(connection.getName())
.hasTable(sl("%1-database.public.users").arg(dummy_NONEXISTENT)));
@@ -1052,7 +1052,7 @@ void tst_PostgreSQL_SchemaBuilder::
.toUtf8().constData(), );
// Create database connection
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
DB::connection(*connectionName));
// Restore
@@ -2604,7 +2604,7 @@ void tst_PostgreSQL_SchemaBuilder::virtualAs_StoredAs_Nullable_ModifyTable() con
void tst_PostgreSQL_SchemaBuilder::change_VirtualAs_ThrowException() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
LogicError,
DB::connection(m_connection).pretend([](auto &connection)
{
@@ -2621,7 +2621,7 @@ void tst_PostgreSQL_SchemaBuilder::change_VirtualAs_ThrowException() const
void tst_PostgreSQL_SchemaBuilder::change_StoredAs_ThrowException() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
LogicError,
DB::connection(m_connection).pretend([](auto &connection)
{
tests/auto/unit/orm/schema/sqlite_schemabuilder/tst_sqlite_schemabuilder.cpp
+10 -10
View File
@@ -751,7 +751,7 @@ void tst_SQLite_SchemaBuilder::renameColumn() const
void tst_SQLite_SchemaBuilder::dropAllTypes() const
{
TVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
QVERIFY_THROWS_EXCEPTION(LogicError, Schema::on(m_connection).dropAllTypes());
}
void tst_SQLite_SchemaBuilder::getAllTables() const
@@ -1332,7 +1332,7 @@ void tst_SQLite_SchemaBuilder::indexes_Blueprint() const
void tst_SQLite_SchemaBuilder::indexes_Fluent_Fulltext_SpatialIndex_Exceptions() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
{
@@ -1341,7 +1341,7 @@ void tst_SQLite_SchemaBuilder::indexes_Fluent_Fulltext_SpatialIndex_Exceptions()
table.string("name_f").fulltext();
}));
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
{
@@ -1353,7 +1353,7 @@ void tst_SQLite_SchemaBuilder::indexes_Fluent_Fulltext_SpatialIndex_Exceptions()
void tst_SQLite_SchemaBuilder::indexes_Blueprint_Fulltext_SpatialIndex_Exceptions() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
{
@@ -1363,7 +1363,7 @@ void tst_SQLite_SchemaBuilder::indexes_Blueprint_Fulltext_SpatialIndex_Exception
table.fullText({"name_f"});
}));
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).create(Firewalls, [](Blueprint &table)
{
@@ -1376,7 +1376,7 @@ void tst_SQLite_SchemaBuilder::indexes_Blueprint_Fulltext_SpatialIndex_Exception
void tst_SQLite_SchemaBuilder::renameIndex() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
{
@@ -1562,7 +1562,7 @@ void tst_SQLite_SchemaBuilder::dropIndex_ByMultipleColumns() const
void tst_SQLite_SchemaBuilder::dropPrimary_Exception() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
{
@@ -1572,7 +1572,7 @@ void tst_SQLite_SchemaBuilder::dropPrimary_Exception() const
void tst_SQLite_SchemaBuilder::dropFullText_Exception() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
{
@@ -1583,7 +1583,7 @@ void tst_SQLite_SchemaBuilder::dropFullText_Exception() const
void tst_SQLite_SchemaBuilder::dropSpatialIndex_Exception() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
{
@@ -1706,7 +1706,7 @@ void tst_SQLite_SchemaBuilder::foreignKey_WithModel() const
void tst_SQLite_SchemaBuilder::dropForeign() const
{
TVERIFY_THROWS_EXCEPTION(
QVERIFY_THROWS_EXCEPTION(
RuntimeError,
Schema::on(m_connection).table(Firewalls, [](Blueprint &table)
{
tests/auto/unit/orm/tiny/mysql_tinybuilder/tst_mysql_tinybuilder.cpp
+1 -1
View File
@@ -931,7 +931,7 @@ void tst_MySql_TinyBuilder::has_UnsupportedHasNested_Failed() const
{
auto builder = createTinyQuery<Torrent>();
TVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
QVERIFY_THROWS_EXCEPTION(InvalidArgumentError,
builder->has("torrentFiles.fileProperty"));
}