renamed column to table_column and constraint to table_constraint.

source/orm/orm/session.cpp

@@ -15,7 +15,7 @@ utils::error make_error(const error_code ec, const std::string &msg) {
 session::session(session_context&& ctx)
 : cache_(ctx.bus, ctx.pool, ctx.cache_size)
 , dialect_(sql::backend_provider::instance().connection_dialect(ctx.pool.info().type))
-, schema_(std::make_unique<object::repository>(dialect_.default_schema_name())) {
+, schema_(std::make_unique<query::schema>(dialect_.default_schema_name())) {
 }
 
 utils::result<void, utils::error> session::create_schema() const {
@@ -49,7 +49,7 @@ utils::result<void, utils::error> session::create_schema() const {
   //   }
 
   auto c = cache_.pool().acquire();
-  for (const auto &node: *schema_) {
+  for (const auto &node: schema_->repo()) {
     auto ctx = query::query::create()
       .table(node->name())
       .columns(node->info().attributes())
@@ -62,7 +62,7 @@ utils::result<void, utils::error> session::create_schema() const {
   }
 
   // create table constraints
-  for (const auto &node: *schema_) {
+  for (const auto &node: schema_->repo()) {
     for (const auto& cons : node->info().constraints()) {
       auto ctx = build_add_constraint_context(node->name(), cons, c);
 
@@ -95,7 +95,7 @@ sql::query_context session::build_add_constraint_context(const std::string& tabl
 utils::result<void, utils::error> session::drop_schema() const {
   auto c = cache_.pool().acquire();
   // drop table constraints
-  for (const auto &node: *schema_) {
+  for (const auto &node: schema_->repo()) {
     for (const auto& cons : node->info().constraints()) {
       auto ctx = query::query::alter()
         .table(node->name())
@@ -110,7 +110,7 @@ utils::result<void, utils::error> session::drop_schema() const {
   }
 
   // drop table
-  for (const auto &node: *schema_) {
+  for (const auto &node: schema_->repo()) {
     auto ctx = query::query::drop()
       .table(node->name())
       .compile(*c);
@@ -191,7 +191,7 @@ const class sql::dialect &session::dialect() const {
 }
 
 void session::dump_schema(std::ostream &os) const {
-  schema_->dump(os);
+  schema_->repo().dump(os);
 }
 
 utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> session::fetch(const sql::query_context& ctx) const {

source/orm/orm/session_query_builder.cpp

@@ -47,7 +47,7 @@ void criteria_transformer::update_criteria_column(const query::abstract_column_c
     return;
   }
 
-  const_cast<query::column&>(node.col()).table(&it->second);
+  const_cast<query::table_column&>(node.col()).table(&it->second);
 }
 
 void session_query_builder::on_revision(const char *id, uint64_t &/*rev*/) {
@@ -73,7 +73,7 @@ std::string session_query_builder::build_alias(const char prefix, const unsigned
   return table_info_stack_.size() == 1;
 }
 
-void session_query_builder::append_join(const query::column &left, const query::column &right) {
+void session_query_builder::append_join(const query::table_column &left, const query::table_column &right) {
   using namespace matador::query;
   entity_query_data_.joins.push_back({
     right.table(),