sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed column generator test

This commit is contained in:
Sascha Kühl 2025-02-11 21:48:47 +01:00
parent 1d83abcb1b
commit 55f9f8cf67
3 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/matador/sql/column_generator.hpp
View File

@ -27,7 +27,7 @@ public:
~column_generator() = default; ~column_generator() = default;
template < class Type > template < class Type >
static std::vector<column> generate(const object::schema &scm, bool force_lazy = false) static std::vector<column> generate(const object::schema &scm, const bool force_lazy = false)
{ {
const auto info = scm.info<Type>(); const auto info = scm.info<Type>();
if (!info) { if (!info) {
@ -36,7 +36,7 @@ public:
std::vector<column> columns; std::vector<column> columns;
column_generator gen(columns, scm, info.value().get().name(), force_lazy); column_generator gen(columns, scm, info.value().get().name(), force_lazy);
Type obj; Type obj;
matador::access::process(gen, obj); access::process(gen, obj);
return std::move(columns); return std::move(columns);
} }
@ -61,10 +61,14 @@ public:
if (!info) { if (!info) {
return; return;
} }
table_name_stack_.push(info.value().get().name()); if (seen_tables.count(info->get().name()) == 0) {
auto it = seen_tables.insert(info->get().name()).first;
table_name_stack_.push(info->get().name());
typename Pointer::value_type obj; typename Pointer::value_type obj;
matador::access::process(*this, obj); access::process(*this, obj);
table_name_stack_.pop(); table_name_stack_.pop();
seen_tables.erase(it);
}
} }
} }
template<class Pointer> template<class Pointer>
@ -77,10 +81,14 @@ public:
if (!info) { if (!info) {
return; return;
} }
if (seen_tables.count(info->get().name()) == 0) {
auto it = seen_tables.insert(info->get().name()).first;
table_name_stack_.push(info.value().get().name()); table_name_stack_.push(info.value().get().name());
typename Pointer::value_type obj; typename Pointer::value_type obj;
matador::access::process(*this, obj); access::process(*this, obj);
table_name_stack_.pop(); table_name_stack_.pop();
seen_tables.erase(it);
}
} }
} }
template<class ContainerType> template<class ContainerType>
@ -94,21 +102,21 @@ public:
return; return;
} }
if (seen_tables.count(info->get().name()) == 0) {
auto it = seen_tables.insert(info->get().name()).first;
table_name_stack_.push(info.value().get().name()); table_name_stack_.push(info.value().get().name());
typename ContainerType::value_type::value_type obj; typename ContainerType::value_type::value_type obj;
matador::access::process(*this, obj); access::process(*this, obj);
table_name_stack_.pop(); table_name_stack_.pop();
seen_tables.erase(it);
}
} }
template<class ContainerType> template<class ContainerType>
void on_has_many_to_many(const char *id, ContainerType &c, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &attr) static void on_has_many_to_many(const char *id, ContainerType &c, const char *join_column, const char *inverse_join_column, const utils::foreign_attributes &attr) {}
{
}
template<class ContainerType> template<class ContainerType>
void on_has_many_to_many(const char *id, ContainerType &c, const utils::foreign_attributes &attr) static void on_has_many_to_many(const char *id, ContainerType &c, const utils::foreign_attributes &attr) {}
{
}
private: private:
void push(const std::string &column_name); void push(const std::string &column_name);
@ -116,6 +124,7 @@ private:
private: private:
std::stack<std::string> table_name_stack_; std::stack<std::string> table_name_stack_;
std::vector<column> &column_infos_; std::vector<column> &column_infos_;
std::unordered_set<std::string> seen_tables;
const object::schema &table_schema_; const object::schema &table_schema_;
int column_index{0}; int column_index{0};
bool force_lazy_{false}; bool force_lazy_{false};

1
source/orm/sql/column_generator.cpp
View File

