From 87bd2f8b89b0c8f23620ff72de5c4eaff9775195 Mon Sep 17 00:00:00 2001 From: sascha Date: Wed, 3 Jun 2026 11:19:24 +0200 Subject: [PATCH] Revert "fixed compile" This reverts commit 8914c06833ffc3e0ded7f6304a4e584076e7a6c1. --- .../query/intermediates/query_create_intermediate.hpp | 4 ++-- include/matador/query/internal/query_parts.hpp | 8 +++++--- .../query/intermediates/query_create_intermediate.cpp | 10 +++++----- source/orm/query/internal/query_parts.cpp | 5 +++-- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/include/matador/query/intermediates/query_create_intermediate.hpp b/include/matador/query/intermediates/query_create_intermediate.hpp index d507b93..aaf7592 100644 --- a/include/matador/query/intermediates/query_create_intermediate.hpp +++ b/include/matador/query/intermediates/query_create_intermediate.hpp @@ -20,9 +20,9 @@ public: using executable_query::executable_query; executable_query constraints(std::initializer_list constraints); - executable_query constraints(const std::vector &restrictions); + executable_query constraints(const std::list &restrictions); executable_query constraints(std::initializer_list constraints); - executable_query constraints(const std::vector &constraints); + executable_query constraints(const std::list &constraints); }; class query_create_table_intermediate : public query_intermediate { diff --git a/include/matador/query/internal/query_parts.hpp b/include/matador/query/internal/query_parts.hpp index a61c207..b57818d 100644 --- a/include/matador/query/internal/query_parts.hpp +++ b/include/matador/query/internal/query_parts.hpp @@ -448,6 +448,7 @@ public: [[nodiscard]] const std::list& columns() const; +private: void accept(query_part_visitor &visitor) override; private: @@ -456,14 +457,15 @@ private: class query_create_table_constraints_part final : public query_part { public: - explicit query_create_table_constraints_part(const std::vector &constraints); + explicit query_create_table_constraints_part(const std::list &constraints); - [[nodiscard]] const std::vector& constraints() const; + [[nodiscard]] const std::list& constraints() const; +private: void accept(query_part_visitor &visitor) override; private: - std::vector constraints_; + std::list constraints_; }; class query_create_sequence_part final : public query_part { diff --git a/source/orm/query/intermediates/query_create_intermediate.cpp b/source/orm/query/intermediates/query_create_intermediate.cpp index 8e894b0..c0a6f5a 100644 --- a/source/orm/query/intermediates/query_create_intermediate.cpp +++ b/source/orm/query/intermediates/query_create_intermediate.cpp @@ -30,20 +30,20 @@ executable_query query_create_intermediate::schema( const std::string& schema_na } executable_query query_create_table_columns_intermediate::constraints(const std::initializer_list constraints) { - return this->constraints(std::vector(constraints)); + return this->constraints(std::list(constraints)); } executable_query query_create_table_columns_intermediate::constraints(const std::initializer_list constraints) { - return this->constraints(std::vector(constraints)); + return this->constraints(std::list(constraints)); } -executable_query query_create_table_columns_intermediate::constraints(const std::vector& constraints){ +executable_query query_create_table_columns_intermediate::constraints(const std::list& constraints){ context_->parts.push_back(std::make_unique(constraints)); return {context_}; } -executable_query query_create_table_columns_intermediate::constraints(const std::vector& restrictions) { - std::vector constraints; +executable_query query_create_table_columns_intermediate::constraints(const std::list& restrictions) { + std::list constraints; for (const auto& restr : restrictions) { if (restr.is_primary_key_constraint()) { constraints.emplace_back(restr.column_name(), restr.owner()->name(), restr.attribute().attributes().options()); diff --git a/source/orm/query/internal/query_parts.cpp b/source/orm/query/internal/query_parts.cpp index 6734a89..3567f82 100644 --- a/source/orm/query/internal/query_parts.cpp +++ b/source/orm/query/internal/query_parts.cpp @@ -431,12 +431,13 @@ void query_create_table_columns_part::accept(query_part_visitor &visitor) { visitor.visit(*this); } -query_create_table_constraints_part::query_create_table_constraints_part(const std::vector &constraints) +query_create_table_constraints_part::query_create_table_constraints_part( + const std::list &constraints) : query_part(sql::dialect_token::Constraint) , constraints_(constraints) { } -const std::vector &query_create_table_constraints_part::constraints() const { +const std::list &query_create_table_constraints_part::constraints() const { return constraints_; }