util/traits: remove the last of query/util

CMakeLists.txt

@@ -40,10 +40,10 @@ add_library(cruft-db
     query/traits.hpp
     query/types.hpp
     query/update.hpp
-    query/util.hpp
 
     util/quote.hpp
     util/tuple.hpp
+    util/traits.hpp
 
     introspection/information_schema.hpp
     introspection/information_schema.cpp

query/binary.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "./fwd.hpp"
-#include "./util.hpp"
 #include "./expression.hpp"
 #include "./literal.hpp"
 #include "./traits.hpp"

query/expression.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "./util.hpp"
 #include "./types.hpp"
 #include "./fwd.hpp"
 

query/fwd.hpp

@@ -13,6 +13,15 @@ template <typename NativeT>
 struct literal_t;
 
 
+template <
+    typename ExpressionT,
+    typename FromT,
+    typename WhereT,
+    typename GroupT
+>
+struct select_t;
+
+
 enum class binaryop_type;
 
 template <binaryop_type OpT, typename A, typename B>

query/select.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "./util.hpp"
 #include "./expression.hpp"
 #include "./traits.hpp"
 
 #include "../util/tuple.hpp"
+#include "../util/traits.hpp"
 
 #include "../fixed/types.hpp"
 

tools/scratch.cpp

@@ -6,7 +6,6 @@
 #include "query/label.hpp"
 #include "query/select.hpp"
 #include "query/types.hpp"
-#include "query/util.hpp"
 #include "query/literal.hpp"
 #include "query/binary.hpp"
 

util/traits.hpp

@@ -1,7 +1,3 @@
-#pragma once
-
-#include "./fwd.hpp"
-
 #include <type_traits>
 
 
@@ -14,12 +10,3 @@ template <typename T> struct has_cvref<T volatile> : public std::true_type {};
 
 template <typename T>
 static constexpr auto has_cvref_v = has_cvref<T>::value;
-
-
-template <
-    typename ExpressionT,
-    typename FromT,
-    typename WhereT,
-    typename GroupT
->
-struct select_t;