4 files changed, 243 insertions, 0 deletions
diff --git a/libodb-qt/odb/qt/basic/pgsql/default-mapping.hxx b/libodb-qt/odb/qt/basic/pgsql/default-mapping.hxx
new file mode 100644
index 0000000..13dbeb8
--- /dev/null
+++ b/libodb-qt/odb/qt/basic/pgsql/default-mapping.hxx
@@ -0,0 +1,27 @@
+// file      : odb/qt/basic/pgsql/default-mapping.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_QT_BASIC_PGSQL_DEFAULT_MAPPING_HXX
+#define ODB_QT_BASIC_PGSQL_DEFAULT_MAPPING_HXX
+
+#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.
+//
+#pragma db value(QString) type("TEXT") null
+
+// Map QByteArray to PostgreSQL BYTEA by default. Allow NULL values by default
+// as QByteArray provides a null representation.
+//
+#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/libodb-qt/odb/qt/basic/pgsql/qbyte-array-traits.hxx b/libodb-qt/odb/qt/basic/pgsql/qbyte-array-traits.hxx
new file mode 100644
index 0000000..3c3c496
--- /dev/null
+++ b/libodb-qt/odb/qt/basic/pgsql/qbyte-array-traits.hxx
@@ -0,0 +1,77 @@
+// file      : odb/qt/basic/pgsql/qbyte-array-traits.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_QT_BASIC_PGSQL_QBYTE_ARRAY_TRAITS_HXX
+#define ODB_QT_BASIC_PGSQL_QBYTE_ARRAY_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+#include <cstddef> // std::size_t
+
+#include <QtCore/QByteArray>
+
+#include <odb/details/buffer.hxx>
+#include <odb/pgsql/traits.hxx>
+
+namespace odb
+{
+  namespace pgsql
+  {
+    template <>
+    struct default_value_traits<QByteArray, id_bytea>
+    {
+      typedef QByteArray value_type;
+      typedef QByteArray query_type;
+      typedef details::buffer image_type;
+
+      static void
+      set_value (QByteArray& v,
+                 const details::buffer& b,
+                 std::size_t n,
+                 bool is_null)
+      {
+        if (is_null)
+          v = QByteArray ();
+        else
+        {
+          // Note that we cannot use replace() here since a suitable
+          // overload was only added in Qt 4.7.
+          //
+          v.resize (static_cast<int> (n));
+          std::memcpy (v.data (), b.data (), n);
+        }
+      }
+
+      static void
+      set_image (details::buffer& b,
+                 std::size_t& n,
+                 bool& is_null,
+                 const QByteArray& v)
+      {
+        if (v.isNull ())
+          is_null = true;
+        else
+        {
+          is_null = false;
+
+          n = static_cast<std::size_t> (v.size ());
+          if (n > b.capacity ())
+            b.capacity (n);
+
+          std::memcpy (b.data (), v.data (), n);
+        }
+      }
+    };
+
+    template <>
+    struct default_type_traits<QByteArray>
+    {
+      static const database_type_id db_type_id = id_bytea;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_QT_BASIC_PGSQL_QBYTE_ARRAY_TRAITS_HXX
diff --git a/libodb-qt/odb/qt/basic/pgsql/qstring-traits.hxx b/libodb-qt/odb/qt/basic/pgsql/qstring-traits.hxx
new file mode 100644
index 0000000..f1ab53c
--- /dev/null
+++ b/libodb-qt/odb/qt/basic/pgsql/qstring-traits.hxx
@@ -0,0 +1,74 @@
+// file      : odb/qt/basic/pgsql/qstring-traits.hxx
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef ODB_QT_BASIC_PGSQL_QSTRING_TRAITS_HXX
+#define ODB_QT_BASIC_PGSQL_QSTRING_TRAITS_HXX
+
+#include <odb/pre.hxx>
+
+#include <cstring> // std::memcpy
+#include <cstddef> // std::size_t
+
+#include <QtCore/QString>
+
+#include <odb/details/buffer.hxx>
+#include <odb/pgsql/traits.hxx>
+
+namespace odb
+{
+  namespace pgsql
+  {
+    template <>
+    struct default_value_traits <QString, id_string>
+    {
+    public:
+      typedef QString value_type;
+      typedef QString query_type;
+      typedef details::buffer image_type;
+
+      static void
+      set_value (QString& v,
+                 const details::buffer& b,
+                 std::size_t n,
+                 bool is_null)
+      {
+        if (is_null)
+          v = QString ();
+        else
+          v = QString::fromUtf8 (b.data (), static_cast<int> (n));
+      }
+
+      static void
+      set_image (details::buffer& b,
+                 std::size_t& n,
+                 bool& is_null,
+                 const QString& v)
+      {
+        if (v.isNull ())
+          is_null = true;
+        else
+        {
+          is_null = false;
+
+          const QByteArray& a (v.toUtf8 ());
+          n = static_cast<std::size_t> (a.size ());
+
+          if (n > b.capacity ())
+            b.capacity (n);
+
+          std::memcpy (b.data (), a.data (), n);
+        }
+      }
+    };
+
+    template <>
+    struct default_type_traits<QString>
+    {
+      static const database_type_id db_type_id = id_string;
+    };
+  }
+}
+
+#include <odb/post.hxx>
+
+#endif // ODB_QT_BASIC_PGSQL_QSTRING_TRAITS_HXX
diff --git a/libodb-qt/odb/qt/basic/pgsql/quuid-traits.hxx b/libodb-qt/odb/qt/basic/pgsql/quuid-traits.hxx
new file mode 100644
index 0000000..5999b7e
--- /dev/null
+++ b/libodb-qt/odb/qt/basic/pgsql/quuid-traits.hxx
@@ -0,0 +1,65 @@
+// file      : odb/qt/basic/pgsql/uuid-traits.hxx
+// 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;
+
+      // PostgreSQL binary UUID representation is big-endian in the RFC 4122,
+      // section 4.1.2 order. While Qt provides (since 4.8) to/fromRfc4122(),
+      // they both incur a memory allocation (by QByteArray) which we could
+      // avoid, if we did it ourselves.
+      //
+
+      static void
+      set_value (value_type& v, const unsigned char* i, bool is_null)
+      {
+        if (!is_null)
+          v = QUuid::fromRfc4122 (
+            QByteArray (reinterpret_cast<const char*> (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.toRfc4122 ().constData (), 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