Let the DB implementation define a specialization of query

2 files changed, 3 insertions, 26 deletions

diff --git a/odb/forward.hxx b/odb/forward.hxx
index 7c1fb27..8e91407 100644
--- a/odb/forward.hxx
+++ b/odb/forward.hxx
@@ -12,9 +12,6 @@ namespace odb
   class transaction;
 
   template <typename T>
-  class query;
-
-  template <typename T>
   class shared_ptr;
 
   class access
diff --git a/odb/query.hxx b/odb/query.hxx
index d52e1cc..56af84b 100644
--- a/odb/query.hxx
+++ b/odb/query.hxx
@@ -6,33 +6,13 @@
 #ifndef ODB_QUERY_HXX
 #define ODB_QUERY_HXX
 
-#include <string>
-
-#include <odb/forward.hxx>
 #include <odb/traits.hxx>
 
 namespace odb
 {
-  template <typename T>
-  class query: public object_traits<T>::query_type
-  {
-  public:
-    typedef typename object_traits<T>::query_type base_type;
-
-    query ()
-    {
-    }
-
-    query (const std::string& q)
-        : base_type (q)
-    {
-    }
-
-    query (const base_type& q)
-        : base_type (q)
-    {
-    }
-  };
+  template <typename T,
+            typename Q = typename object_traits<T>::query_base_type>
+  class query;
 }
 
 #endif // ODB_QUERY_HXX