schema progress (does not compile)

source/orm/orm/session.cpp

@@ -227,7 +227,7 @@ query::fetchable_query session::build_select_query(entity_query_data &&data) {
       .from(*data.root_table)
       .join_left(data.joins)
       .where(std::move(data.where_clause))
-      .order_by({data.root_table.get(), data.pk_column_name})
+      .order_by({data.root_table, data.pk_column_name})
       .asc();
 }
 }

source/orm/orm/session_query_builder.cpp

@@ -3,7 +3,7 @@
 #include <iostream>
 
 namespace matador::orm {
-criteria_transformer::criteria_transformer(const query::schema& repo, const std::unordered_map<std::string, std::shared_ptr<query::table>>& tables_by_name)
+criteria_transformer::criteria_transformer(const query::schema& repo, const std::unordered_map<std::string, query::table>& tables_by_name)
 : repo_(repo)
 , tables_by_name_(tables_by_name) {}
 
@@ -39,12 +39,15 @@ void criteria_transformer::visit( const query::not_criteria& node ) {
 }
 
 void criteria_transformer::update_criteria_column(const query::abstract_column_criteria& node) const {
-    const auto it = tables_by_name_.find(node.col().table()->name());
-    if (it == tables_by_name_.end()) {
-        return;
-    }
+  if (node.col().table() == nullptr) {
+    return;
+  }
+  const auto it = tables_by_name_.find(node.col().table()->name());
+  if (it == tables_by_name_.end()) {
+    return;
+  }
 
-    const_cast<query::column&>(node.col()).table(it->second.get());
+  const_cast<query::column&>(node.col()).table(&it->second);
 }
 
 void session_query_builder::on_revision(const char *id, uint64_t &/*rev*/) {
@@ -52,11 +55,11 @@ void session_query_builder::on_revision(const char *id, uint64_t &/*rev*/) {
 }
 
 void session_query_builder::push(const std::string &column_name) {
-  const auto it = processed_tables_.find(table_info_stack_.top().info.get().name());
+  const auto it = processed_tables_.find(table_info_stack_.top().info.name());
   if (it == processed_tables_.end()) {
     throw query_builder_exception{query_build_error::UnexpectedError};
   }
-  entity_query_data_.columns.emplace_back(it->second.get(), column_name, build_alias('c', ++column_index));
+  entity_query_data_.columns.emplace_back(&it->second, column_name, build_alias('c', ++column_index));
 }
 
 std::string session_query_builder::build_alias(const char prefix, const unsigned int count) {