moved column and table class from namespace sql to query

source/orm/query/internal/column_value_pair.cpp

@@ -9,7 +9,7 @@ column_value_pair::column_value_pair(std::string name, utils::database_type valu
 , value_(std::move(value)) {
 }
 
-column_value_pair::column_value_pair(const sql::column &col, utils::database_type value)
+column_value_pair::column_value_pair(const column &col, utils::database_type value)
 : column_(col)
 , value_(std::move(value)) {
 }
@@ -23,7 +23,7 @@ column_value_pair::column_value_pair( const char* name, utils::placeholder p )
 : column_(name)
 , value_(p) {}
 
-const sql::column &column_value_pair::col() const {
+const column &column_value_pair::col() const {
   return column_;
 }
 

source/orm/query/internal/query_parts.cpp

@@ -10,21 +10,21 @@ void query_alter_part::accept( query_part_visitor& visitor ) {
   visitor.visit(*this);
 }
 
-query_alter_table_part::query_alter_table_part(sql::table table )
+query_alter_table_part::query_alter_table_part(class table tab)
 : query_part(sql::dialect_token::Table)
-, table_(std::move(table)) {}
+, table_(std::move(tab)) {}
 
-void query_alter_table_part::accept( query_part_visitor& visitor ) {
+void query_alter_table_part::accept(query_part_visitor& visitor) {
   visitor.visit(*this);
 }
 
-const sql::table& query_alter_table_part::table() const {
+const table& query_alter_table_part::table() const {
   return table_;
 }
 
-query_add_key_constraint_part::query_add_key_constraint_part(const std::string& name)
+query_add_key_constraint_part::query_add_key_constraint_part(std::string name)
 : query_part(sql::dialect_token::AddConstraint)
-, name_(name){}
+, name_(std::move(name)){}
 
 void query_add_key_constraint_part::accept( query_part_visitor& visitor ) {
   visitor.visit(*this);
@@ -34,9 +34,9 @@ const std::string& query_add_key_constraint_part::name() const {
    return name_;
 }
 
-query_drop_key_constraint_part::query_drop_key_constraint_part( const std::string& name )
+query_drop_key_constraint_part::query_drop_key_constraint_part(std::string name)
 : query_part( sql::dialect_token::DropConstraint )
-, name_( name ){}
+, name_(std::move( name )){}
 
 void query_drop_key_constraint_part::accept( query_part_visitor& visitor ) {
   visitor.visit(*this);
@@ -53,7 +53,7 @@ void query_drop_foreign_key_constraint_part::accept( query_part_visitor& visitor
     visitor.visit(*this);
 }
 
-query_add_foreign_key_constraint_part::query_add_foreign_key_constraint_part(const std::vector<sql::column>& columns)
+query_add_foreign_key_constraint_part::query_add_foreign_key_constraint_part(const std::vector<column>& columns)
 : query_part(sql::dialect_token::ForeignKey)
 , columns_(columns) {}
 
@@ -61,28 +61,28 @@ void query_add_foreign_key_constraint_part::accept( query_part_visitor& visitor
   visitor.visit(*this);
 }
 
-const std::vector<sql::column>& query_add_foreign_key_constraint_part::columns() const {
+const std::vector<column>& query_add_foreign_key_constraint_part::columns() const {
   return columns_;
 }
 
-query_add_foreign_key_reference_part::query_add_foreign_key_reference_part( sql::table table, const std::vector<sql::column>& columns )
+query_add_foreign_key_reference_part::query_add_foreign_key_reference_part(class table tab, const std::vector<column>& columns)
 : query_part(sql::dialect_token::References)
-, table_(std::move(table))
+, table_(std::move(tab))
 , columns_(columns) {}
 
 void query_add_foreign_key_reference_part::accept( query_part_visitor& visitor ) {
   visitor.visit(*this);
 }
 
-const sql::table& query_add_foreign_key_reference_part::table() const {
+const table& query_add_foreign_key_reference_part::table() const {
   return table_;
 }
 
-const std::vector<sql::column>& query_add_foreign_key_reference_part::columns() const {
+const std::vector<column>& query_add_foreign_key_reference_part::columns() const {
   return columns_;
 }
 
-query_add_primary_key_constraint_part::query_add_primary_key_constraint_part(const std::vector<sql::column>& columns)
+query_add_primary_key_constraint_part::query_add_primary_key_constraint_part(const std::vector<column>& columns)
 : query_part(sql::dialect_token::PrimaryKey)
 , columns_(columns) {}
 
@@ -90,11 +90,11 @@ void query_add_primary_key_constraint_part::accept( query_part_visitor& visitor
   visitor.visit(*this);
 }
 
-const std::vector<sql::column>& query_add_primary_key_constraint_part::columns() const {
+const std::vector<column>& query_add_primary_key_constraint_part::columns() const {
   return columns_;
 }
 
-query_select_part::query_select_part(std::vector<sql::column> columns)
+query_select_part::query_select_part(std::vector<column> columns)
   : query_part(sql::dialect_token::Select)
   , columns_(std::move(columns)) {}
 
@@ -103,16 +103,16 @@ void query_select_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-const std::vector<sql::column>& query_select_part::columns() const
+const std::vector<column>& query_select_part::columns() const
 {
   return columns_;
 }
 
-query_from_part::query_from_part(sql::table t)
+query_from_part::query_from_part(class table t)
   : query_part(sql::dialect_token::From)
   , table_(std::move(t)) {}
 
-const sql::table &query_from_part::table() const
+const table &query_from_part::table() const
 {
   return table_;
 }
@@ -122,11 +122,11 @@ void query_from_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-query_join_part::query_join_part(sql::table t)
+query_join_part::query_join_part(class table t)
   : query_part(sql::dialect_token::Join)
   , table_(std::move(t)) {}
 
-const sql::table &query_join_part::table() const
+const table &query_join_part::table() const
 {
   return table_;
 }
@@ -168,12 +168,12 @@ query_table_name_part::query_table_name_part(const sql::dialect_token token, std
 : query_part(token)
 , table_name_(std::move(table_name)) {}
 
-query_group_by_part::query_group_by_part(sql::column col)
+query_group_by_part::query_group_by_part(class column col)
 : query_part(sql::dialect_token::GroupBy)
 , column_(std::move(col))
 {}
 
-const sql::column &query_group_by_part::column() const
+const column &query_group_by_part::column() const
 {
   return column_;
 }
@@ -183,12 +183,12 @@ void query_group_by_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-query_order_by_part::query_order_by_part(sql::column col)
+query_order_by_part::query_order_by_part(class column col)
 : query_part(sql::dialect_token::OrderBy)
 , column_(std::move(col))
 {}
 
-const sql::column &query_order_by_part::column() const
+const column &query_order_by_part::column() const
 {
   return column_;
 }
@@ -252,17 +252,17 @@ void query_insert_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-query_into_part::query_into_part(sql::table t, std::vector<sql::column> columns)
+query_into_part::query_into_part(class table t, std::vector<column> columns)
 : query_part(sql::dialect_token::Insert)
 , table_(std::move(t))
 , columns_(std::move(columns)) {}
 
-const sql::table &query_into_part::table() const
+const table &query_into_part::table() const
 {
   return table_;
 }
 
-const std::vector<sql::column> &query_into_part::columns() const
+const std::vector<column> &query_into_part::columns() const
 {
   return columns_;
 }
@@ -286,11 +286,11 @@ void query_values_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-query_update_part::query_update_part(sql::table table)
+query_update_part::query_update_part(class table table)
 : query_part(sql::dialect_token::Update)
 , table_(std::move(table)) {}
 
-const sql::table& query_update_part::table() const
+const table& query_update_part::table() const
 {
   return table_;
 }
@@ -322,11 +322,11 @@ void query_delete_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-query_delete_from_part::query_delete_from_part(sql::table table)
+query_delete_from_part::query_delete_from_part(class table table)
 : query_part(sql::dialect_token::From)
 , table_(std::move(table)) {}
 
-const sql::table &query_delete_from_part::table() const
+const table &query_delete_from_part::table() const
 {
   return table_;
 }
@@ -344,12 +344,12 @@ 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<object::attribute_definition> columns)
+query_create_table_part::query_create_table_part(class table table, std::vector<object::attribute_definition> columns)
 : query_part(sql::dialect_token::Table)
 , table_(std::move(table))
 , columns_(std::move(columns)) {}
 
-const sql::table &query_create_table_part::table() const
+const table &query_create_table_part::table() const
 {
   return table_;
 }
@@ -384,11 +384,11 @@ void query_drop_part::accept(query_part_visitor &visitor)
   visitor.visit(*this);
 }
 
-query_drop_table_part::query_drop_table_part(sql::table table)
+query_drop_table_part::query_drop_table_part(class table table)
 : query_part(sql::dialect_token::Table)
 , table_(std::move(table)) {}
 
-const sql::table &query_drop_table_part::table() const
+const table &query_drop_table_part::table() const
 {
   return table_;
 }