@ -13,6 +13,7 @@ column_generator::column_generator(std::vector<column> &column_infos,
, force_lazy_(force_lazy) , force_lazy_(force_lazy)
{ {
table_name_stack_.push(table_name); table_name_stack_.push(table_name);
seen_tables.insert(table_name);
} }
void column_generator::on_primary_key(const char *id, std::string &, size_t) void column_generator::on_primary_key(const char *id, std::string &, size_t)

38
test/orm/sql/ColumnTest.cpp
View File

@ -11,8 +11,7 @@ TEST_CASE("Test create empty column", "[column]") {
REQUIRE(c.name() == "name"); REQUIRE(c.name() == "name");
REQUIRE(c.index() == -1); REQUIRE(c.index() == -1);
REQUIRE(c.type() == basic_type::type_null); REQUIRE(c.type() == basic_type::type_null);
REQUIRE(c.reference_column()->table_name().empty()); REQUIRE(!c.reference_column());
REQUIRE(c.reference_column()->name().empty());
c.set(std::string{"george"}, 255); c.set(std::string{"george"}, 255);
REQUIRE(c.type() == basic_type::type_varchar); REQUIRE(c.type() == basic_type::type_varchar);
@ -26,38 +25,47 @@ TEST_CASE("Test create empty column", "[column]") {
} }
TEST_CASE("Test copy and move column", "[column]") { TEST_CASE("Test copy and move column", "[column]") {
attribute_definition c("name"); attribute_definition c(
"name",
basic_type::type_varchar,
2,
std::make_shared<attribute_definition>("author", "books", basic_type::type_uint32, constraints::FOREIGN_KEY),
constraints::FOREIGN_KEY,
null_option::NOT_NULL
);
c.set(std::string{"george"}, 255); c.set(std::string{"george"}, 255);
REQUIRE(c.name() == "name"); REQUIRE(c.name() == "name");
REQUIRE(c.index() == -1); REQUIRE(c.index() == 2);
REQUIRE(c.reference_column()->table_name().empty()); REQUIRE(c.reference_column());
REQUIRE(c.reference_column()->name().empty()); REQUIRE(c.reference_column()->name() == "author");
REQUIRE(c.reference_column()->table_name() == "books");
REQUIRE(c.type() == basic_type::type_varchar); REQUIRE(c.type() == basic_type::type_varchar);
REQUIRE(c.as<std::string>() == "george"); REQUIRE(c.as<std::string>() == "george");
REQUIRE(c.attributes().size() == 255); REQUIRE(c.attributes().size() == 255);
auto c2 = c; auto c2 = c;
REQUIRE(c2.name() == "name"); REQUIRE(c2.name() == "name");
REQUIRE(c2.index() == -1); REQUIRE(c2.index() == 2);
REQUIRE(c2.reference_column()->table_name().empty()); REQUIRE(c2.reference_column());
REQUIRE(c2.reference_column()->name().empty()); REQUIRE(c2.reference_column()->name() == "author");
REQUIRE(c2.reference_column()->table_name() == "books");
REQUIRE(c2.type() == basic_type::type_varchar); REQUIRE(c2.type() == basic_type::type_varchar);
REQUIRE(c2.as<std::string>() == "george"); REQUIRE(c2.as<std::string>() == "george");
REQUIRE(c2.attributes().size() == 255); REQUIRE(c2.attributes().size() == 255);
auto c3 = std::move(c2); auto c3 = std::move(c2);
REQUIRE(c3.name() == "name"); REQUIRE(c3.name() == "name");
REQUIRE(c3.index() == -1); REQUIRE(c3.index() == 2);
REQUIRE(c3.reference_column()->table_name().empty()); REQUIRE(c3.reference_column());
REQUIRE(c3.reference_column()->name().empty()); REQUIRE(c3.reference_column()->name() == "author");
REQUIRE(c3.reference_column()->table_name() == "books");
REQUIRE(c3.type() == basic_type::type_varchar); REQUIRE(c3.type() == basic_type::type_varchar);
REQUIRE(c3.as<std::string>() == "george"); REQUIRE(c3.as<std::string>() == "george");
REQUIRE(c3.attributes().size() == 255); REQUIRE(c3.attributes().size() == 255);
REQUIRE(c2.name().empty()); REQUIRE(c2.name().empty());
REQUIRE(c2.index() == -1); REQUIRE(c2.index() == 2);
REQUIRE(c2.reference_column()->table_name().empty()); REQUIRE(!c2.reference_column());
REQUIRE(c2.reference_column()->name().empty());
REQUIRE(c2.type() == basic_type::type_null); REQUIRE(c2.type() == basic_type::type_null);
// REQUIRE(!c2.as<std::string>().has_value()); // REQUIRE(!c2.as<std::string>().has_value());
REQUIRE(c2.attributes().size() == 255); REQUIRE(c2.attributes().size() == 255);