include/matador/query/table_column.hpp

@@ -25,7 +25,7 @@ public:
   table_column(const class table* tab, const std::string& name, utils::basic_type type, const utils::field_attributes& attributes);
   table_column(const class table*,
                const std::string& name,
-               std::string  alias,
+               const std::string& alias,
                utils::basic_type type,
                const utils::field_attributes& attributes,
                sql::sql_function_t func = sql::sql_function_t::None);
@@ -38,46 +38,10 @@ public:
 
   [[nodiscard]] table_column as(const std::string& alias) const;
 
-  /**
-   * Returns the canonical column name.
-   *
-   * @return The canonical column name
-   */
   [[nodiscard]] const std::string& name() const;
-
-  /**
-   * Returns the column name without prepending
-   * a table name or alias.
-   *
-   * @return Returns the column name
-   */
   [[nodiscard]] const std::string& column_name() const;
-
-  /**
-   * Returns the canonical column name which means
-   * if the column is owned by a table, the table name
-   * id prepended.
-   *
-   * @return Returns the canonical column name
-   */
   [[nodiscard]] const std::string& canonical_name() const;
-
-  /**
-   * Returns the alias name for the column. If no alias
-   * is set, an empty string is returned.
-   *
-   * @return Returns the alias name for the column
-   */
   [[nodiscard]] const std::string& alias() const;
-
-  /**
-   * Returns the result label name for this column in a SELECT list.
-   * Semantics: alias if set, otherwise the raw column name (never table-qualified).
-   *
-   * @return If set the alias otherwise the raw column name
-   */
-  [[nodiscard]] const std::string& result_name() const;
-
   [[nodiscard]] utils::basic_type type() const;
   [[nodiscard]] utils::field_attributes attributes() const;
 
@@ -93,14 +57,14 @@ public:
   operator const std::string&() const; // NOLINT(*-explicit-constructor)
 
 private:
-  static std::string build_canonical_name(const class table *tab, const std::string& name);
+  static std::string build_column_name(const class table *tab, const std::string& name);
 
 private:
   friend class table;
 
   const class table* table_{nullptr};
+  std::string name_;
   std::string column_name_;
-  std::string canonical_name_;
   std::string alias_;
   utils::basic_type type_{utils::basic_type::Unknown};
   utils::field_attributes attributes_{};

include/matador/sql/query_context.hpp

