2 files changed, 66 insertions, 0 deletions
diff --git a/odb/qt/basic/pgsql/default-mapping.hxx b/odb/qt/basic/pgsql/default-mapping.hxx
index 6633fc5..5f3c2c1 100644
--- a/odb/qt/basic/pgsql/default-mapping.hxx
+++ b/odb/qt/basic/pgsql/default-mapping.hxx
@@ -7,6 +7,7 @@
 
 #include <QtCore/QString>
 #include <QtCore/QByteArray>
+#include <QtCore/QUuid>
 
 // Map QString to PostgreSQL TEXT by default. Allow NULL values by default as
 // QString provides a null representation.
@@ -18,4 +19,10 @@
 //
 #pragma db value(QByteArray) type("BYTEA") null
 
+// By default map QUuid to PostgreSQL UUID and use NULL to represent null
+// UUIDs. If NULL is disabled (e.g., at the member level), then we store
+// the null UUID (i.e., all bytes are zero).
+//
+#pragma db value(QUuid) type("UUID") null
+
 #endif // ODB_QT_BASIC_PGSQL_DEFAULT_MAPPING_HXX
diff --git a/odb/qt/basic/pgsql/quuid-traits.hxx b/odb/qt/basic/pgsql/quuid-traits.hxx
new file mode 100644
index 0000000..c4439a7
--- /dev/null
+++ b/odb/qt/basic/pgsql/quuid-traits.hxx
@@ -0,0 +1,59 @@
+// file      : odb/qt/basic/pgsql/uuid-traits.hxx
+// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_QT_BASIC_PGSQL_UUID_TRAITS_HXX
+#define ODB_QT_BASIC_PGSQL_UUID_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+
+#include <QtCore/QUuid>
+
+#include <odb/pgsql/traits.hxx>
+
+namespace odb
+{
+  namespace pgsql
+  {
+    template <>
+    class default_value_traits<QUuid, id_uuid>
+    {
+    public:
+      typedef QUuid 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.data1, i, 16);
+        else
+          v = QUuid ();
+      }
+
+      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.isNull ();
+
+        if (!is_null)
+          std::memcpy (i, &v.data1, 16);
+      }
+    };
+
+    template <>
+    struct default_type_traits<QUuid>
+    {
+      static const database_type_id db_type_id = id_uuid;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_QT_BASIC_PGSQL_UUID_TRAITS_HXX