From 2077828442e58677a2af1d15c6d5266455e50cad Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 3 Nov 2011 10:11:24 +0200 Subject: Add support for mapping char[N] and unsigned char[N] types to BLOB New test: common/blob. --- odb/mysql/traits.cxx | 2 -- odb/mysql/traits.hxx | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) diff --git a/odb/mysql/traits.cxx b/odb/mysql/traits.cxx index 0727861..382c638 100644 --- a/odb/mysql/traits.cxx +++ b/odb/mysql/traits.cxx @@ -3,8 +3,6 @@ // copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC // license : GNU GPL v2; see accompanying LICENSE file -#include // std::memcpy, std::strlen - #include using namespace std; diff --git a/odb/mysql/traits.hxx b/odb/mysql/traits.hxx index 7994d59..8fdacb2 100644 --- a/odb/mysql/traits.hxx +++ b/odb/mysql/traits.hxx @@ -11,6 +11,7 @@ #include #include #include // std::size_t +#include // std::memcpy, std::memset, std::strlen #include #include @@ -553,6 +554,82 @@ namespace odb const value_type&); }; + // char[n] (buffer) specialization. + // + template + struct default_value_traits + { + public: + typedef char* value_type; + typedef const char* query_type; + typedef details::buffer image_type; + + static void + set_value (char* const& v, + const details::buffer& b, + std::size_t n, + bool is_null) + { + if (!is_null) + std::memcpy (v, b.data (), (n < N ? n : N)); + else + std::memset (v, 0, N); + } + + static void + set_image (details::buffer& b, + std::size_t& n, + bool& is_null, + const char* v) + { + is_null = false; + n = N; + + if (n > b.capacity ()) + b.capacity (n); + + std::memcpy (b.data (), v, n); + } + }; + + // unsigned char[n] (buffer) specialization. + // + template + struct default_value_traits + { + public: + typedef unsigned char* value_type; + typedef const unsigned char* query_type; + typedef details::buffer image_type; + + static void + set_value (unsigned char* const& v, + const details::buffer& b, + std::size_t n, + bool is_null) + { + if (!is_null) + std::memcpy (v, b.data (), (n < N ? n : N)); + else + std::memset (v, 0, N); + } + + static void + set_image (details::buffer& b, + std::size_t& n, + bool& is_null, + const unsigned char* v) + { + is_null = false; + n = N; + + if (n > b.capacity ()) + b.capacity (n); + + std::memcpy (b.data (), v, n); + } + }; + // // type_traits // -- cgit v1.1