Implement support for composite value types

New test: common/composite.

5 files changed, 303 insertions, 0 deletions

diff --git a/common/composite/driver.cxx b/common/composite/driver.cxx
new file mode 100644
index 0000000..b1221da
--- /dev/null
+++ b/common/composite/driver.cxx
@@ -0,0 +1,117 @@
+// file      : common/composite/driver.cxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test composite value types.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+
+#include <common/common.hxx>
+
+#include "test.hxx"
+#include "test-odb.hxx"
+
+using namespace std;
+using namespace odb;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    person p (1);
+    p.name_.first = "Joe";
+    p.name_.last = "Dirt";
+    p.name_.title = "Mr";
+    p.name_.alias.first = "Anthony";
+    p.name_.alias.last = "Clean";
+    p.name_.nick = "Squeaky";
+    p.name_.flags.nick = true;
+    p.name_.flags.alias = false;
+    p.age_ = 32;
+
+    //
+    //
+    {
+      transaction t (db->begin ());
+      db->persist (p);
+      t.commit ();
+    }
+
+    //
+    //
+    {
+      transaction t (db->begin ());
+      auto_ptr<person> p1 (db->load<person> (1));
+      t.commit ();
+
+      assert (p == *p1);
+    }
+
+    p.name_.title = "Mrs";
+    p.name_.alias.first = "Anthonia";
+    p.name_.flags.nick = false;
+    p.name_.flags.alias = true;
+
+    //
+    //
+    {
+      transaction t (db->begin ());
+      db->update (p);
+      t.commit ();
+    }
+
+    //
+    //
+    {
+      transaction t (db->begin ());
+      auto_ptr<person> p1 (db->load<person> (1));
+      t.commit ();
+
+      assert (p == *p1);
+    }
+
+    typedef odb::query<person> query;
+    typedef odb::result<person> result;
+
+    //
+    //
+    {
+      transaction t (db->begin ());
+
+      result r (db->query<person> (query::name::first == "Joe"));
+
+      assert (r.size () == 1);
+      assert (*r.begin () == p);
+
+      t.commit ();
+    }
+
+    //
+    //
+    {
+      transaction t (db->begin ());
+
+      result r (db->query<person> (query::name::flags::alias));
+
+      assert (r.size () == 1);
+      assert (*r.begin () == p);
+
+      t.commit ();
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/common/composite/makefile b/common/composite/makefile
new file mode 100644
index 0000000..577cad6
--- /dev/null
+++ b/common/composite/makefile
@@ -0,0 +1,106 @@
+# file      : common/composite/makefile
+# author    : Boris Kolpackov <boris@codesynthesis.com>
+# copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+# license   : GNU GPL v2; see accompanying LICENSE file
+
+include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
+
+cxx_tun := driver.cxx
+odb_hdr := test.hxx
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o) $(odb_hdr:.hxx=-odb.o))
+cxx_od  := $(cxx_obj:.o=.o.d)
+
+common.l             := $(out_root)/libcommon/common/common.l
+common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
+
+driver  := $(out_base)/driver
+dist    := $(out_base)/.dist
+test    := $(out_base)/.test
+clean   := $(out_base)/.clean
+
+# Import.
+#
+$(call import,\
+  $(scf_root)/import/odb/stub.make,\
+  odb: odb,odb-rules: odb_rules)
+
+# Build.
+#
+$(driver): $(cxx_obj) $(common.l)
+$(cxx_obj) $(cxx_od): cpp_options := -I$(out_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
+
+genf := $(addprefix $(odb_hdr:.hxx=-odb),.hxx .ixx .cxx) $(odb_hdr:.hxx=.sql)
+gen  := $(addprefix $(out_base)/,$(genf))
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): export odb_options += --database $(db_id) --generate-schema \
+--generate-query
+$(gen): cpp_options := -I$(out_base)
+$(gen): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(notdir $(src_base))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(data_dist) $(call vc9projs,$(name)) \
+$(call vc10projs,$(name))
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(data_dist))
+	$(call meta-automake,../template/Makefile.am)
+	$(call meta-vc9projs,../template/template,$(name))
+	$(call meta-vc10projs,../template/template,$(name))
+
+# Test.
+#
+$(test): $(driver) $(src_base)/test.std
+	$(call message,sql $$1,$(dcf_root)/db-driver $$1, $(src_base)/test.sql)
+	$(call message,test $<,$< --options-file $(dcf_root)/db.options \
+| diff -u $(src_base)/test.std -)
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+  $(addprefix $(out_base)/,$(odb_hdr:.hxx=-odb.cxx.hxx.clean))
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver $(genf)
+$(clean): $(out_base)/.gitignore.clean
+
+$(call include,$(bld_root)/git/gitignore.make)
+endif
+
+# How to.
+#
+$(call include,$(bld_root)/dist.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(odb_rules))
+$(call include,$(bld_root)/cxx/cxx-d.make)
+$(call include,$(bld_root)/cxx/cxx-o.make)
+$(call include,$(bld_root)/cxx/o-e.make)
+
+# Dependencies.
+#
+$(call import,$(src_root)/libcommon/makefile)
diff --git a/common/composite/test.hxx b/common/composite/test.hxx
new file mode 100644
index 0000000..d70eefe
--- /dev/null
+++ b/common/composite/test.hxx
@@ -0,0 +1,79 @@
+// file      : common/composite/test.hxx
+// author    : Boris Kolpackov <boris@codesynthesis.com>
+// copyright : Copyright (c) 2009-2010 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <string>
+
+#include <odb/core.hxx>
+
+#pragma db value
+struct name
+{
+  std::string first;
+  std::string last;
+};
+
+#pragma db value
+struct title
+{
+  std::string title;
+};
+
+#pragma db value
+struct name_flags
+{
+  bool nick;
+  bool alias;
+};
+
+#pragma db value
+struct name_ex: name, title
+{
+  name alias;
+  std::string nick;
+
+  #pragma db column("show_")
+  name_flags flags;
+};
+
+#pragma db object
+struct person
+{
+  person (unsigned long id)
+      : id_ (id)
+  {
+  }
+
+  person ()
+  {
+  }
+
+  #pragma db id
+  unsigned long id_;
+
+  #pragma db column("")
+  name_ex name_;
+
+  unsigned short age_;
+};
+
+inline bool
+operator== (person const& x, person const& y)
+{
+  return x.id_ == y.id_ &&
+    x.name_.first ==  y.name_.first&&
+    x.name_.last == y.name_.last &&
+    x.name_.title == y.name_.title &&
+    x.name_.alias.first == y.name_.alias.first &&
+    x.name_.alias.last == y.name_.alias.last &&
+    x.name_.nick == y.name_.nick &&
+    x.name_.flags.nick == y.name_.flags.nick &&
+    x.name_.flags.alias == y.name_.flags.alias &&
+    x.age_ == y.age_;
+}
+
+#endif // TEST_HXX
diff --git a/common/composite/test.std b/common/composite/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/composite/test.std
diff --git a/common/makefile b/common/makefile
index 6328cb1..f13d80b 100644
--- a/common/makefile
+++ b/common/makefile
@@ -7,6 +7,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))../build/bootstrap.make
 
 tests :=      \
 auto          \
+composite     \
 ctor          \
 schema        \
 template      \