renamed column to table_column and constraint to table_constraint.
This commit is contained in:
@@ -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 column &col, utils::database_type value)
|
||||
column_value_pair::column_value_pair(const table_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 column &column_value_pair::col() const {
|
||||
const table_column &column_value_pair::col() const {
|
||||
return column_;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@ const std::string& query_add_key_constraint_part::name() const {
|
||||
return name_;
|
||||
}
|
||||
|
||||
query_add_constraint_part_by_constraint::query_add_constraint_part_by_constraint(const query::constraint &co)
|
||||
query_add_constraint_part_by_constraint::query_add_constraint_part_by_constraint(const query::table_constraint &co)
|
||||
: query_part(sql::dialect_token::AddConstraint)
|
||||
, constraint_(co) {}
|
||||
|
||||
@@ -42,7 +42,7 @@ void query_add_constraint_part_by_constraint::accept(query_part_visitor &visitor
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
const class constraint & query_add_constraint_part_by_constraint::constraint() const {
|
||||
const table_constraint & query_add_constraint_part_by_constraint::constraint() const {
|
||||
return constraint_;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ const std::string& query_drop_key_constraint_part_by_name::name() const {
|
||||
return name_;
|
||||
}
|
||||
|
||||
query_drop_key_constraint_part_by_constraint::query_drop_key_constraint_part_by_constraint(const class constraint &co)
|
||||
query_drop_key_constraint_part_by_constraint::query_drop_key_constraint_part_by_constraint(const table_constraint &co)
|
||||
: query_part( sql::dialect_token::DropConstraint )
|
||||
, constraint_(co) {}
|
||||
|
||||
@@ -66,11 +66,11 @@ void query_drop_key_constraint_part_by_constraint::accept(query_part_visitor& vi
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
const class constraint& query_drop_key_constraint_part_by_constraint::constraint() const {
|
||||
const table_constraint& query_drop_key_constraint_part_by_constraint::constraint() const {
|
||||
return constraint_;
|
||||
}
|
||||
|
||||
query_add_foreign_key_constraint_part::query_add_foreign_key_constraint_part(const std::vector<column>& columns)
|
||||
query_add_foreign_key_constraint_part::query_add_foreign_key_constraint_part(const std::vector<table_column>& columns)
|
||||
: query_part(sql::dialect_token::ForeignKey)
|
||||
, columns_(columns) {}
|
||||
|
||||
@@ -78,11 +78,11 @@ void query_add_foreign_key_constraint_part::accept( query_part_visitor& visitor
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
const std::vector<column>& query_add_foreign_key_constraint_part::columns() const {
|
||||
const std::vector<table_column>& query_add_foreign_key_constraint_part::columns() const {
|
||||
return columns_;
|
||||
}
|
||||
|
||||
query_add_foreign_key_reference_part::query_add_foreign_key_reference_part(class table tab, const std::vector<column>& columns)
|
||||
query_add_foreign_key_reference_part::query_add_foreign_key_reference_part(class table tab, const std::vector<table_column>& columns)
|
||||
: query_part(sql::dialect_token::References)
|
||||
, table_(std::move(tab))
|
||||
, columns_(columns) {}
|
||||
@@ -95,11 +95,11 @@ const table& query_add_foreign_key_reference_part::table() const {
|
||||
return table_;
|
||||
}
|
||||
|
||||
const std::vector<column>& query_add_foreign_key_reference_part::columns() const {
|
||||
const std::vector<table_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<column>& columns)
|
||||
query_add_primary_key_constraint_part::query_add_primary_key_constraint_part(const std::vector<table_column>& columns)
|
||||
: query_part(sql::dialect_token::PrimaryKey)
|
||||
, columns_(columns) {}
|
||||
|
||||
@@ -107,11 +107,11 @@ void query_add_primary_key_constraint_part::accept( query_part_visitor& visitor
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
const std::vector<column>& query_add_primary_key_constraint_part::columns() const {
|
||||
const std::vector<table_column>& query_add_primary_key_constraint_part::columns() const {
|
||||
return columns_;
|
||||
}
|
||||
|
||||
query_select_part::query_select_part(std::vector<column> columns)
|
||||
query_select_part::query_select_part(std::vector<table_column> columns)
|
||||
: query_part(sql::dialect_token::Select)
|
||||
, columns_(std::move(columns)) {}
|
||||
|
||||
@@ -120,7 +120,7 @@ void query_select_part::accept(query_part_visitor &visitor)
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
const std::vector<column>& query_select_part::columns() const
|
||||
const std::vector<table_column>& query_select_part::columns() const
|
||||
{
|
||||
return columns_;
|
||||
}
|
||||
@@ -185,12 +185,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(class column col)
|
||||
query_group_by_part::query_group_by_part(class table_column col)
|
||||
: query_part(sql::dialect_token::GroupBy)
|
||||
, column_(std::move(col))
|
||||
{}
|
||||
|
||||
const column &query_group_by_part::column() const
|
||||
const table_column &query_group_by_part::column() const
|
||||
{
|
||||
return column_;
|
||||
}
|
||||
@@ -200,12 +200,12 @@ void query_group_by_part::accept(query_part_visitor &visitor)
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
query_order_by_part::query_order_by_part(class column col)
|
||||
query_order_by_part::query_order_by_part(class table_column col)
|
||||
: query_part(sql::dialect_token::OrderBy)
|
||||
, column_(std::move(col))
|
||||
{}
|
||||
|
||||
const column &query_order_by_part::column() const
|
||||
const table_column &query_order_by_part::column() const
|
||||
{
|
||||
return column_;
|
||||
}
|
||||
@@ -269,7 +269,7 @@ void query_insert_part::accept(query_part_visitor &visitor)
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
query_into_part::query_into_part(class table tab, std::vector<column> columns)
|
||||
query_into_part::query_into_part(class table tab, std::vector<table_column> columns)
|
||||
: query_part(sql::dialect_token::Insert)
|
||||
, table_(std::move(tab))
|
||||
, columns_(std::move(columns)) {}
|
||||
@@ -279,7 +279,7 @@ const table &query_into_part::table() const
|
||||
return table_;
|
||||
}
|
||||
|
||||
const std::vector<column> &query_into_part::columns() const
|
||||
const std::vector<table_column> &query_into_part::columns() const
|
||||
{
|
||||
return columns_;
|
||||
}
|
||||
@@ -375,11 +375,11 @@ void query_create_table_part::accept(query_part_visitor &visitor)
|
||||
visitor.visit(*this);
|
||||
}
|
||||
|
||||
query_create_table_columns_part::query_create_table_columns_part(const std::list<column>& columns)
|
||||
query_create_table_columns_part::query_create_table_columns_part(const std::list<table_column>& columns)
|
||||
: query_part( sql::dialect_token::Columns )
|
||||
, columns_(columns){}
|
||||
|
||||
const std::list<column>& query_create_table_columns_part::columns() const {
|
||||
const std::list<table_column>& query_create_table_columns_part::columns() const {
|
||||
return columns_;
|
||||
}
|
||||
|
||||
@@ -387,11 +387,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 constraint>& constraints)
|
||||
query_create_table_constraints_part::query_create_table_constraints_part(const std::list<class table_constraint>& constraints)
|
||||
: query_part( sql::dialect_token::Constraint )
|
||||
, constraints_(constraints) {}
|
||||
|
||||
const std::list<class constraint>& query_create_table_constraints_part::constraints() const {
|
||||
const std::list<class table_constraint>& query_create_table_constraints_part::constraints() const {
|
||||
return constraints_;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user