From 8e75deb53aa0ac599062c675c7355aaa6d5b9868 Mon Sep 17 00:00:00 2001 From: silverqx Date: Sun, 6 Mar 2022 12:43:08 +0100 Subject: [PATCH] added on() alias for connection() It allows shorter syntax like DB::on(connection). --- include/orm/databasemanager.hpp | 8 ++++++++ include/orm/db.hpp | 3 +++ src/orm/db.cpp | 5 +++++ 3 files changed, 16 insertions(+) diff --git a/include/orm/databasemanager.hpp b/include/orm/databasemanager.hpp index 99c0b4cc0..53a381744 100644 --- a/include/orm/databasemanager.hpp +++ b/include/orm/databasemanager.hpp @@ -122,6 +122,9 @@ namespace Query /*! Get a database connection instance. */ DatabaseConnection &connection(const QString &name = "") final; + /*! Begin a fluent query against the database on a given connection (alias for + the connection() method). */ + inline DatabaseConnection &on(const QString &name); /*! Register a connection with the manager. */ DatabaseManager & addConnection(const QVariantHash &config, @@ -346,6 +349,11 @@ namespace Query return Query::Expression(value); } + DatabaseConnection &DatabaseManager::on(const QString &name) + { + return connection(name); + } + } // namespace Orm TINYORM_END_COMMON_NAMESPACE diff --git a/include/orm/db.hpp b/include/orm/db.hpp index 56769663a..bb7900aca 100644 --- a/include/orm/db.hpp +++ b/include/orm/db.hpp @@ -46,6 +46,9 @@ namespace Orm /*! Get a database connection instance. */ static DatabaseConnection &connection(const QString &name = ""); + /*! Begin a fluent query against the database on a given connection (alias for + the connection() method). */ + static DatabaseConnection &on(const QString &name); /*! Register a connection with the manager. */ static DatabaseManager & addConnection(const QVariantHash &config, diff --git a/src/orm/db.cpp b/src/orm/db.cpp index 2af1ef64d..a620ae952 100644 --- a/src/orm/db.cpp +++ b/src/orm/db.cpp @@ -34,6 +34,11 @@ DatabaseConnection &DB::connection(const QString &name) return manager().connection(name); } +DatabaseConnection &DB::on(const QString &name) +{ + return manager().connection(name); +} + DatabaseManager & DB::addConnection(const QVariantHash &config, const QString &name) {