split column expression into separate classes

source/orm/CMakeLists.txt

@@ -17,6 +17,17 @@ add_library(matador-orm STATIC
   ../../include/matador/query/criteria/like_criteria.hpp
   ../../include/matador/query/criteria/logical_criteria.hpp
   ../../include/matador/query/criteria_evaluator.hpp
+  ../../include/matador/query/database.hpp
+  ../../include/matador/query/error_code.hpp
+  ../../include/matador/query/expression/abstract_column_expression.hpp
+  ../../include/matador/query/expression/binary_column_expression.hpp
+  ../../include/matador/query/expression/column_expression.hpp
+  ../../include/matador/query/expression/expression_operators.hpp
+  ../../include/matador/query/expression/expression_visitor.hpp
+  ../../include/matador/query/expression/placeholder_expression.hpp
+  ../../include/matador/query/expression/table_column_expression.hpp
+  ../../include/matador/query/expression/value_expression.hpp
+  ../../include/matador/query/expression_evaluator.hpp
   ../../include/matador/query/fk_value_extractor.hpp
   ../../include/matador/query/generator.hpp
   ../../include/matador/query/insert_query_builder.hpp
@@ -47,6 +58,7 @@ add_library(matador-orm STATIC
   ../../include/matador/query/intermediates/query_select_intermediate.hpp
   ../../include/matador/query/intermediates/query_set_intermediate.hpp
   ../../include/matador/query/intermediates/query_update_intermediate.hpp
+  ../../include/matador/query/intermediates/query_values_intermediate.hpp
   ../../include/matador/query/intermediates/query_where_intermediate.hpp
   ../../include/matador/query/internal/basic_type_to_string_visitor.hpp
   ../../include/matador/query/internal/column_value_pair.hpp
@@ -54,11 +66,13 @@ add_library(matador-orm STATIC
   ../../include/matador/query/internal/string_builder_utils.hpp
   ../../include/matador/query/join_data.hpp
   ../../include/matador/query/key_value_generator.hpp
+  ../../include/matador/query/manual_pk_generator.hpp
   ../../include/matador/query/meta_table_macro.hpp
   ../../include/matador/query/meta_table_macro.hpp
   ../../include/matador/query/query.hpp
   ../../include/matador/query/query_builder.hpp
   ../../include/matador/query/query_collection_resolver.hpp
+  ../../include/matador/query/query_column.hpp
   ../../include/matador/query/query_data.hpp
   ../../include/matador/query/query_intermediates.hpp
   ../../include/matador/query/query_object_resolver.hpp
@@ -70,6 +84,7 @@ add_library(matador-orm STATIC
   ../../include/matador/query/table.hpp
   ../../include/matador/query/table_column.hpp
   ../../include/matador/query/table_constraint.hpp
+  ../../include/matador/query/table_pk_generator.hpp
   ../../include/matador/query/value_extractor.hpp
   ../../include/matador/sql/abstract_sql_logger.hpp
   ../../include/matador/sql/backend_provider.hpp
@@ -106,6 +121,7 @@ add_library(matador-orm STATIC
   ../../include/matador/sql/statement_cache.hpp
   orm/error_code.cpp
   orm/session.cpp
+  query/abstract_pk_generator.cpp
   query/attribute_string_writer.cpp
   query/basic_schema.cpp
   query/builder.cpp
@@ -119,6 +135,14 @@ add_library(matador-orm STATIC
   query/criteria/logical_criteria.cpp
   query/criteria/not_criteria.cpp
   query/criteria_evaluator.cpp
+  query/error_code.cpp
+  query/expression/binary_column_expression.cpp
+  query/expression/column_expression.cpp
+  query/expression/expression_operators.cpp
+  query/expression/placeholder_expression.cpp
+  query/expression/table_column_expression.cpp
+  query/expression/value_expression.cpp
+  query/expression_evaluator.cpp
   query/generator.cpp
   query/insert_query_builder.cpp
   query/intermediates/executable_query.cpp
@@ -147,6 +171,7 @@ add_library(matador-orm STATIC
   query/intermediates/query_select_intermediate.cpp
   query/intermediates/query_set_intermediate.cpp
   query/intermediates/query_update_intermediate.cpp
+  query/intermediates/query_values_intermediate.cpp
   query/intermediates/query_where_intermediate.cpp
   query/internal/basic_type_to_string_visitor.cpp
   query/internal/column_value_pair.cpp
@@ -154,6 +179,7 @@ add_library(matador-orm STATIC
   query/internal/query_result_impl.cpp
   query/internal/string_builder_utils.cpp
   query/key_value_generator.cpp
+  query/manual_pk_generator.cpp
   query/query.cpp
   query/query_builder.cpp
   query/query_builder_exception.cpp
@@ -166,6 +192,7 @@ add_library(matador-orm STATIC
   query/table.cpp
   query/table_column.cpp
   query/table_constraint.cpp
+  query/table_pk_generator.cpp
   query/value_extractor.cpp
   sql/backend_provider.cpp
   sql/connection.cpp
@@ -192,20 +219,6 @@ add_library(matador-orm STATIC
   sql/resolver_service.cpp
   sql/statement.cpp
   sql/statement_cache.cpp
-  ../../include/matador/query/database.hpp
-  query/abstract_pk_generator.cpp
-  ../../include/matador/query/manual_pk_generator.hpp
-  query/manual_pk_generator.cpp
-  ../../include/matador/query/table_pk_generator.hpp
-  query/table_pk_generator.cpp
-  ../../include/matador/query/intermediates/query_values_intermediate.hpp
-  query/intermediates/query_values_intermediate.cpp
-        ../../include/matador/query/error_code.hpp
-        query/error_code.cpp
-  ../../include/matador/query/column_expression.hpp
-  query/column_expression.cpp
-  ../../include/matador/query/abstract_column_expression.hpp
-  ../../include/matador/query/query_column.hpp
 )
 
 target_include_directories(matador-orm