diff --git a/docs/database/getting-started.mdx b/docs/database/getting-started.mdx index 844be6b8f..647e0adb1 100644 --- a/docs/database/getting-started.mdx +++ b/docs/database/getting-started.mdx @@ -847,16 +847,16 @@ If your application needs to use multiple connections, you may access each conne auto query = DB::connection("mysql_test").select(...); ``` -You may access the raw underlying `QSqlQuery` instance of a connection using the `getQtQuery` method on a connection instance: +You may access the raw underlying `QSqlQuery` instance of a connection using the `getSqlQuery` method on a connection instance: ```cpp -auto query = DB::connection().getQtQuery(); +auto query = DB::connection().getSqlQuery(); ``` -Or you can use the shortcut method `qtQuery` provided by the `DB` facade: +Or you can use the shortcut method `sqlQuery` provided by the `DB` facade: ```cpp -auto query = DB::qtQuery(); +auto query = DB::sqlQuery(); ``` ## Database Transactions diff --git a/include/orm/concerns/managestransactions.hpp b/include/orm/concerns/managestransactions.hpp index 69eb38966..774547f3d 100644 --- a/include/orm/concerns/managestransactions.hpp +++ b/include/orm/concerns/managestransactions.hpp @@ -93,7 +93,7 @@ namespace Concerns /*! Transform QtSql transaction error (QSqlError) to TinyORM SqlTransactionError exception (shortcut method). */ [[noreturn]] static void - throwSqlTransactionError(const QString &functionName, const QSqlQuery &qtQuery); + throwSqlTransactionError(const QString &functionName, const QSqlQuery &sqlQuery); #endif /*! Reset in transaction state and savepoints. */ diff --git a/include/orm/databaseconnection.hpp b/include/orm/databaseconnection.hpp index 6f3862ac5..64aa7f960 100644 --- a/include/orm/databaseconnection.hpp +++ b/include/orm/databaseconnection.hpp @@ -144,19 +144,19 @@ namespace Orm SqlQuery unprepared(const QString &queryString); /* Obtain connection instance */ - /*! Get underlying database connection (QSqlDatabase). */ - TSqlDatabase getQtConnection(); + /*! Get underlying database connection (Q/SqlDatabase). */ + TSqlDatabase getSqlConnection(); /*! Get underlying database connection without executing any reconnect logic. */ - TSqlDatabase getRawQtConnection() const; + TSqlDatabase getRawSqlConnection() const; /*! Get the connection resolver for an underlying database connection. */ inline const std::function & - getQtConnectionResolver() const noexcept; + getSqlConnectionResolver() const noexcept; /*! Set the connection resolver for an underlying database connection. */ - DatabaseConnection &setQtConnectionResolver( + DatabaseConnection &setSqlConnectionResolver( const std::function &resolver); - /*! Get a new QSqlQuery instance for the current connection. */ - TSqlQuery getQtQuery(); + /*! Get a new Q/SqlQuery instance for the current connection. */ + TSqlQuery getSqlQuery(); /*! Prepare the query bindings for execution. */ QList &prepareBindings(QList &bindings) const; @@ -320,8 +320,8 @@ namespace Orm private: /*! Prepare an SQL statement and return the query object. */ TSqlQuery prepareQuery(const QString &queryString); - /*! Get a new QSqlQuery instance for the pretend for the current connection. */ - inline TSqlQuery getQtQueryForPretend(); + /*! Get a new Q/SqlQuery instance for the pretend for the current connection. */ + inline TSqlQuery getSqlQueryForPretend(); /*! Prepare the QDateTime query binding for execution. */ QDateTime prepareBinding(const QDateTime &binding) const; @@ -418,14 +418,14 @@ namespace Orm /* Obtain connection instance */ const std::function & - DatabaseConnection::getQtConnectionResolver() const noexcept + DatabaseConnection::getSqlConnectionResolver() const noexcept { return m_qtConnectionResolver; } bool DatabaseConnection::isOpen() { - return m_qtConnection && getQtConnection().isOpen(); + return m_qtConnection && getSqlConnection().isOpen(); } void DatabaseConnection::connectEagerly() @@ -433,7 +433,7 @@ namespace Orm reconnectIfMissingConnection(); // This opens a physical database connection - std::ignore = getQtConnection(); + std::ignore = getSqlConnection(); } const QueryGrammar &DatabaseConnection::getQueryGrammar() const noexcept @@ -587,9 +587,9 @@ namespace Orm /* private */ - TSqlQuery DatabaseConnection::getQtQueryForPretend() + TSqlQuery DatabaseConnection::getSqlQueryForPretend() { - return getQtQuery(); + return getSqlQuery(); } template diff --git a/include/orm/databasemanager.hpp b/include/orm/databasemanager.hpp index ec1a0fd58..1b7933d50 100644 --- a/include/orm/databasemanager.hpp +++ b/include/orm/databasemanager.hpp @@ -67,8 +67,8 @@ namespace Query /*! Get a new query builder instance for the connection. */ std::shared_ptr query(const QString &connection = ""); - /*! Get a new QSqlQuery instance for the connection. */ - TSqlQuery qtQuery(const QString &connection = ""); + /*! Get a new Q/SqlQuery instance for the connection. */ + TSqlQuery sqlQuery(const QString &connection = ""); // TODO next add support for named bindings, Using Named Bindings silverqx /*! Run a select statement against the database. */ @@ -393,9 +393,9 @@ namespace Query std::shared_ptr configure(std::shared_ptr &&connection) const; - /*! Refresh an underlying QSqlDatabase connection resolver on a given + /*! Refresh an underlying Q/SqlDatabase connection resolver on a given TinyORM connection. */ - DatabaseConnection &refreshQtConnection(const QString &connection); + DatabaseConnection &refreshSqlConnection(const QString &connection); /*! Throw an exception if DatabaseManager instance already exists. */ static void checkInstance(); diff --git a/include/orm/db.hpp b/include/orm/db.hpp index 8cf09685a..4f3aa2205 100644 --- a/include/orm/db.hpp +++ b/include/orm/db.hpp @@ -62,8 +62,8 @@ namespace Orm /*! Get a new query builder instance for the connection. */ static std::shared_ptr query(const QString &connection = ""); - /*! Get a new QSqlQuery instance for the connection. */ - static TSqlQuery qtQuery(const QString &connection = ""); + /*! Get a new Q/SqlQuery instance for the connection. */ + static TSqlQuery sqlQuery(const QString &connection = ""); /*! Run a select statement against the database. */ static SqlQuery diff --git a/include/orm/tiny/model.hpp b/include/orm/tiny/model.hpp index 668afb15d..8877c1ad1 100644 --- a/include/orm/tiny/model.hpp +++ b/include/orm/tiny/model.hpp @@ -1802,7 +1802,7 @@ namespace Orm::Tiny /* This makes it much safer because a user must explicitly select this behavior using the all parameter. */ if (!all) - return {-1, getConnection().getQtQuery()}; + return {-1, getConnection().getSqlQuery()}; return invokeIncrementOrDecrement(*builder, column, amount, extra, method, all); diff --git a/src/orm/concerns/managestransactions.cpp b/src/orm/concerns/managestransactions.cpp index 34b22c02b..e28d572ff 100644 --- a/src/orm/concerns/managestransactions.cpp +++ b/src/orm/concerns/managestransactions.cpp @@ -78,7 +78,7 @@ bool ManagesTransactions::beginTransaction() runBeginTransaction(connection); #elif defined(TINYORM_USING_TINYDRIVERS) if (!connection.pretending()) - connection.getQtConnection().transaction(); + connection.getSqlConnection().transaction(); #endif } catch (const SqlTransactionError &e) { tryAgainIfCausedByLostConnectionStart(connection, std::current_exception(), @@ -119,7 +119,7 @@ bool ManagesTransactions::commit() runCommit(connection); #elif defined(TINYORM_USING_TINYDRIVERS) if (!connection.pretending()) - connection.getRawQtConnection().commit(); + connection.getRawSqlConnection().commit(); #endif } catch (const SqlTransactionError &e) { tryAgainIfCausedByLostConnectionCommon(std::current_exception(), @@ -160,7 +160,7 @@ bool ManagesTransactions::rollBack() runRollBack(connection); #elif defined(TINYORM_USING_TINYDRIVERS) if (!connection.pretending()) - connection.getRawQtConnection().rollback(); + connection.getRawSqlConnection().rollback(); #endif } catch (const SqlTransactionError &e) { tryAgainIfCausedByLostConnectionCommon(std::current_exception(), @@ -205,7 +205,7 @@ bool ManagesTransactions::savepoint(const QString &id) runCommonSavepointQuery(connection, queryString, *SavepointFunction); #elif defined(TINYORM_USING_TINYDRIVERS) if (!connection.pretending()) - connection.getQtQuery().exec(queryString); + connection.getSqlQuery().exec(queryString); #endif } catch (const SqlTransactionError &e) { tryAgainIfCausedByLostConnectionCommon(std::current_exception(), @@ -251,7 +251,7 @@ bool ManagesTransactions::rollbackToSavepoint(const QString &id) runCommonSavepointQuery(connection, queryString, *RollbackToSavepointFunction); #elif defined(TINYORM_USING_TINYDRIVERS) if (!connection.pretending()) - connection.getQtQuery().exec(queryString); + connection.getSqlQuery().exec(queryString); #endif } catch (const SqlTransactionError &e) { tryAgainIfCausedByLostConnectionCommon(std::current_exception(), @@ -287,7 +287,7 @@ ManagesTransactions::setSavepointNamespace(const QString &savepointNamespace) #ifdef TINYORM_USING_QTSQLDRIVERS void ManagesTransactions::runBeginTransaction(DatabaseConnection &connection) { - auto qtConnection = connection.getQtConnection(); + auto qtConnection = connection.getSqlConnection(); // Nothing to do if (connection.pretending() || qtConnection.transaction()) @@ -299,7 +299,7 @@ void ManagesTransactions::runBeginTransaction(DatabaseConnection &connection) void ManagesTransactions::runCommit(DatabaseConnection &connection) { - auto qtConnection = connection.getRawQtConnection(); + auto qtConnection = connection.getRawSqlConnection(); // Nothing to do if (connection.pretending() || qtConnection.commit()) @@ -310,7 +310,7 @@ void ManagesTransactions::runCommit(DatabaseConnection &connection) void ManagesTransactions::runRollBack(DatabaseConnection &connection) { - auto qtConnection = connection.getRawQtConnection(); + auto qtConnection = connection.getRawSqlConnection(); // Nothing to do if (connection.pretending() || qtConnection.rollback()) @@ -323,13 +323,13 @@ void ManagesTransactions::runCommonSavepointQuery( DatabaseConnection &connection, const QString &queryString, const QString &functionName) { - auto qtQuery = connection.getQtQuery(); + auto sqlQuery = connection.getSqlQuery(); // Nothing to do - if (connection.pretending() || qtQuery.exec(queryString)) + if (connection.pretending() || sqlQuery.exec(queryString)) return; - throwSqlTransactionError(functionName, qtQuery); + throwSqlTransactionError(functionName, sqlQuery); } void ManagesTransactions::throwSqlTransactionError( @@ -342,13 +342,13 @@ void ManagesTransactions::throwSqlTransactionError( } void ManagesTransactions::throwSqlTransactionError(const QString &functionName, - const QSqlQuery &qtQuery) + const QSqlQuery &sqlQuery) { - auto executedQuery = qtQuery.executedQuery(); + auto executedQuery = sqlQuery.executedQuery(); if (executedQuery.isEmpty()) - executedQuery = qtQuery.lastQuery(); + executedQuery = sqlQuery.lastQuery(); - throwSqlTransactionError(functionName, executedQuery, qtQuery.lastError()); + throwSqlTransactionError(functionName, executedQuery, sqlQuery.lastError()); } #endif @@ -379,7 +379,7 @@ void ManagesTransactions::tryAgainIfCausedByLostConnectionStart( connection.reconnect(); - connection.getQtConnection().transaction(); + connection.getSqlConnection().transaction(); } void ManagesTransactions::tryAgainIfCausedByLostConnectionCommon( diff --git a/src/orm/databaseconnection.cpp b/src/orm/databaseconnection.cpp index 5debfa8f0..16a500d95 100644 --- a/src/orm/databaseconnection.cpp +++ b/src/orm/databaseconnection.cpp @@ -102,7 +102,7 @@ DatabaseConnection::select(const QString &queryString, QList bindings) -> TSqlQuery { if (m_pretending) - return getQtQueryForPretend(); + return getSqlQueryForPretend(); // Prepare QSqlQuery auto query = prepareQuery(queryString_); @@ -171,7 +171,7 @@ DatabaseConnection::statement(const QString &queryString, QList bindin -> TSqlQuery { if (m_pretending) - return getQtQueryForPretend(); + return getSqlQueryForPretend(); // Prepare QSqlQuery auto query = prepareQuery(queryString_); @@ -220,7 +220,7 @@ DatabaseConnection::affectingStatement(const QString &queryString, -> std::tuple { if (m_pretending) - return {-1, getQtQueryForPretend()}; + return {-1, getSqlQueryForPretend()}; // Prepare QSqlQuery auto query = prepareQuery(queryString_); @@ -264,10 +264,10 @@ SqlQuery DatabaseConnection::unprepared(const QString &queryString) -> TSqlQuery { if (m_pretending) - return getQtQueryForPretend(); + return getSqlQueryForPretend(); // Prepare unprepared QSqlQuery 🙂 - auto query = getQtQuery(); + auto query = getSqlQuery(); if (query.exec(queryString_)) { // Query statements counter @@ -298,7 +298,7 @@ SqlQuery DatabaseConnection::unprepared(const QString &queryString) /* Obtain connection instance */ -TSqlDatabase DatabaseConnection::getQtConnection() +TSqlDatabase DatabaseConnection::getSqlConnection() { if (!m_qtConnection) { // This should never happen 🤔 @@ -319,7 +319,7 @@ TSqlDatabase DatabaseConnection::getQtConnection() return TSqlDatabase::database(*m_qtConnection, true); } -TSqlDatabase DatabaseConnection::getRawQtConnection() const +TSqlDatabase DatabaseConnection::getRawSqlConnection() const { if (!m_qtConnection) throw Exceptions::RuntimeError( @@ -330,7 +330,7 @@ TSqlDatabase DatabaseConnection::getRawQtConnection() const } DatabaseConnection & -DatabaseConnection::setQtConnectionResolver( +DatabaseConnection::setSqlConnectionResolver( const std::function &resolver) { /* Reset transaction and savepoints as the underlying connection will be @@ -354,9 +354,9 @@ DatabaseConnection::setQtConnectionResolver( return *this; } -TSqlQuery DatabaseConnection::getQtQuery() +TSqlQuery DatabaseConnection::getSqlQuery() { - return TSqlQuery(getQtConnection()); + return TSqlQuery(getSqlConnection()); } QList & @@ -432,13 +432,13 @@ bool DatabaseConnection::pingDatabase() const TSqlDriver *DatabaseConnection::driver() { - return getQtConnection().driver(); + return getSqlConnection().driver(); } #ifdef TINYORM_USING_TINYDRIVERS std::weak_ptr DatabaseConnection::driverWeak() { - return getQtConnection().driverWeak(); + return getSqlConnection().driverWeak(); } #endif @@ -483,7 +483,7 @@ void DatabaseConnection::disconnect() from QSqlDatabase connection repository, so it can be reused, it's better for performance. Revisited, it's ok and will not cause any leaks or dangling connection. */ - getRawQtConnection().close(); + getRawSqlConnection().close(); m_qtConnection.reset(); m_qtConnectionResolver = nullptr; @@ -532,7 +532,7 @@ bool DatabaseConnection::hasConfig(const QString &option) const QString DatabaseConnection::driverName() { - return getQtConnection().driverName(); + return getSqlConnection().driverName(); } /*! Printable driver name hash type. */ @@ -639,7 +639,7 @@ void DatabaseConnection::useDefaultPostProcessor() TSqlQuery DatabaseConnection::prepareQuery(const QString &queryString) { // Prepare query string - auto query = getQtQuery(); + auto query = getSqlQuery(); // TODO solve setForwardOnly() in DatabaseConnection class, again this problem 🤔 silverqx // query.setForwardOnly(m_forwardOnly); diff --git a/src/orm/databasemanager.cpp b/src/orm/databasemanager.cpp index c7983e2bf..1ba449c1b 100644 --- a/src/orm/databasemanager.cpp +++ b/src/orm/databasemanager.cpp @@ -117,9 +117,9 @@ DatabaseManager::query(const QString &connection) return this->connection(connection).query(); } -TSqlQuery DatabaseManager::qtQuery(const QString &connection) +TSqlQuery DatabaseManager::sqlQuery(const QString &connection) { - return this->connection(connection).getQtQuery(); + return this->connection(connection).getSqlQuery(); } SqlQuery @@ -392,7 +392,7 @@ DatabaseConnection &DatabaseManager::reconnect(const QString &name) if (!m_connections->contains(name_)) return connection(name_); - return refreshQtConnection(name_); + return refreshSqlConnection(name_); } void DatabaseManager::disconnect(const QString &name) const @@ -958,7 +958,7 @@ DatabaseManager::configure(std::shared_ptr &&connection) con } DatabaseConnection & -DatabaseManager::refreshQtConnection(const QString &connection) +DatabaseManager::refreshSqlConnection(const QString &connection) { const auto &connectionName = parseConnectionName(connection); @@ -967,8 +967,8 @@ DatabaseManager::refreshQtConnection(const QString &connection) will be again resolved/connected lazily. */ auto fresh = configure(makeConnection(connectionName)); - return (*m_connections)[connectionName]->setQtConnectionResolver( - fresh->getQtConnectionResolver()); + return (*m_connections)[connectionName]->setSqlConnectionResolver( + fresh->getSqlConnectionResolver()); } void DatabaseManager::checkInstance() diff --git a/src/orm/db.cpp b/src/orm/db.cpp index 45c16950c..5b7a67e91 100644 --- a/src/orm/db.cpp +++ b/src/orm/db.cpp @@ -51,9 +51,9 @@ DB::query(const QString &connection) return manager().connection(connection).query(); } -TSqlQuery DB::qtQuery(const QString &connection) +TSqlQuery DB::sqlQuery(const QString &connection) { - return manager().connection(connection).getQtQuery(); + return manager().connection(connection).getSqlQuery(); } SqlQuery diff --git a/src/orm/mysqlconnection.cpp b/src/orm/mysqlconnection.cpp index e254a9927..999d284ba 100644 --- a/src/orm/mysqlconnection.cpp +++ b/src/orm/mysqlconnection.cpp @@ -172,7 +172,7 @@ void MySqlConnection::setConfigVersion(const QString &value) bool MySqlConnection::pingDatabase() { #ifdef TINYORM_MYSQL_PING - auto qtConnection = getQtConnection(); + auto qtConnection = getSqlConnection(); const auto getDriverHandle = [&qtConnection = std::as_const(qtConnection)]() -> QVariant 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 fbf50ebf4..2202f7736 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 @@ -3036,7 +3036,7 @@ tst_MySql_QDateTime::createQuery(const QString &connection) TSqlQuery tst_MySql_QDateTime::createQtQuery(const QString &connection) { - return DB::qtQuery(connection); + return DB::sqlQuery(connection); } /* QDateTime with/without timezone */ 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 7cdf112b2..0ed9ec0f1 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 @@ -2864,7 +2864,7 @@ tst_PostgreSQL_QDateTime::createQuery() const TSqlQuery tst_PostgreSQL_QDateTime::createQtQuery() const { - return DB::qtQuery(m_connection); + return DB::sqlQuery(m_connection); } /* QDateTime with/without timezone */ 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 ed79965df..341d4f141 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 @@ -1805,7 +1805,7 @@ tst_SQLite_QDateTime::createQuery() const TSqlQuery tst_SQLite_QDateTime::createQtQuery() const { - return DB::qtQuery(m_connection); + return DB::sqlQuery(m_connection); } /* QDateTime with/without timezone */