aboutsummaryrefslogtreecommitdiff
path: root/mysql/types
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-07-28 09:45:36 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-07-28 09:45:36 +0200
commitab1487672afb5180bd17c9d26b35196bd06f6cda (patch)
tree51cc25e1b88cb0abc325a822f57845a98a22cb8a /mysql/types
parenta461f6d8bc6c314249057ad48fa8dd1cea1d8b40 (diff)
Add value_traits specializations for std::vector<char>
This allows using it as a buffer for BLOB mapping.
Diffstat (limited to 'mysql/types')
-rw-r--r--mysql/types/driver.cxx19
-rw-r--r--mysql/types/test.hxx3
-rw-r--r--mysql/types/traits.hxx39
3 files changed, 13 insertions, 48 deletions
diff --git a/mysql/types/driver.cxx b/mysql/types/driver.cxx
index 6625adf..f397084 100644
--- a/mysql/types/driver.cxx
+++ b/mysql/types/driver.cxx
@@ -54,24 +54,25 @@ main (int argc, char* argv[])
o.year_ = 2010;
string short_str (128, 's');
- buffer short_buf (short_str.c_str (), short_str.size ());
string medium_str (250, 'm');
- buffer medium_buf (medium_str.c_str (), medium_str.size ());
string long_str (2040, 'l');
- buffer long_buf (long_str.c_str (), long_str.size ());
+
+ const char* sb (short_str.c_str ()), *se (sb + short_str.size ());
+ const char* mb (medium_str.c_str ()), *me (mb + medium_str.size ());
+ const char* lb (long_str.c_str ()), *le (lb + long_str.size ());
o.char_ = short_str;
- o.binary_ = short_buf;
+ o.binary_.assign (sb, se);
o.varchar_ = medium_str;
- o.varbinary_ = medium_buf;
+ o.varbinary_.assign (mb, me);
o.tinytext_ = short_str;
- o.tinyblob_ = short_buf;
+ o.tinyblob_.assign (sb, se);
o.text_ = long_str;
- o.blob_ = long_buf;
+ o.blob_.assign (lb, le);
o.mediumtext_ = long_str;
- o.mediumblob_ = long_buf;
+ o.mediumblob_.assign (lb, le);
o.longtext_ = long_str;
- o.longblob_ = long_buf;
+ o.longblob_.assign (lb, le);
o.bit_.a = 1;
o.bit_.b = 0;
diff --git a/mysql/types/test.hxx b/mysql/types/test.hxx
index 209782e..1f6b771 100644
--- a/mysql/types/test.hxx
+++ b/mysql/types/test.hxx
@@ -8,11 +8,12 @@
#include <set>
#include <string>
+#include <vector>
#include <memory> // std::auto_ptr
#include <odb/core.hxx>
-#include <common/buffer.hxx>
+typedef std::vector<char> buffer;
struct date_time
{
diff --git a/mysql/types/traits.hxx b/mysql/types/traits.hxx
index 2698afc..09d50a1 100644
--- a/mysql/types/traits.hxx
+++ b/mysql/types/traits.hxx
@@ -10,7 +10,7 @@
#include <odb/mysql/traits.hxx>
-#include "test.hxx" // date_time, buffer, string_ptr
+#include "test.hxx" // date_time, string_ptr
namespace odb
{
@@ -57,43 +57,6 @@ namespace odb
};
template <>
- class value_traits<buffer, id_blob>
- {
- public:
- typedef buffer value_type;
- typedef buffer query_type;
- typedef details::buffer image_type;
-
- static void
- set_value (buffer& v,
- const details::buffer& b,
- std::size_t n,
- bool is_null)
- {
- if (!is_null)
- v.assign (b.data (), n);
- else
- v.assign (0, 0);
- }
-
- static void
- set_image (details::buffer& b,
- std::size_t& n,
- bool& is_null,
- const buffer& v)
- {
- is_null = false;
- n = v.size ();
-
- if (n > b.capacity ())
- b.capacity (n);
-
- if (n != 0)
- std::memcpy (b.data (), v.data (), n);
- }
- };
-
- template <>
class value_traits<bitfield, id_bit>
{
public: