From a2914e837c6442db936fd035b49f60ee488df533 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 21 Nov 2012 13:11:43 +0200
Subject: Add dynamic multi-database query support

---
 odb/sqlite/traits.hxx | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'odb/sqlite/traits.hxx')

diff --git a/odb/sqlite/traits.hxx b/odb/sqlite/traits.hxx
index 20cd3f3..e6abf2d 100644
--- a/odb/sqlite/traits.hxx
+++ b/odb/sqlite/traits.hxx
@@ -293,7 +293,6 @@ namespace odb
     struct LIBODB_SQLITE_EXPORT c_string_value_traits
     {
       typedef const char* value_type;
-      typedef const char* query_type;
       typedef details::buffer image_type;
 
       static void
@@ -307,16 +306,19 @@ namespace odb
     struct LIBODB_SQLITE_EXPORT default_value_traits<const char*, id_text>:
       c_string_value_traits
     {
+      typedef const char* query_type;
     };
 
     template <std::size_t N>
     struct default_value_traits<char[N], id_text>: c_string_value_traits
     {
+      typedef char query_type[N];
     };
 
     template <std::size_t N>
     struct default_value_traits<const char[N], id_text>: c_string_value_traits
     {
+      typedef const char query_type[N];
     };
 
 #ifdef _WIN32
@@ -366,7 +368,6 @@ namespace odb
     struct LIBODB_SQLITE_EXPORT c_wstring_value_traits
     {
       typedef const wchar_t* value_type;
-      typedef const wchar_t* query_type;
       typedef details::buffer image_type;
 
       static void
@@ -383,6 +384,7 @@ namespace odb
     struct LIBODB_SQLITE_EXPORT default_value_traits<const wchar_t*, id_text>:
       c_wstring_value_traits
     {
+      typedef const wchar_t* query_type;
     };
 
     template <std::size_t N>
@@ -392,6 +394,7 @@ namespace odb
     struct default_value_traits<wchar_t[N], id_text>:
       c_wstring_value_traits
     {
+      typedef wchar_t query_type[N];
     };
 
     template <std::size_t N>
@@ -401,6 +404,7 @@ namespace odb
     struct default_value_traits<const wchar_t[N], id_text>:
       c_wstring_value_traits
     {
+      typedef const wchar_t query_type[N];
     };
 #endif // _WIN32
 
@@ -475,7 +479,7 @@ namespace odb
     {
     public:
       typedef char* value_type;
-      typedef const char* query_type;
+      typedef char query_type[N];
       typedef details::buffer image_type;
 
       static void
@@ -513,7 +517,7 @@ namespace odb
     {
     public:
       typedef unsigned char* value_type;
-      typedef const unsigned char* query_type;
+      typedef unsigned char query_type[N];
       typedef details::buffer image_type;
 
       static void
-- 
cgit v1.1