renamed constraint to restriction

source/orm/orm/schema.cpp

@@ -181,7 +181,7 @@ utils::result<bool, utils::error> schema::table_exists(const std::string& table_
     return c->exists(repo_.name(), table_name);
 }
 
-sql::query_context schema::build_add_constraint_context( const object::repository_node& node, const class object::constraint& cons ) const {
+sql::query_context schema::build_add_constraint_context( const object::repository_node& node, const class object::restriction& cons ) const {
   if (cons.is_foreign_key_constraint()) {
     return query::query::alter()
       .table(node.name())
@@ -200,7 +200,7 @@ sql::query_context schema::build_add_constraint_context( const object::repositor
   return {};
 }
 
-sql::query_context schema::build_drop_constraint_context( const object::repository_node& node, const class object::constraint& cons ) const {
+sql::query_context schema::build_drop_constraint_context( const object::repository_node& node, const class object::restriction& cons ) const {
     return query::query::alter()
       .table(node.name())
       .drop_constraint(cons.name())

source/orm/orm/session.cpp

@@ -76,7 +76,7 @@ utils::result<void, utils::error> session::create_schema() const {
   return utils::ok<void>();
 }
 
-sql::query_context session::build_add_constraint_context(const std::string& table_name, const class object::constraint& cons, const sql::connection_ptr &conn) {
+sql::query_context session::build_add_constraint_context(const std::string& table_name, const class object::restriction& cons, const sql::connection_ptr &conn) {
   if (cons.is_foreign_key_constraint()) {
     return query::query::alter()
       .table(table_name)

source/orm/query/builder.cpp

@@ -48,8 +48,8 @@ constraint_builder& constraint_builder::references( std::string table, std::stri
   return *this;
 }
 
-constraint_builder::operator object::constraint() const {
-  return object::constraint{constraint_name};
+constraint_builder::operator object::restriction() const {
+  return object::restriction{constraint_name};
 }
 
 constraint_builder constraint( std::string name ) {

source/orm/query/intermediates/query_create_intermediate.cpp

@@ -18,27 +18,31 @@ executable_query query_create_intermediate::schema( const std::string& schema_na
   return {context_};
 }
 
-executable_query query_create_table_columns_intermediate::constraints( std::initializer_list<class object::constraint> constraints ) {
+executable_query query_create_table_columns_intermediate::constraints(const std::initializer_list<class object::restriction> constraints) {
   return this->constraints(std::list(constraints));
 }
 
-executable_query query_create_table_columns_intermediate::constraints( const std::list<class object::constraint>& constraints ) {
+executable_query query_create_table_columns_intermediate::constraints(const std::list<class object::restriction>& constraints) {
 
   context_->parts.push_back(std::make_unique<internal::query_create_table_constraints_part>(constraints));
   return {context_};
 }
 
-query_create_table_columns_intermediate query_create_table_intermediate::columns( std::initializer_list<object::attribute> columns ) {
+query_create_table_columns_intermediate query_create_table_intermediate::columns(std::initializer_list<object::attribute> columns) {
   context_->parts.push_back(std::make_unique<internal::query_create_table_columns_part>(columns));
   return {context_};
 }
 
-query_create_table_columns_intermediate query_create_table_intermediate::columns( const std::list<object::attribute>& columns ) {
+query_create_table_columns_intermediate query_create_table_intermediate::columns(const std::list<object::attribute>& columns) {
   context_->parts.push_back(std::make_unique<internal::query_create_table_columns_part>(columns));
   return {context_};
 }
 
-query_create_table_columns_intermediate query_create_table_intermediate::columns( std::initializer_list<column> columns ) {}
+query_create_table_columns_intermediate query_create_table_intermediate::columns(std::initializer_list<column> columns) {
+  return {context_};
+}
 
-query_create_table_columns_intermediate query_create_table_intermediate::columns( const std::list<column>& columns ) {}
+query_create_table_columns_intermediate query_create_table_intermediate::columns(const std::list<column>& columns) {
+  return {context_};
+}
 }

source/orm/query/internal/query_parts.cpp

@@ -370,11 +370,11 @@ 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::list<class object::constraint>& constraints)
+query_create_table_constraints_part::query_create_table_constraints_part(const std::list<class object::restriction>& constraints)
 : query_part( sql::dialect_token::Constraint )
 , constraints_(constraints) {}
 
-const std::list<class object::constraint>& query_create_table_constraints_part::constraints() const {
+const std::list<class object::restriction>& query_create_table_constraints_part::constraints() const {
   return constraints_;
 }
 

source/orm/query/query_compiler.cpp

@@ -294,7 +294,7 @@ void query_compiler::visit(internal::query_create_part &/*create_part*/)
 }
 
 std::string build_create_column(const object::attribute &col, const sql::dialect &d);
-std::string build_constraint(const class object::constraint &cons, const sql::dialect &d);
+std::string build_constraint(const class object::restriction &cons, const sql::dialect &d);
 
 void query_compiler::visit(internal::query_create_table_part &part)
 {
@@ -392,7 +392,7 @@ std::string build_create_column(const object::attribute &col, const sql::dialect
   return result;
 }
 
-std::string build_constraint(const class object::constraint& cons, const sql::dialect& d) {
+std::string build_constraint(const class object::restriction& cons, const sql::dialect& d) {
     std::string result;
     if (!cons.name().empty()) {
         result.append(d.constraint()).append(" ").append(cons.name()).append(" ");