From 3de8e4843bc85f9fc6e63c1a4fea6b57ff0351b6 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 27 Mar 2011 15:53:16 +0200 Subject: Add traits implementation for SQLite --- common/query/traits-mysql.hxx | 59 ++++++++++++++++++++++++++++++++++++++++++ common/query/traits-sqlite.hxx | 59 ++++++++++++++++++++++++++++++++++++++++++ common/query/traits.hxx | 54 +++++--------------------------------- 3 files changed, 124 insertions(+), 48 deletions(-) create mode 100644 common/query/traits-mysql.hxx create mode 100644 common/query/traits-sqlite.hxx diff --git a/common/query/traits-mysql.hxx b/common/query/traits-mysql.hxx new file mode 100644 index 0000000..cce99db --- /dev/null +++ b/common/query/traits-mysql.hxx @@ -0,0 +1,59 @@ +// file : common/query/traits-mysql.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TRAITS_MYSQL_HXX +#define TRAITS_MYSQL_HXX + +#include +#include // std::auto_ptr +#include // std::memcpy + +#include + +namespace odb +{ + namespace mysql + { + template <> + class value_traits, details::buffer, id_string> + { + public: + typedef std::auto_ptr value_type; + typedef std::string query_type; + typedef details::buffer image_type; + + static void + set_value (std::auto_ptr& v, + const details::buffer& b, + std::size_t n, + bool is_null) + { + v.reset (is_null ? 0 : new std::string (b.data (), n)); + } + + static void + set_image (details::buffer& b, + std::size_t& n, + bool& is_null, + const std::auto_ptr& v) + { + is_null = v.get () == 0; + + if (!is_null) + { + n = v->size (); + + if (n > b.capacity ()) + b.capacity (n); + + if (n != 0) + std::memcpy (b.data (), v->c_str (), n); + } + } + }; + } +} + +#endif // TRAITS_MYSQL_HXX diff --git a/common/query/traits-sqlite.hxx b/common/query/traits-sqlite.hxx new file mode 100644 index 0000000..57cf9c2 --- /dev/null +++ b/common/query/traits-sqlite.hxx @@ -0,0 +1,59 @@ +// file : common/query/traits-sqlite.hxx +// author : Boris Kolpackov +// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +#ifndef TRAITS_SQLITE_HXX +#define TRAITS_SQLITE_HXX + +#include +#include // std::auto_ptr +#include // std::memcpy + +#include + +namespace odb +{ + namespace sqlite + { + template <> + class value_traits, details::buffer, id_text> + { + public: + typedef std::auto_ptr value_type; + typedef std::string query_type; + typedef details::buffer image_type; + + static void + set_value (std::auto_ptr& v, + const details::buffer& b, + std::size_t n, + bool is_null) + { + v.reset (is_null ? 0 : new std::string (b.data (), n)); + } + + static void + set_image (details::buffer& b, + std::size_t& n, + bool& is_null, + const std::auto_ptr& v) + { + is_null = v.get () == 0; + + if (!is_null) + { + n = v->size (); + + if (n > b.capacity ()) + b.capacity (n); + + if (n != 0) + std::memcpy (b.data (), v->c_str (), n); + } + } + }; + } +} + +#endif // TRAITS_SQLITE_HXX diff --git a/common/query/traits.hxx b/common/query/traits.hxx index 097f785..ce8b3e6 100644 --- a/common/query/traits.hxx +++ b/common/query/traits.hxx @@ -6,54 +6,12 @@ #ifndef TRAITS_HXX #define TRAITS_HXX -#include -#include // std::auto_ptr -#include // std::memcpy +#include -#include - -namespace odb -{ - namespace mysql - { - template <> - class value_traits, details::buffer, id_string> - { - public: - typedef std::auto_ptr value_type; - typedef std::string query_type; - typedef details::buffer image_type; - - static void - set_value (std::auto_ptr& v, - const details::buffer& b, - std::size_t n, - bool is_null) - { - v.reset (is_null ? 0 : new std::string (b.data (), n)); - } - - static void - set_image (details::buffer& b, - std::size_t& n, - bool& is_null, - const std::auto_ptr& v) - { - is_null = v.get () == 0; - - if (!is_null) - { - n = v->size (); - - if (n > b.capacity ()) - b.capacity (n); - - if (n != 0) - std::memcpy (b.data (), v->c_str (), n); - } - } - }; - } -} +#if defined(DATABASE_MYSQL) +# include "traits-mysql.hxx" +#elif defined(DATABASE_SQLITE) +# include "traits-sqlite.hxx" +#endif #endif // TRAITS_HXX -- cgit v1.1