moved column and table class from namespace sql to query

source/orm/CMakeLists.txt

@@ -4,6 +4,8 @@ add_library(matador-orm STATIC
   ../../include/matador/orm/session.hpp
   ../../include/matador/orm/session_query_builder.hpp
   ../../include/matador/query/attribute_string_writer.hpp
+  ../../include/matador/query/builder.hpp
+  ../../include/matador/query/column.hpp
   ../../include/matador/query/criteria.hpp
   ../../include/matador/query/criteria/abstract_column_criteria.hpp
   ../../include/matador/query/criteria/abstract_criteria.hpp
@@ -16,6 +18,7 @@ add_library(matador-orm STATIC
   ../../include/matador/query/criteria/logical_criteria.hpp
   ../../include/matador/query/criteria_evaluator.hpp
   ../../include/matador/query/fk_value_extractor.hpp
+  ../../include/matador/query/generator.hpp
   ../../include/matador/query/intermediates/executable_query.hpp
   ../../include/matador/query/intermediates/fetchable_query.hpp
   ../../include/matador/query/intermediates/query_alter_intermediate.hpp
@@ -53,10 +56,11 @@ add_library(matador-orm STATIC
   ../../include/matador/query/query_data.hpp
   ../../include/matador/query/query_intermediates.hpp
   ../../include/matador/query/query_part.hpp
+  ../../include/matador/query/query_utils.hpp
+  ../../include/matador/query/table.hpp
   ../../include/matador/query/value_extractor.hpp
   ../../include/matador/sql/abstract_sql_logger.hpp
   ../../include/matador/sql/backend_provider.hpp
-  ../../include/matador/sql/column.hpp
   ../../include/matador/sql/connection.hpp
   ../../include/matador/sql/connection_info.hpp
   ../../include/matador/sql/dialect.hpp
@@ -77,14 +81,16 @@ add_library(matador-orm STATIC
   ../../include/matador/sql/query_macro.hpp
   ../../include/matador/sql/query_result.hpp
   ../../include/matador/sql/record.hpp
+  ../../include/matador/sql/sql_functions.hpp
   ../../include/matador/sql/statement.hpp
-  ../../include/matador/sql/table.hpp
   orm/error_code.cpp
   orm/query_builder_exception.cpp
   orm/schema.cpp
   orm/session.cpp
   orm/session_query_builder.cpp
   query/attribute_string_writer.cpp
+  query/builder.cpp
+  query/column.cpp
   query/criteria/abstract_column_criteria.cpp
   query/criteria/between_criteria.cpp
   query/criteria/binary_criteria.cpp
@@ -94,6 +100,7 @@ add_library(matador-orm STATIC
   query/criteria/logical_criteria.cpp
   query/criteria/not_criteria.cpp
   query/criteria_evaluator.cpp
+  query/generator.cpp
   query/intermediates/executable_query.cpp
   query/intermediates/fetchable_query.cpp
   query/intermediates/query_alter_intermediate.cpp
@@ -129,16 +136,16 @@ add_library(matador-orm STATIC
   query/query.cpp
   query/query_compiler.cpp
   query/query_part.cpp
+  query/query_utils.cpp
+  query/table.cpp
   query/value_extractor.cpp
   sql/backend_provider.cpp
-  sql/column.cpp
   sql/connection.cpp
   sql/connection_info.cpp
   sql/connection_pool.cpp
   sql/dialect.cpp
   sql/dialect_builder.cpp
   sql/error_code.cpp
-  sql/executor.cpp
   sql/field.cpp
   sql/interface/connection_impl.cpp
   sql/interface/query_result_reader.cpp
@@ -151,9 +158,6 @@ add_library(matador-orm STATIC
   sql/record.cpp
   sql/statement.cpp
   sql/statement_cache.cpp
-  sql/table.cpp
-  ../../include/matador/query/generator.hpp
-  query/generator.cpp
 )
 
 target_include_directories(matador-orm