source/orm/sql/column.cpp

@@ -19,7 +19,7 @@ column operator ""_col(const char *name, size_t len) {
     throw std::invalid_argument("Invalid column name: multiple dots found");
   }
 
-  return column{table{str.substr(0, pos)}, str.substr(pos + 1)};
+  return column{str.substr(0, pos), str.substr(pos + 1)};
 }
 
 column::column(const char *name, const std::string& as)

test/backends/QueryBasicTest.cpp

@@ -5,10 +5,9 @@
 #include "matador/object/repository.hpp"
 
 #include "matador/sql/connection.hpp"
-#include "matador/sql/dialect.hpp"
 #include "matador/sql/column_generator.hpp"
 
-#include "matador/query/criteria.hpp"
+#include "matador/query/condition.hpp"
 #include "matador/query/query.hpp"
 
 #include "matador/utils/basic_types.hpp"

test/backends/QueryRecordTest.cpp

@@ -3,7 +3,7 @@
 #include "matador/sql/column.hpp"
 #include "matador/sql/connection.hpp"
 
-#include "matador/query/criteria.hpp"
+#include "matador/query/condition.hpp"
 #include "matador/query/query.hpp"
 
 #include "matador/utils/types.hpp"

test/backends/QueryStatementTests.cpp

@@ -3,7 +3,7 @@
 #include "matador/sql/column.hpp"
 #include "matador/sql/connection.hpp"
 
-#include "matador/query/criteria.hpp"
+#include "matador/query/condition.hpp"
 #include "matador/query/query.hpp"
 
 #include "models/person.hpp"

test/backends/QueryTest.cpp

@@ -4,7 +4,7 @@
 
 #include "matador/sql/column_generator.hpp"
 
-#include "matador/query/criteria.hpp"
+#include "matador/query/condition.hpp"
 #include "matador/query/query.hpp"
 
 #include "QueryFixture.hpp"

test/backends/StatementTest.cpp

@@ -5,7 +5,7 @@
 #include "matador/sql/connection.hpp"
 #include "matador/sql/column_generator.hpp"
 
-#include "matador/query/criteria.hpp"
+#include "matador/query/condition.hpp"
 #include "matador/query/query.hpp"
 
 #include "matador/object/object_ptr.hpp"