Add support for custom database type mapping

New pragma qualifier, map, and specifiers: as, to, from. New tests:
<database>/custom.

5 files changed, 137 insertions, 44 deletions

diff --git a/odb/pgsql/details/conversion.hxx b/odb/pgsql/details/conversion.hxx
new file mode 100644
index 0000000..230be2a
--- /dev/null
+++ b/odb/pgsql/details/conversion.hxx
@@ -0,0 +1,59 @@
+// file      : odb/pgsql/details/conversion.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_PGSQL_DETAILS_CONVERSION_HXX
+#define ODB_PGSQL_DETAILS_CONVERSION_HXX
+
+#include <odb/pgsql/traits.hxx>
+
+#include <odb/details/meta/answer.hxx>
+
+namespace odb
+{
+  // @@ Revise this.
+  //
+  namespace details {}
+
+  namespace pgsql
+  {
+    namespace details
+    {
+      using namespace odb::details;
+
+      // Detect whether conversion is specified in type_traits.
+      //
+      template <typename T>
+      meta::yes
+      conversion_p_test (typename type_traits<T>::conversion*);
+
+      template <typename T>
+      meta::no
+      conversion_p_test (...);
+
+      template <typename T>
+      struct conversion_p
+      {
+        static const bool value =
+          sizeof (conversion_p_test<T> (0)) == sizeof (meta::yes);
+      };
+
+      template <typename T, bool = conversion_p<T>::value>
+      struct conversion;
+
+      template <typename T>
+      struct conversion<T, true>
+      {
+        static const char* to () {return type_traits<T>::conversion::to ();}
+      };
+
+      template <typename T>
+      struct conversion<T, false>
+      {
+        static const char* to () {return 0;}
+      };
+    }
+  }
+}
+
+#endif // ODB_PGSQL_DETAILS_CONVERSION_HXX
diff --git a/odb/pgsql/query.cxx b/odb/pgsql/query.cxx
index e3e4d24..9d50c3b 100644
--- a/odb/pgsql/query.cxx
+++ b/odb/pgsql/query.cxx
@@ -187,10 +187,13 @@ namespace odb
     }
 
     void query::
-    add (details::shared_ptr<query_param> p)
+    add (details::shared_ptr<query_param> p, const char* conv)
     {
       clause_.push_back (clause_part (clause_part::param));
 
+      if (conv != 0)
+        clause_.back ().part = conv;
+
       parameters_.push_back (p);
       bind_.push_back (bind ());
       binding_.bind = &bind_[0];
@@ -354,8 +357,22 @@ namespace odb
 
             ostringstream os;
             os << param++;
+
+            // Add the conversion expression, if any.
+            //
+            string::size_type p;
+            if (!i->part.empty ())
+            {
+              p = i->part.find ("(?)");
+              r.append (i->part, 0, p);
+            }
+
             r += '$';
             r += os.str ();
+
+            if (!i->part.empty ())
+              r.append (i->part, p + 3, string::npos);
+
             break;
           }
         case clause_part::native:
diff --git a/odb/pgsql/query.hxx b/odb/pgsql/query.hxx
index f00d232..0b5ff55 100644
--- a/odb/pgsql/query.hxx
+++ b/odb/pgsql/query.hxx
@@ -23,6 +23,7 @@
 #include <odb/details/shared-ptr.hxx>
 
 #include <odb/pgsql/details/export.hxx>
+#include <odb/pgsql/details/conversion.hxx>
 
 namespace odb
 {
@@ -103,7 +104,7 @@ namespace odb
         clause_part (bool p): kind (boolean), bool_part (p) {}
 
         kind_type kind;
-        std::string part;
+        std::string part; // If kind is param, then part is conversion expr.
         bool bool_part;
       };
 
@@ -146,7 +147,8 @@ namespace odb
       query (val_bind<T> v)
         : binding_ (0, 0), native_binding_ (0, 0, 0, 0)
       {
-        append<T, type_traits<T>::db_type_id> (v);
+        append<T, type_traits<T>::db_type_id> (
+          v, details::conversion<T>::to ());
       }
 
       template <typename T>