@@ -8,22 +8,22 @@
 
 namespace matador::sql {
 enum class sql_command {
-  Unknown,
+  SQL_UNKNOWN,
-  Create,
+  SQL_CREATE,
-  CreateTable,
+  SQL_CREATE_TABLE,
-  CreateSchema,
+  SQL_CREATE_SCHEMA,
-  CreateDatabase,
+  SQL_CREATE_DATABASE,
-  Update,
+  SQL_UPDATE,
-  Insert,
+  SQL_INSERT,
-  Delete,
+  SQL_DELETE,
-  Select,
+  SQL_SELECT,
-  Drop,
+  SQL_DROP,
-  DropTable,
+  SQL_DROP_TABLE,
-  DropSchema,
+  SQL_DROP_SCHEMA,
-  DropDatabase,
+  SQL_DROP_DATABASE,
-  Alter,
+  SQL_ALTER,
-  AlterTable,
+  SQL_ALTER_TABLE,
-  AlterSchema
+  SQL_ALTER_SCHEMA
 };
 
 struct sql_command_info {

source/orm/query/query_builder.cpp

@@ -38,12 +38,19 @@ sql::query_context query_builder::compile(const query_data &data,
 
 std::string handle_column(sql::query_context &ctx, const sql::dialect *d, const query_data &data, const table_column &col) {
   if (col.is_function()) {
-    ctx.prototype.emplace_back(col.has_alias() ? col.alias() : col.canonical_name());
+    ctx.prototype.emplace_back(col.name());
     ctx.prototype.back().change_type(utils::basic_type::Int32);
   } else {
-    ctx.prototype.emplace_back(col.has_alias() ? col.alias() : col.canonical_name());
+    ctx.prototype.emplace_back(col.name());
   }
 
+
+  // if (col.table() != nullptr) {
+    // if (const auto it = data.tables.find(col.table()->name()); it != data.tables.end()) {
+      // return prepare_identifier(*d,col);
+    // }
+  // }
+
   return prepare_identifier(*d, col);
 }
 
@@ -52,7 +59,7 @@ void query_builder::visit(internal::query_alter_part& part) {
 }
 
 void query_builder::visit(internal::query_alter_table_part& part) {
-  query_.command = sql::sql_command::AlterTable;
+  query_.command = sql::sql_command::SQL_ALTER_TABLE;
   query_.sql += " " + dialect_->token_at(part.token()) + " " +
   dialect_->prepare_identifier_string(part.table().name());
 }
@@ -95,7 +102,7 @@ void query_builder::visit(internal::query_drop_key_constraint_part_by_constraint
 }
 
 void query_builder::visit(internal::query_select_part &part) {
-  query_.command = sql::sql_command::Select;
+  query_.command = sql::sql_command::SQL_SELECT;
   query_.sql = dialect_->select() + " ";
 
   query_.prototype.clear();
@@ -205,7 +212,7 @@ void query_builder::visit(internal::query_limit_part &part) {
 }
 
 void query_builder::visit(internal::query_insert_part &/*insert_part*/) {
-  query_.command = sql::sql_command::Insert;
+  query_.command = sql::sql_command::SQL_INSERT;
   query_.sql = dialect_->insert();
 }
 
@@ -267,14 +274,14 @@ void query_builder::visit(internal::query_values_part &part) {
 
 void query_builder::visit(internal::query_update_part &part)
 {
-  query_.command = sql::sql_command::Update;
+  query_.command = sql::sql_command::SQL_UPDATE;
   query_.table_name = part.table().name();
   query_.sql += query_builder::build_table_name(part.token(), *dialect_, query_.table_name);
 }
 
 void query_builder::visit(internal::query_delete_part &/*delete_part*/)
 {
-  query_.command = sql::sql_command::Delete;
+  query_.command = sql::sql_command::SQL_DELETE;
   query_.sql = dialect_->remove();
 }
 
@@ -286,7 +293,7 @@ void query_builder::visit(internal::query_delete_from_part &part)
 
 void query_builder::visit(internal::query_create_part &/*create_part*/)
 {
-  query_.command = sql::sql_command::CreateTable;
+  query_.command = sql::sql_command::SQL_CREATE_TABLE;
   query_.sql = dialect_->create();
 }
 
@@ -322,12 +329,12 @@ void query_builder::visit(internal::query_create_table_constraints_part& part) {
 }
 
 void query_builder::visit( internal::query_create_schema_part& part ) {
-  query_.command = sql::sql_command::CreateSchema;
+  query_.command = sql::sql_command::SQL_CREATE_SCHEMA;
   query_.sql += " " + dialect_->schema() + " " + dialect_->prepare_identifier_string(part.schema());
 }
 
 void query_builder::visit(internal::query_drop_part &part) {
-  query_.command = sql::sql_command::DropTable;
+  query_.command = sql::sql_command::SQL_DROP_TABLE;
   query_.sql = dialect_->token_at(part.token());
 }
 

source/orm/query/table.cpp

@@ -82,7 +82,7 @@ table::operator const std::vector<query::table_column>&() const {
 
 const table_column* table::operator[](const std::string &column_name) const {
   for (const auto &col : columns_) {
-    if (col.column_name() == column_name) {
+    if (col.name() == column_name) {
       return &col;
     }
   }

source/orm/query/table_column.cpp

@@ -26,18 +26,18 @@ table_column::table_column(const char *name)
 {}
 
 table_column::table_column(const std::string& name)
-: table_column(name, "") {}
+: table_column(name, name) {}
 
 table_column::table_column(const std::string& name, const std::string& alias)
 : table_column(nullptr, name, alias, utils::basic_type::Unknown, {}, sql::sql_function_t::None)
 {}
 
 table_column::table_column(const sql::sql_function_t func, const std::string& name)
-: table_column(nullptr, name, "", utils::basic_type::Unknown, {}, func)
+: table_column(nullptr, name, name, utils::basic_type::Unknown, {}, func)
 {}
 
 table_column::table_column(const class table* tab, const std::string& name)
-: table_column(tab, name, "", utils::basic_type::Unknown, {}, sql::sql_function_t::None)
+: table_column(tab, name, name, utils::basic_type::Unknown, {}, sql::sql_function_t::None)
 {}
 
 table_column::table_column(const class table* tab, const std::string& name, const std::string& alias)
@@ -45,19 +45,19 @@ table_column::table_column(const class table* tab, const std::string& name, cons
 {}
 
 table_column::table_column(const class table* tab, const std::string& name, const utils::basic_type type, const utils::field_attributes& attributes)
-: table_column(tab, name, "", type, attributes, sql::sql_function_t::None)
+: table_column(tab, name, name, type, attributes, sql::sql_function_t::None)
 {}
 
 table_column::table_column(const class table* tab,
                            const std::string& name,
-                           std::string alias,
+                           const std::string& alias,
                            const utils::basic_type type,
                            const utils::field_attributes &attributes,
                            const sql::sql_function_t func)
 : table_(tab)
+, name_(build_column_name(table_, name))
 , column_name_(name)
-, canonical_name_(build_canonical_name(table_, name))
+, alias_(alias)
-, alias_(std::move(alias))
 , type_(type)
 , attributes_(attributes)
 , function_(func) {}
@@ -67,8 +67,8 @@ table_column & table_column::operator=(const table_column &other) {
     return *this;
   }
   table_ = other.table_;
+  name_ = other.name_;
   column_name_ = other.column_name_;
-  canonical_name_ = other.canonical_name_;
   alias_ = other.alias_;
   type_ = other.type_;
   attributes_ = other.attributes_;
@@ -79,13 +79,14 @@ table_column & table_column::operator=(const table_column &other) {
 bool table_column::equals(const table_column &x) const {
   if (table_ != nullptr && x.table_ != nullptr) {
     return *table_ == *x.table_ &&
+           name_ == x.name_ &&
            column_name_ == x.column_name_ &&
-           canonical_name_ == x.canonical_name_ &&
            alias_ == x.alias_ &&
            function_ == x.function_;
   }
 
-  return alias_ == x.alias_ &&
+  return name_ == x.name_ &&
+       alias_ == x.alias_ &&
        function_ == x.function_;
 }
 
@@ -94,7 +95,7 @@ table_column table_column::as(const std::string& alias) const {
 }
 
 const std::string& table_column::name() const {
-  return canonical_name_;
+  return has_alias() ? alias_ : name_;
 }
 
 const std::string& table_column::column_name() const {
@@ -102,15 +103,13 @@ const std::string& table_column::column_name() const {
 }
 
 const std::string& table_column::canonical_name() const {
-  return canonical_name_;
+  return name_;
 }
 
 const std::string& table_column::alias() const {
   return alias_;
 }
-const std::string& table_column::result_name() const {
+
-  return alias_.empty() ? column_name_ : alias_;
-}
 utils::basic_type table_column::type() const {
   return type_;
 }
@@ -132,7 +131,7 @@ sql::sql_function_t table_column::function() const {
 }
 
 bool table_column::has_alias() const {
-  return !alias_.empty();
+  return alias_ != column_name_;
 }
 
 const class table* table_column::table() const {
@@ -141,14 +140,14 @@ const class table* table_column::table() const {
 
 void table_column::table(const query::table* tab) {
   table_ = tab;
-  canonical_name_ = build_canonical_name(table_, column_name_);
+  name_ = build_column_name(table_, column_name_);
 }
 
 table_column::operator const std::string&() const {
   return name();
 }
 
-std::string table_column::build_canonical_name(const class query::table* tab, const std::string& name) {
+std::string table_column::build_column_name(const class query::table* tab, const std::string& name) {
   return tab ? tab->name() + "." + name : name;
 }
 }  // namespace matador::query

source/orm/sql/connection.cpp

@@ -238,7 +238,7 @@ std::shared_ptr<class producer_resolver_factory> connection::resolver_factory()
 }
 
 utils::result<std::unique_ptr<statement_impl>, utils::error> connection::perform_prepare(const query_context& ctx) const {
-  if (ctx.command != sql_command::CreateTable && (ctx.prototype.empty() || has_unknown_columns(ctx.prototype))) {
+  if (ctx.command != sql_command::SQL_CREATE_TABLE && (ctx.prototype.empty() || has_unknown_columns(ctx.prototype))) {
     if (const auto result = describe(ctx.table_name); result.is_ok()) {
       for (auto &col: ctx.prototype) {
         const auto rit = std::find_if(

test/backends/QueryRecordTest.cpp

@@ -519,8 +519,6 @@ TEST_CASE_METHOD(QueryFixture, "Execute select statement with group by and order
   for (const auto &r: *result) {
     const auto age_count_val = r.at<int>(0);
     const auto age_val = r.at<int>(1);
-    const auto ec = expected_values.front().first;
-    const auto ea = expected_values.front().second;
     REQUIRE(age_count_val == expected_values.front().first);
     REQUIRE(age_val == expected_values.front().second);
     expected_values.pop_front();

test/backends/QueryTest.cpp

@@ -575,14 +575,14 @@ TEST_CASE_METHOD(QueryFixture, "Test load entity with eager has many relation",
 
   REQUIRE(shipment_result.is_ok());
 
-  // size_t index{0};
+  size_t index{0};
-  // std::vector<size_t> packages_sizes{2, 3};
+  std::vector<size_t> packages_sizes{2, 3};
-  // std::cout << "\n";
+  std::cout << "\n";
-  // for (const auto &s : *shipment_result) {
+  for (const auto &s : *shipment_result) {
-  //   REQUIRE(s->id == shipments.at(index)->id);
+    REQUIRE(s->id == shipments.at(index)->id);
-  //   REQUIRE(s->tracking_number == shipments.at(index)->tracking_number);
+    REQUIRE(s->tracking_number == shipments.at(index)->tracking_number);
-  //   REQUIRE(s->packages.size() == packages_sizes.at(index++));
+    REQUIRE(s->packages.size() == packages_sizes.at(index++));
-  // }
+  }
 }
 
 TEST_CASE_METHOD(QueryFixture, "Test load entity with lazy belongs to relation", "[query][belongs_to][lazy]") {

test/orm/CMakeLists.txt

@@ -14,15 +14,12 @@ add_executable(OrmTests
   backend/test_statement.cpp
   backend/test_statement.hpp
   orm/SessionQueryBuilderTest.cpp
-  query/ColumnGeneratorTest.cpp
   query/CriteriaTests.cpp
-  query/GeneratorTests.cpp
   query/QueryBuilderTest.cpp
   query/QueryFixture.cpp
   query/QueryFixture.hpp
   query/QueryTest.cpp
-  query/SchemaTest.cpp
+  query/ColumnGeneratorTest.cpp
-  query/TableColumnTest.cpp
   sql/ColumnTest.cpp
   sql/ConnectionPoolFixture.hpp
   sql/ConnectionPoolTest.cpp
@@ -30,6 +27,8 @@ add_executable(OrmTests
   sql/StatementCacheTest.cpp
   utils/auto_reset_event.cpp
   utils/auto_reset_event.hpp
+  query/GeneratorTests.cpp
+  query/SchemaTest.cpp
 )
 
 target_link_libraries(OrmTests matador-orm matador-core Catch2::Catch2WithMain)

test/orm/orm/SessionQueryBuilderTest.cpp

@@ -48,7 +48,7 @@ TEST_CASE("Create sql query data for entity with eager has one", "[query][entity
 
   const auto it = scm.find(typeid(flight));
   REQUIRE(it != scm.end());
-  const auto* col = it->second.table()["id"];
+  const auto* col = it->second.table()[FLIGHT.id];
   REQUIRE(col);
   auto data = eqb.build<flight>(*col == _);
 
@@ -102,7 +102,7 @@ TEST_CASE("Create sql query data for entity with eager belongs to", "[query][ent
 
   const auto it = scm.find(typeid(book));
   REQUIRE(it != scm.end());
-  const auto* col = it->second.table()["id"];
+  const auto* col = it->second.table()[BOOK.id];
   REQUIRE(col);
   auto data = eqb.build<book>(*col == _);
 
@@ -174,7 +174,7 @@ TEST_CASE("Create sql query data for entity with eager has many belongs to", "[q
 
   const auto it = scm.find(typeid(order));
   REQUIRE(it != scm.end());
-  const auto* col = it->second.table()["order_id"];
+  const auto* col = it->second.table()[ORDER.order_id];
   REQUIRE(col);
   auto data = eqb.build<order>(*col == _);
 
@@ -238,7 +238,7 @@ TEST_CASE("Create sql query data for entity with eager many to many", "[query][e
 
   const auto it = scm.find(typeid(ingredient));
   REQUIRE(it != scm.end());
-  const auto* col = it->second.table()["id"];
+  const auto* col = it->second.table()[INGREDIENT.id];
   REQUIRE(col);
   auto data = eqb.build<ingredient>(*col == _);
 
@@ -292,7 +292,7 @@ TEST_CASE("Create sql query data for entity with eager many to many (inverse par
 
   const auto it = scm.find(typeid(course));
   REQUIRE(it != scm.end());
-  const auto* col = it->second.table()["id"];
+  const auto* col = it->second.table()[COURSE.id];
   REQUIRE(col);
   auto data = eqb.build<course>(*col == _);
 

test/orm/query/TableColumnTest.cpp

@@ -1,75 +0,0 @@
-#include <catch2/catch_test_macros.hpp>
-
-#include "matador/query/table_column.hpp"
-
-#include <stdexcept>
-#include <string>
-
-using matador::query::table_column;
-using matador::query::operator""_col;
-
-TEST_CASE("table_column: basic construction without table or alias", "[table_column]") {
-  const table_column c{"id"};
-
-  CHECK(c.column_name() == "id");
-  CHECK(c.canonical_name() == "id");
-
-  // `name()` should be safe in expression contexts (no alias leakage)
-  CHECK(c.name() == "id");
-
-  CHECK(c.alias().empty());
-  CHECK_FALSE(c.has_alias());
-
-  // result label defaults to raw column name when no alias is set
-  CHECK(c.result_name() == "id");
-
-  CHECK_FALSE(c.is_function());
-  CHECK(c.function() == matador::sql::sql_function_t::None);
-
-  // default attributes should mean "nullable" (unless NotNull is set)
-  CHECK(c.is_nullable());
-}
-
-TEST_CASE("table_column: alias keeps expression name canonical but changes result label", "[table_column]") {
-  const table_column base{"id"};
-  const table_column aliased = base.as("user_id");
-
-  // original unchanged
-  CHECK(base.alias().empty());
-  CHECK(base.result_name() == "id");
-  CHECK(base.name() == "id");
-
-  // aliased column
-  CHECK(aliased.alias() == "user_id");
-  CHECK(aliased.has_alias());
-  CHECK(aliased.result_name() == "user_id");
-
-  // expression reference remains canonical (table-less here)
-  CHECK(aliased.canonical_name() == "id");
-  CHECK(aliased.name() == "id");
-}
-
-TEST_CASE("table_column: function construction sets function flags", "[table_column]") {
-  const table_column c{matador::sql::sql_function_t::Count, "id"};
-
-  CHECK(c.column_name() == "id");
-  CHECK(c.is_function());
-  CHECK(c.function() == matador::sql::sql_function_t::Count);
-
-  // name() remains the expression reference (canonical for table-less)
-  CHECK(c.name() == "id");
-}
-
-TEST_CASE("table_column: user-defined literal _col parses dotted input", "[table_column]") {
-  const table_column a = "id"_col;
-  CHECK(a.column_name() == "id");
-  CHECK(a.name() == "id");
-
-  // Dotted input keeps only the column part (table qualifier is ignored by the literal)
-  const table_column b = "users.id"_col;
-  CHECK(b.column_name() == "id");
-  CHECK(b.name() == "id");
-
-  // Multiple dots are rejected
-  CHECK_THROWS_AS(("a.b.c"_col), std::invalid_argument);
-}