Support for Boost uuid persistence

New Boost sub-profile: uuid. New test: boost/common/uuid. Updated the
boost example to use uuid as an object id.

17 files changed, 561 insertions, 0 deletions

diff --git a/odb/boost.options b/odb/boost.options
index 460dd77..6cd563e 100644
--- a/odb/boost.options
+++ b/odb/boost.options
@@ -7,3 +7,5 @@
 --profile boost/unordered
 --profile boost/date-time
 --profile boost/multi-index
+--profile boost/uuid
+
diff --git a/odb/boost/uuid.options b/odb/boost/uuid.options
new file mode 100644
index 0000000..e608de8
--- /dev/null
+++ b/odb/boost/uuid.options
@@ -0,0 +1,5 @@
+# file      : odb/boost/uuid.options
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/uuid/uuid
diff --git a/odb/boost/uuid/mssql/uuid-mapping.hxx b/odb/boost/uuid/mssql/uuid-mapping.hxx
new file mode 100644
index 0000000..ed3a88d
--- /dev/null
+++ b/odb/boost/uuid/mssql/uuid-mapping.hxx
@@ -0,0 +1,23 @@
+// file      : odb/boost/uuid/mssql/uuid-mapping.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_MSSQL_UUID_MAPPING_HXX
+#define ODB_BOOST_UUID_MSSQL_UUID_MAPPING_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <boost/uuid/uuid.hpp>
+
+// By default map boost::uuids::uuid to SQL Server UNIQUEIDENTIFIER and
+// use NULL to represent nil UUIDs. If NULL is disabled (e.g., at the
+// member level), then we store the nil UUID (i.e., all bytes are zero).
+//
+#pragma db value(boost::uuids::uuid) type("UNIQUEIDENTIFIER") null
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_MSSQL_UUID_MAPPING_HXX
diff --git a/odb/boost/uuid/mssql/uuid-traits.hxx b/odb/boost/uuid/mssql/uuid-traits.hxx
new file mode 100644
index 0000000..70efbb4
--- /dev/null
+++ b/odb/boost/uuid/mssql/uuid-traits.hxx
@@ -0,0 +1,67 @@
+// file      : odb/boost/uuid/mssql/uuid-traits.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_MSSQL_UUID_TRAITS_HXX
+#define ODB_BOOST_UUID_MSSQL_UUID_TRAITS_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/nil_generator.hpp>
+
+#include <odb/mssql/traits.hxx>
+
+namespace odb
+{
+  namespace mssql
+  {
+    template <>
+    class default_value_traits< ::boost::uuids::uuid, id_uniqueidentifier>
+    {
+    public:
+      typedef ::boost::uuids::uuid value_type;
+      typedef value_type query_type;
+      typedef uniqueidentifier image_type;
+
+      static void
+      set_value (value_type& v, const uniqueidentifier& i, bool is_null)
+      {
+        if (!is_null)
+          std::memcpy (v.data, &i, 16);
+        else
+          v = ::boost::uuids::nil_uuid ();
+      }
+
+      static void
+      set_image (uniqueidentifier& i, bool& is_null, const value_type& v)
+      {
+        // If we can, store nil as NULL. Otherwise, store it as a value.
+        //
+        is_null = is_null && v.is_nil ();
+
+        if (!is_null)
+          std::memcpy (&i, v.data, 16);
+      }
+    };
+
+    template <>
+    struct default_type_traits< ::boost::uuids::uuid>
+    {
+      static const database_type_id db_type_id = id_uniqueidentifier;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_MSSQL_UUID_TRAITS_HXX
diff --git a/odb/boost/uuid/mysql/uuid-mapping.hxx b/odb/boost/uuid/mysql/uuid-mapping.hxx
new file mode 100644
index 0000000..7654f62
--- /dev/null
+++ b/odb/boost/uuid/mysql/uuid-mapping.hxx
@@ -0,0 +1,23 @@
+// file      : odb/boost/uuid/mysql/uuid-mapping.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_MYSQL_UUID_MAPPING_HXX
+#define ODB_BOOST_UUID_MYSQL_UUID_MAPPING_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <boost/uuid/uuid.hpp>
+
+// By default map boost::uuids::uuid to MySQL BINARY(16) and use NULL to
+// represent nil UUIDs. If NULL is disabled (e.g., at the member level),
+// then we store the nil UUID (i.e., all bytes are zero).
+//
+#pragma db value(boost::uuids::uuid) type("BINARY(16)") null
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_MYSQL_UUID_MAPPING_HXX
diff --git a/odb/boost/uuid/mysql/uuid-traits.hxx b/odb/boost/uuid/mysql/uuid-traits.hxx
new file mode 100644
index 0000000..47d5fce
--- /dev/null
+++ b/odb/boost/uuid/mysql/uuid-traits.hxx
@@ -0,0 +1,83 @@
+// file      : odb/boost/uuid/mysql/uuid-traits.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_MYSQL_UUID_TRAITS_HXX
+#define ODB_BOOST_UUID_MYSQL_UUID_TRAITS_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+#include <cassert>
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/nil_generator.hpp>
+
+#include <odb/mysql/traits.hxx>
+
+namespace odb
+{
+  namespace mysql
+  {
+    template <>
+    struct default_value_traits< ::boost::uuids::uuid, id_blob>
+    {
+      typedef ::boost::uuids::uuid value_type;
+      typedef value_type query_type;
+      typedef details::buffer image_type;
+
+      static void
+      set_value (value_type& v,
+                 const details::buffer& b,
+                 std::size_t n,
+                 bool is_null)
+      {
+        if (!is_null)
+        {
+          assert (n == 16);
+          std::memcpy (v.data, b.data (), 16);
+        }
+        else
+          v = ::boost::uuids::nil_uuid ();
+      }
+
+      static void
+      set_image (details::buffer& b,
+                 std::size_t& n,
+                 bool& is_null,
+                 const value_type& v)
+      {
+        // If we can, store nil as NULL. Otherwise, store it as a value.
+        //
+        is_null = is_null && v.is_nil ();
+
+        if (!is_null)
+        {
+          n = 16;
+
+          if (n > b.capacity ())
+            b.capacity (n);
+
+          std::memcpy (b.data (), v.data, n);
+        }
+      }
+    };
+
+    template <>
+    struct default_type_traits< ::boost::uuids::uuid>
+    {
+      static const database_type_id db_type_id = id_blob;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_MYSQL_UUID_TRAITS_HXX
diff --git a/odb/boost/uuid/oracle/uuid-mapping.hxx b/odb/boost/uuid/oracle/uuid-mapping.hxx
new file mode 100644
index 0000000..f6c9087
--- /dev/null
+++ b/odb/boost/uuid/oracle/uuid-mapping.hxx
@@ -0,0 +1,23 @@
+// file      : odb/boost/uuid/oracle/uuid-mapping.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_ORACLE_UUID_MAPPING_HXX
+#define ODB_BOOST_UUID_ORACLE_UUID_MAPPING_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <boost/uuid/uuid.hpp>
+
+// By default map boost::uuids::uuid to Oracle RAW(16) and use NULL to
+// represent nil UUIDs. If NULL is disabled (e.g., at the member level),
+// then we store the nil UUID (i.e., all bytes are zero).
+//
+#pragma db value(boost::uuids::uuid) type("RAW(16)") null
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_ORACLE_UUID_MAPPING_HXX
diff --git a/odb/boost/uuid/oracle/uuid-traits.hxx b/odb/boost/uuid/oracle/uuid-traits.hxx
new file mode 100644
index 0000000..822165f
--- /dev/null
+++ b/odb/boost/uuid/oracle/uuid-traits.hxx
@@ -0,0 +1,79 @@
+// file      : odb/boost/uuid/oracle/uuid-traits.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_ORACLE_UUID_TRAITS_HXX
+#define ODB_BOOST_UUID_ORACLE_UUID_TRAITS_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+#include <cassert>
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/nil_generator.hpp>
+
+#include <odb/oracle/traits.hxx>
+
+namespace odb
+{
+  namespace oracle
+  {
+    template <>
+    struct default_value_traits< ::boost::uuids::uuid, id_raw>
+    {
+    public:
+      typedef ::boost::uuids::uuid value_type;
+      typedef value_type query_type;
+      typedef char* image_type;
+
+      static void
+      set_value (value_type& v, const char* b, std::size_t n, bool is_null)
+      {
+        if (!is_null)
+        {
+          assert (n == 16);
+          std::memcpy (v.data, b, 16);
+        }
+        else
+          v = ::boost::uuids::nil_uuid ();
+      }
+
+      static void
+      set_image (char* b,
+                 std::size_t c,
+                 std::size_t& n,
+                 bool& is_null,
+                 const value_type& v)
+      {
+        // If we can, store nil as NULL. Otherwise, store it as a value.
+        //
+        is_null = is_null && v.is_nil ();
+
+        if (!is_null)
+        {
+          n = 16;
+          assert (c >= n);
+          std::memcpy (b, v.data, n);
+        }
+      }
+    };
+
+    template <>
+    struct default_type_traits< ::boost::uuids::uuid>
+    {
+      static const database_type_id db_type_id = id_raw;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_ORACLE_UUID_TRAITS_HXX
diff --git a/odb/boost/uuid/pgsql/uuid-mapping.hxx b/odb/boost/uuid/pgsql/uuid-mapping.hxx
new file mode 100644
index 0000000..1d92e18
--- /dev/null
+++ b/odb/boost/uuid/pgsql/uuid-mapping.hxx
@@ -0,0 +1,23 @@
+// file      : odb/boost/uuid/pgsql/uuid-mapping.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_PGSQL_UUID_MAPPING_HXX
+#define ODB_BOOST_UUID_PGSQL_UUID_MAPPING_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <boost/uuid/uuid.hpp>
+
+// By default map boost::uuids::uuid to PostgreSQL UUID and use NULL to
+// represent nil UUIDs. If NULL is disabled (e.g., at the member level),
+// then we store the nil UUID (i.e., all bytes are zero).
+//
+#pragma db value(boost::uuids::uuid) type("UUID") null
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_PGSQL_UUID_MAPPING_HXX
diff --git a/odb/boost/uuid/pgsql/uuid-traits.hxx b/odb/boost/uuid/pgsql/uuid-traits.hxx
new file mode 100644
index 0000000..675452c
--- /dev/null
+++ b/odb/boost/uuid/pgsql/uuid-traits.hxx
@@ -0,0 +1,67 @@
+// file      : odb/boost/uuid/pgsql/uuid-traits.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_PGSQL_UUID_TRAITS_HXX
+#define ODB_BOOST_UUID_PGSQL_UUID_TRAITS_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/nil_generator.hpp>
+
+#include <odb/pgsql/traits.hxx>
+
+namespace odb
+{
+  namespace pgsql
+  {
+    template <>
+    class default_value_traits< ::boost::uuids::uuid, id_uuid>
+    {
+    public:
+      typedef ::boost::uuids::uuid value_type;
+      typedef value_type query_type;
+      typedef unsigned char* image_type;
+
+      static void
+      set_value (value_type& v, const unsigned char* i, bool is_null)
+      {
+        if (!is_null)
+          std::memcpy (v.data, i, 16);
+        else
+          v = ::boost::uuids::nil_uuid ();
+      }
+
+      static void
+      set_image (unsigned char* i, bool& is_null, const value_type& v)
+      {
+        // If we can, store nil as NULL. Otherwise, store it as a value.
+        //
+        is_null = is_null && v.is_nil ();
+
+        if (!is_null)
+          std::memcpy (i, v.data, 16);
+      }
+    };
+
+    template <>
+    struct default_type_traits< ::boost::uuids::uuid>
+    {
+      static const database_type_id db_type_id = id_uuid;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_PGSQL_UUID_TRAITS_HXX
diff --git a/odb/boost/uuid/sqlite/uuid-mapping.hxx b/odb/boost/uuid/sqlite/uuid-mapping.hxx
new file mode 100644
index 0000000..32f0bac
--- /dev/null
+++ b/odb/boost/uuid/sqlite/uuid-mapping.hxx
@@ -0,0 +1,23 @@
+// file      : odb/boost/uuid/sqlite/uuid-mapping.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_SQLITE_UUID_MAPPING_HXX
+#define ODB_BOOST_UUID_SQLITE_UUID_MAPPING_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <boost/uuid/uuid.hpp>
+
+// By default map boost::uuids::uuid to SQLite BLOB and use NULL to
+// represent nil UUIDs. If NULL is disabled (e.g., at the member level),
+// then we store the nil UUID (i.e., all bytes are zero).
+//
+#pragma db value(boost::uuids::uuid) type("BLOB") null
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_SQLITE_UUID_MAPPING_HXX
diff --git a/odb/boost/uuid/sqlite/uuid-traits.hxx b/odb/boost/uuid/sqlite/uuid-traits.hxx
new file mode 100644
index 0000000..2b11b4e
--- /dev/null
+++ b/odb/boost/uuid/sqlite/uuid-traits.hxx
@@ -0,0 +1,83 @@
+// file      : odb/boost/uuid/sqlite/uuid-traits.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_BOOST_UUID_SQLITE_UUID_TRAITS_HXX
+#define ODB_BOOST_UUID_SQLITE_UUID_TRAITS_HXX
+
+#include <boost/version.hpp>
+
+// UUID library is available since 1.42.0.
+//
+#if BOOST_VERSION >= 104200
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+#include <cassert>
+
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/nil_generator.hpp>
+
+#include <odb/sqlite/traits.hxx>
+
+namespace odb
+{
+  namespace sqlite
+  {
+    template <>
+    struct default_value_traits< ::boost::uuids::uuid, id_blob>
+    {
+      typedef ::boost::uuids::uuid value_type;
+      typedef value_type query_type;
+      typedef details::buffer image_type;
+
+      static void
+      set_value (value_type& v,
+                 const details::buffer& b,
+                 std::size_t n,
+                 bool is_null)
+      {
+        if (!is_null)
+        {
+          assert (n == 16);
+          std::memcpy (v.data, b.data (), 16);
+        }
+        else
+          v = ::boost::uuids::nil_uuid ();
+      }
+
+      static void
+      set_image (details::buffer& b,
+                 std::size_t& n,
+                 bool& is_null,
+                 const value_type& v)
+      {
+        // If we can, store nil as NULL. Otherwise, store it as a value.
+        //
+        is_null = is_null && v.is_nil ();
+
+        if (!is_null)
+        {
+          n = 16;
+
+          if (n > b.capacity ())
+            b.capacity (n);
+
+          std::memcpy (b.data (), v.data, n);
+        }
+      }
+    };
+
+    template <>
+    struct default_type_traits< ::boost::uuids::uuid>
+    {
+      static const database_type_id db_type_id = id_blob;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // BOOST_VERSION
+#endif // ODB_BOOST_UUID_SQLITE_UUID_TRAITS_HXX
diff --git a/odb/boost/uuid/uuid-mssql.options b/odb/boost/uuid/uuid-mssql.options
new file mode 100644
index 0000000..09e9974
--- /dev/null
+++ b/odb/boost/uuid/uuid-mssql.options
@@ -0,0 +1,12 @@
+# file      : odb/boost/uuid/uuid-mssql.options
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/version
+
+# Include the default mapping in prologue instead of epilogue to
+# allow the user to override the default mapping.
+#
+--odb-prologue '#include <odb/boost/uuid/mssql/uuid-mapping.hxx>'
+
+--hxx-prologue '#include <odb/boost/uuid/mssql/uuid-traits.hxx>'
diff --git a/odb/boost/uuid/uuid-mysql.options b/odb/boost/uuid/uuid-mysql.options
new file mode 100644
index 0000000..d9acafb
--- /dev/null
+++ b/odb/boost/uuid/uuid-mysql.options
@@ -0,0 +1,12 @@
+# file      : odb/boost/uuid/uuid-mysql.options
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/version
+
+# Include the default mapping in prologue instead of epilogue to
+# allow the user to override the default mapping.
+#
+--odb-prologue '#include <odb/boost/uuid/mysql/uuid-mapping.hxx>'
+
+--hxx-prologue '#include <odb/boost/uuid/mysql/uuid-traits.hxx>'
diff --git a/odb/boost/uuid/uuid-oracle.options b/odb/boost/uuid/uuid-oracle.options
new file mode 100644
index 0000000..0f0ccde
--- /dev/null
+++ b/odb/boost/uuid/uuid-oracle.options
@@ -0,0 +1,12 @@
+# file      : odb/boost/uuid/uuid-oracle.options
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/version
+
+# Include the default mapping in prologue instead of epilogue to
+# allow the user to override the default mapping.
+#
+--odb-prologue '#include <odb/boost/uuid/oracle/uuid-mapping.hxx>'
+
+--hxx-prologue '#include <odb/boost/uuid/oracle/uuid-traits.hxx>'
diff --git a/odb/boost/uuid/uuid-pgsql.options b/odb/boost/uuid/uuid-pgsql.options
new file mode 100644
index 0000000..242fe52
--- /dev/null
+++ b/odb/boost/uuid/uuid-pgsql.options
@@ -0,0 +1,12 @@
+# file      : odb/boost/uuid/uuid-pgsql.options
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/version
+
+# Include the default mapping in prologue instead of epilogue to
+# allow the user to override the default mapping.
+#
+--odb-prologue '#include <odb/boost/uuid/pgsql/uuid-mapping.hxx>'
+
+--hxx-prologue '#include <odb/boost/uuid/pgsql/uuid-traits.hxx>'
diff --git a/odb/boost/uuid/uuid-sqlite.options b/odb/boost/uuid/uuid-sqlite.options
new file mode 100644
index 0000000..2cf939f
--- /dev/null
+++ b/odb/boost/uuid/uuid-sqlite.options
@@ -0,0 +1,12 @@
+# file      : odb/boost/uuid/uuid-sqlite.options
+# copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+--profile boost/version
+
+# Include the default mapping in prologue instead of epilogue to
+# allow the user to override the default mapping.
+#
+--odb-prologue '#include <odb/boost/uuid/sqlite/uuid-mapping.hxx>'
+
+--hxx-prologue '#include <odb/boost/uuid/sqlite/uuid-traits.hxx>'