@@ -154,7 +156,8 @@ namespace odb
       query (ref_bind<T> r)
         : binding_ (0, 0), native_binding_ (0, 0, 0, 0)
       {
-        append<T, type_traits<T>::db_type_id> (r);
+        append<T, type_traits<T>::db_type_id> (
+          r, details::conversion<T>::to ());
       }
 
       template <database_type_id ID>
@@ -237,7 +240,8 @@ namespace odb
       query&
       operator+= (val_bind<T> v)
       {
-        append<T, type_traits<T>::db_type_id> (v);
+        append<T, type_traits<T>::db_type_id> (
+          v, details::conversion<T>::to ());
         return *this;
       }
 
@@ -245,18 +249,19 @@ namespace odb
       query&
       operator+= (ref_bind<T> r)
       {
-        append<T, type_traits<T>::db_type_id> (r);
+        append<T, type_traits<T>::db_type_id> (
+          r, details::conversion<T>::to ());
         return *this;
       }
 
     public:
       template <typename T, database_type_id ID>
       void
-      append (val_bind<T>);
+      append (val_bind<T>, const char* conv);
 
       template <typename T, database_type_id ID>
       void
-      append (ref_bind<T>);
+      append (ref_bind<T>, const char* conv);
 
       void
       append (const std::string& native);
@@ -266,7 +271,7 @@ namespace odb
 
     private:
       void
-      add (details::shared_ptr<query_param>);
+      add (details::shared_ptr<query_param>, const char* conv);
 
     private:
       typedef std::vector<clause_part> clause_type;
@@ -414,10 +419,11 @@ namespace odb
     template <typename T, database_type_id ID>
     struct query_column
     {
-      // Note that we keep shalow copies of the table and column names.
+      // Note that we keep shallow copies of the table, column, and conversion
+      // expression. The latter can be NULL.
       //
-      query_column (const char* table, const char* column)
-          : table_ (table), column_ (column)
+      query_column (const char* table, const char* column, const char* conv)
+          : table_ (table), column_ (column), conversion_ (conv)
       {
       }
 
@@ -433,6 +439,14 @@ namespace odb
         return column_;
       }
 
+      // Can be NULL.
+      //
+      const char*
+      conversion () const
+      {
+        return conversion_;
+      }
+
       // is_null, is_not_null
       //
     public:
@@ -485,7 +499,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "=";
-        q.append<T, ID> (v);
+        q.append<T, ID> (v, conversion_);
         return q;
       }
 
@@ -502,7 +516,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "=";
-        q.append<T, ID> (r);
+        q.append<T, ID> (r, conversion_);
         return q;
       }
 
@@ -570,7 +584,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "!=";
-        q.append<T, ID> (v);
+        q.append<T, ID> (v, conversion_);
         return q;
       }
 
@@ -587,7 +601,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "!=";
-        q.append<T, ID> (r);
+        q.append<T, ID> (r, conversion_);
         return q;
       }
 
@@ -655,7 +669,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "<";
-        q.append<T, ID> (v);
+        q.append<T, ID> (v, conversion_);
         return q;
       }
 
@@ -672,7 +686,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "<";
-        q.append<T, ID> (r);
+        q.append<T, ID> (r, conversion_);
         return q;
       }
 
@@ -740,7 +754,7 @@ namespace odb
       {
         query q (table_, column_);
         q += ">";
-        q.append<T, ID> (v);
+        q.append<T, ID> (v, conversion_);
         return q;
       }
 
@@ -757,7 +771,7 @@ namespace odb
       {
         query q (table_, column_);
         q += ">";
-        q.append<T, ID> (r);
+        q.append<T, ID> (r, conversion_);
         return q;
       }
 
@@ -825,7 +839,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "<=";
-        q.append<T, ID> (v);
+        q.append<T, ID> (v, conversion_);
         return q;
       }
 
@@ -842,7 +856,7 @@ namespace odb
       {
         query q (table_, column_);
         q += "<=";
-        q.append<T, ID> (r);
+        q.append<T, ID> (r, conversion_);
         return q;
       }
 
@@ -910,7 +924,7 @@ namespace odb
       {
         query q (table_, column_);
         q += ">=";
-        q.append<T, ID> (v);
+        q.append<T, ID> (v, conversion_);
         return q;
       }
 
