From 1568e64c2135bf245de960ae614bd3533c6d157a Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 10 Jul 2012 15:17:14 +0200 Subject: Add support for custom database type mapping New pragma qualifier, map, and specifiers: as, to, from. New tests: /custom. --- odb/sqlite/details/conversion.hxx | 59 +++++++++++++++++++++++++++++++++++++ odb/sqlite/query.cxx | 19 +++++++++++- odb/sqlite/query.hxx | 62 ++++++++++++++++++++++++--------------- odb/sqlite/query.ixx | 10 ++++--- odb/sqlite/query.txx | 32 ++++++++++---------- 5 files changed, 138 insertions(+), 44 deletions(-) create mode 100644 odb/sqlite/details/conversion.hxx diff --git a/odb/sqlite/details/conversion.hxx b/odb/sqlite/details/conversion.hxx new file mode 100644 index 0000000..9daf35c --- /dev/null +++ b/odb/sqlite/details/conversion.hxx @@ -0,0 +1,59 @@ +// file : odb/sqlite/details/conversion.hxx +// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef ODB_SQLITE_DETAILS_CONVERSION_HXX +#define ODB_SQLITE_DETAILS_CONVERSION_HXX + +#include + +#include + +namespace odb +{ + // @@ Revise this. + // + namespace details {} + + namespace sqlite + { + namespace details + { + using namespace odb::details; + + // Detect whether conversion is specified in type_traits. + // + template + meta::yes + conversion_p_test (typename type_traits::conversion*); + + template + meta::no + conversion_p_test (...); + + template + struct conversion_p + { + static const bool value = + sizeof (conversion_p_test (0)) == sizeof (meta::yes); + }; + + template ::value> + struct conversion; + + template + struct conversion + { + static const char* to () {return type_traits::conversion::to ();} + }; + + template + struct conversion + { + static const char* to () {return 0;} + }; + } + } +} + +#endif // ODB_SQLITE_DETAILS_CONVERSION_HXX diff --git a/odb/sqlite/query.cxx b/odb/sqlite/query.cxx index 0adf8d9..2c0706a 100644 --- a/odb/sqlite/query.cxx +++ b/odb/sqlite/query.cxx @@ -188,9 +188,13 @@ namespace odb } void query:: - add (details::shared_ptr p) + add (details::shared_ptr p, const char* conv) { clause_.push_back (clause_part (clause_part::param)); + + if (conv != 0) + clause_.back ().part = conv; + parameters_->add (p); } @@ -287,7 +291,20 @@ namespace odb if (last != ' ' && last != '(') r += ' '; + // 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 += '?'; + + if (!i->part.empty ()) + r.append (i->part, p + 3, string::npos); + break; } case clause_part::native: diff --git a/odb/sqlite/query.hxx b/odb/sqlite/query.hxx index 54e0b2b..ee05feb 100644 --- a/odb/sqlite/query.hxx +++ b/odb/sqlite/query.hxx @@ -20,7 +20,9 @@ #include #include #include + #include +#include namespace odb { @@ -129,7 +131,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; }; @@ -172,7 +174,8 @@ namespace odb query (val_bind v) : parameters_ (new (details::shared) query_params) { - append::db_type_id> (v); + append::db_type_id> ( + v, details::conversion::to ()); } template @@ -180,7 +183,8 @@ namespace odb query (ref_bind r) : parameters_ (new (details::shared) query_params) { - append::db_type_id> (r); + append::db_type_id> ( + r, details::conversion::to ()); } template @@ -254,7 +258,8 @@ namespace odb query& operator+= (val_bind v) { - append::db_type_id> (v); + append::db_type_id> ( + v, details::conversion::to ()); return *this; } @@ -262,18 +267,19 @@ namespace odb query& operator+= (ref_bind r) { - append::db_type_id> (r); + append::db_type_id> ( + r, details::conversion::to ()); return *this; } public: template void - append (val_bind); + append (val_bind, const char* conv); template void - append (ref_bind); + append (ref_bind, const char* conv); void append (const std::string& native); @@ -283,7 +289,7 @@ namespace odb private: void - add (details::shared_ptr); + add (details::shared_ptr, const char* conv); private: typedef std::vector clause_type; @@ -421,10 +427,11 @@ namespace odb template 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) { } @@ -440,6 +447,14 @@ namespace odb return column_; } + // Can be NULL. + // + const char* + conversion () const + { + return conversion_; + } + // is_null, is_not_null // public: @@ -492,7 +507,7 @@ namespace odb { query q (table_, column_); q += "="; - q.append (v); + q.append (v, conversion_); return q; } @@ -509,7 +524,7 @@ namespace odb { query q (table_, column_); q += "="; - q.append (r); + q.append (r, conversion_); return q; } @@ -577,7 +592,7 @@ namespace odb { query q (table_, column_); q += "!="; - q.append (v); + q.append (v, conversion_); return q; } @@ -594,7 +609,7 @@ namespace odb { query q (table_, column_); q += "!="; - q.append (r); + q.append (r, conversion_); return q; } @@ -662,7 +677,7 @@ namespace odb { query q (table_, column_); q += "<"; - q.append (v); + q.append (v, conversion_); return q; } @@ -679,7 +694,7 @@ namespace odb { query q (table_, column_); q += "<"; - q.append (r); + q.append (r, conversion_); return q; } @@ -747,7 +762,7 @@ namespace odb { query q (table_, column_); q += ">"; - q.append (v); + q.append (v, conversion_); return q; } @@ -764,7 +779,7 @@ namespace odb { query q (table_, column_); q += ">"; - q.append (r); + q.append (r, conversion_); return q; } @@ -832,7 +847,7 @@ namespace odb { query q (table_, column_); q += "<="; - q.append (v); + q.append (v, conversion_); return q; } @@ -849,7 +864,7 @@ namespace odb { query q (table_, column_); q += "<="; - q.append (r); + q.append (r, conversion_); return q; } @@ -917,7 +932,7 @@ namespace odb { query q (table_, column_); q += ">="; - q.append (v); + q.append (v, conversion_); return q; } @@ -934,7 +949,7 @@ namespace odb { query q (table_, column_); q += ">="; - q.append (r); + q.append (r, conversion_); return q; } @@ -1078,6 +1093,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/sqlite/query.ixx b/odb/sqlite/query.ixx index dcd1ebe..113b376 100644 --- a/odb/sqlite/query.ixx +++ b/odb/sqlite/query.ixx @@ -20,20 +20,22 @@ namespace odb template inline void query:: - append (val_bind v) + append (val_bind v, const char* conv) { add ( details::shared_ptr ( - new (details::shared) query_param_impl (v))); + new (details::shared) query_param_impl (v)), + conv); } template inline void query:: - append (ref_bind r) + append (ref_bind r, const char* conv) { add ( details::shared_ptr ( - new (details::shared) query_param_impl (r))); + new (details::shared) query_param_impl (r)), + conv); } } } diff --git a/odb/sqlite/query.txx b/odb/sqlite/query.txx index b095d52..ba3fac1 100644 --- a/odb/sqlite/query.txx +++ b/odb/sqlite/query.txx @@ -19,7 +19,7 @@ namespace odb // append (c.table (), c.column ()); append ("="); - append (val_bind (true)); + append (val_bind (true), c.conversion ()); } // query_column @@ -30,9 +30,9 @@ namespace odb { query q (table_, column_); q += "IN ("; - q.append (val_bind (v1)); + q.append (val_bind (v1), conversion_); q += ","; - q.append (val_bind (v2)); + q.append (val_bind (v2), conversion_); q += ")"; return q; } @@ -43,11 +43,11 @@ namespace odb { query q (table_, column_); q += "IN ("; - q.append (val_bind (v1)); + q.append (val_bind (v1), conversion_); q += ","; - q.append (val_bind (v2)); + q.append (val_bind (v2), conversion_); q += ","; - q.append (val_bind (v3)); + q.append (val_bind (v3), conversion_); q += ")"; return q; } @@ -58,13 +58,13 @@ namespace odb { query q (table_, column_); q += "IN ("; - q.append (val_bind (v1)); + q.append (val_bind (v1), conversion_); q += ","; - q.append (val_bind (v2)); + q.append (val_bind (v2), conversion_); q += ","; - q.append (val_bind (v3)); + q.append (val_bind (v3), conversion_); q += ","; - q.append (val_bind (v4)); + q.append (val_bind (v4), conversion_); q += ")"; return q; } @@ -75,15 +75,15 @@ namespace odb { query q (table_, column_); q += "IN ("; - q.append (val_bind (v1)); + q.append (val_bind (v1), conversion_); q += ","; - q.append (val_bind (v2)); + q.append (val_bind (v2), conversion_); q += ","; - q.append (val_bind (v3)); + q.append (val_bind (v3), conversion_); q += ","; - q.append (val_bind (v4)); + q.append (val_bind (v4), conversion_); q += ","; - q.append (val_bind (v5)); + q.append (val_bind (v5), conversion_); q += ")"; return q; } @@ -101,7 +101,7 @@ namespace odb if (i != begin) q += ","; - q.append (val_bind (*i)); + q.append (val_bind (*i), conversion_); } q += ")"; return q; -- cgit v1.1