fixed container utils alias

silverqx · Nov 12, 2022 · c593226 · c593226
1 parent fdb1c4c
commit c593226
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/include/orm/basegrammar.hpp b/include/orm/basegrammar.hpp
@@ -31,6 +31,8 @@ namespace Query
         Q_DISABLE_COPY(BaseGrammar)
 
     protected:
+        /*! Alias for the container utils. */
+        using ContainerUtils = Orm::Utils::Container;
         /*! Alias for the Expression. */
         using Expression = Query::Expression;
 
@@ -131,7 +133,7 @@ namespace Query
     template<ColumnContainer T>
     QString BaseGrammar::columnizeWithoutWrap(T &&columns) const
     {
-        return Utils::Container::join(std::forward<T>(columns));
+        return ContainerUtils::join(std::forward<T>(columns));
     }
 
     QString BaseGrammar::getTablePrefix() const

diff --git a/src/orm/schema/blueprint.cpp b/src/orm/schema/blueprint.cpp
@@ -9,6 +9,8 @@
 
 TINYORM_BEGIN_COMMON_NAMESPACE
 
+using ContainerUtils = Orm::Utils::Container;
+
 namespace Orm::SchemaNs
 {
 
@@ -741,7 +743,7 @@ Blueprint::createIndexName(const QString &type, const QVector<QString> &columns)
 {
     auto index = QStringLiteral("%1_%2_%3")
                  .arg(NOSPACE.arg(m_prefix, m_table),
-                      Utils::Container::join(columns, UNDERSCORE),
+                      ContainerUtils::join(columns, UNDERSCORE),
                       type)
                  .toLower();
 

diff --git a/src/orm/schema/grammars/postgresschemagrammar.cpp b/src/orm/schema/grammars/postgresschemagrammar.cpp
@@ -8,8 +8,6 @@
 
 TINYORM_BEGIN_COMMON_NAMESPACE
 
-using ContainerUtils = Orm::Utils::Container;
-
 namespace Orm::SchemaNs::Grammars
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,8 +8,6 @@ @@
     TINYORM_BEGIN_COMMON_NAMESPACE
-    using ContainerUtils = Orm::Utils::Container;
     namespace Orm::SchemaNs::Grammars
     {
@@ Expand Down @@