@@ -927,7 +941,7 @@ namespace odb
       {
         query q (table_, column_);
         q += ">=";
-        q.append<T, ID> (r);
+        q.append<T, ID> (r, conversion_);
         return q;
       }
 
@@ -1071,6 +1085,7 @@ namespace odb
     private:
       const char* table_;
       const char* column_;
+      const char* conversion_;
     };
 
     // Provide operator+() for using columns to construct native
diff --git a/odb/pgsql/query.ixx b/odb/pgsql/query.ixx
index 9d28032..d850c1a 100644
--- a/odb/pgsql/query.ixx
+++ b/odb/pgsql/query.ixx
@@ -8,20 +8,22 @@ namespace odb
   {
     template <typename T, database_type_id ID>
     inline void query::
-    append (val_bind<T> v)
+    append (val_bind<T> v, const char* conv)
     {
       add (
         details::shared_ptr<query_param> (
-          new (details::shared) query_param_impl<T, ID> (v)));
+          new (details::shared) query_param_impl<T, ID> (v)),
+        conv);
     }
 
     template <typename T, database_type_id ID>
     inline void query::
-    append (ref_bind<T> r)
+    append (ref_bind<T> r, const char* conv)
     {
       add (
         details::shared_ptr<query_param> (
-          new (details::shared) query_param_impl<T, ID> (r)));
+          new (details::shared) query_param_impl<T, ID> (r)),
+        conv);
     }
   }
 }
diff --git a/odb/pgsql/query.txx b/odb/pgsql/query.txx
index d4fab74..274e703 100644
--- a/odb/pgsql/query.txx
+++ b/odb/pgsql/query.txx
@@ -19,7 +19,7 @@ namespace odb
       //
       append (c.table (), c.column ());
       append ("=");
-      append<bool, ID> (val_bind<bool> (true));
+      append<bool, ID> (val_bind<bool> (true), c.conversion ());
     }
 
     // query_column
@@ -30,9 +30,9 @@ namespace odb
     {
       query q (table_, column_);
       q += "IN (";
-      q.append<T, ID> (val_bind<T> (v1));
+      q.append<T, ID> (val_bind<T> (v1), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v2));
+      q.append<T, ID> (val_bind<T> (v2), conversion_);
       q += ")";
       return q;
     }
@@ -43,11 +43,11 @@ namespace odb
     {
       query q (table_, column_);
       q += "IN (";
-      q.append<T, ID> (val_bind<T> (v1));
+      q.append<T, ID> (val_bind<T> (v1), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v2));
+      q.append<T, ID> (val_bind<T> (v2), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v3));
+      q.append<T, ID> (val_bind<T> (v3), conversion_);
       q += ")";
       return q;
     }
@@ -58,13 +58,13 @@ namespace odb
     {
       query q (table_, column_);
       q += "IN (";
-      q.append<T, ID> (val_bind<T> (v1));
+      q.append<T, ID> (val_bind<T> (v1), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v2));
+      q.append<T, ID> (val_bind<T> (v2), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v3));
+      q.append<T, ID> (val_bind<T> (v3), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v4));
+      q.append<T, ID> (val_bind<T> (v4), conversion_);
       q += ")";
       return q;
     }
@@ -75,15 +75,15 @@ namespace odb
     {
       query q (table_, column_);
       q += "IN (";
-      q.append<T, ID> (val_bind<T> (v1));
+      q.append<T, ID> (val_bind<T> (v1), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v2));
+      q.append<T, ID> (val_bind<T> (v2), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v3));
+      q.append<T, ID> (val_bind<T> (v3), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v4));
+      q.append<T, ID> (val_bind<T> (v4), conversion_);
       q += ",";
-      q.append<T, ID> (val_bind<T> (v5));
+      q.append<T, ID> (val_bind<T> (v5), conversion_);
       q += ")";
       return q;
     }
@@ -101,7 +101,7 @@ namespace odb
         if (i != begin)
           q += ",";
 
-        q.append<T, ID> (val_bind<T> (*i));
+        q.append<T, ID> (val_bind<T> (*i), conversion_);
       }
       q += ")";
       return q;