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

added more tests

Browse Source
This commit is contained in:
Sascha Kühl
2025-02-06 16:17:47 +01:00
parent c76aa56440
commit 0b70f5d4ee
68 changed files with 2117 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/orm/query/intermediates/query_create_intermediate.cpp
+3 -3
View File
@@ -9,12 +9,12 @@ query_create_intermediate::query_create_intermediate()
context_->parts.push_back(std::make_unique<internal::query_create_part>());
}
executable_query query_create_intermediate::table(const sql::table &table, const std::initializer_list<sql::column_definition> columns)
executable_query query_create_intermediate::table(const sql::table &table, const std::initializer_list<object::attribute_definition> columns)
{
return this->table(table, std::vector<sql::column_definition>{columns});
return this->table(table, std::vector<object::attribute_definition>{columns});
}
executable_query query_create_intermediate::table(const sql::table &table, const std::vector<sql::column_definition> &columns)
executable_query query_create_intermediate::table(const sql::table &table, const std::vector<object::attribute_definition> &columns)
{
context_->parts.push_back(std::make_unique<internal::query_create_table_part>(table, columns));
return {context_};
source/orm/query/internal/query_parts.cpp
+2 -2
View File
@@ -254,7 +254,7 @@ void query_create_part::accept(query_part_visitor &visitor)
visitor.visit(*this);
}
query_create_table_part::query_create_table_part(sql::table table, std::vector<sql::column_definition> columns)
query_create_table_part::query_create_table_part(sql::table table, std::vector<object::attribute_definition> columns)
: query_part(sql::dialect_token::TABLE)
, table_(std::move(table))
, columns_(std::move(columns)) {}
@@ -264,7 +264,7 @@ const sql::table &query_create_table_part::table() const
return table_;
}
const std::vector<sql::column_definition> &query_create_table_part::columns() const
const std::vector<object::attribute_definition> &query_create_table_part::columns() const
{
return columns_;
}
source/orm/query/internal/query_result_impl.cpp
+3 -3
View File
@@ -12,14 +12,14 @@ void detail::pk_reader::on_primary_key(const char *id, std::string &value, size_
utils::data_type_traits<std::string>::read_value(reader_, id, column_index_++, value, size);
}
query_result_impl::query_result_impl(std::unique_ptr<query_result_reader> &&reader, std::vector<column_definition> &&prototype, const size_t column_index)
query_result_impl::query_result_impl(std::unique_ptr<query_result_reader> &&reader, std::vector<object::attribute_definition> &&prototype, const size_t column_index)
: column_index_(column_index)
, prototype_(std::move(prototype))
, reader_(std::move(reader))
, pk_reader_(*reader_)
{}
query_result_impl::query_result_impl(std::unique_ptr<query_result_reader> &&reader, const std::vector<column_definition> &prototype, const size_t column_index)
query_result_impl::query_result_impl(std::unique_ptr<query_result_reader> &&reader, const std::vector<object::attribute_definition> &prototype, const size_t column_index)
: column_index_(column_index)
, prototype_(prototype)
, reader_(std::move(reader))
@@ -53,7 +53,7 @@ query_result_impl::on_attribute(const char *id, utils::value &val, const utils::
reader_->read_value(id, column_index_++, val, attr.size());
}
const std::vector<column_definition>& query_result_impl::prototype() const
const std::vector<object::attribute_definition>& query_result_impl::prototype() const
{
return prototype_;
}
source/orm/query/query_compiler.cpp
+2 -2
View File
@@ -242,7 +242,7 @@ struct column_context
std::vector<fk_context> foreign_contexts;
};
std::string build_create_column(const sql::column_definition &col, const sql::dialect &d, column_context &context);
std::string build_create_column(const object::attribute_definition &col, const sql::dialect &d, column_context &context);
void query_compiler::visit(internal::query_create_table_part &create_table_part)
{
@@ -324,7 +324,7 @@ void query_compiler::visit(internal::query_drop_table_part &drop_table_part)
query_.sql += " " + query_compiler::build_table_name(drop_table_part.token(), *dialect_, query_.table);
}
std::string build_create_column(const sql::column_definition &col, const sql::dialect &d, column_context &context)
std::string build_create_column(const object::attribute_definition &col, const sql::dialect &d, column_context &context)
{
std::string result = d.prepare_identifier_string(col.name()) + " " + d.data_type_at(col.type());
if (col.attributes().size() > 0) {