Add support for defining persistent objects as class template instantiations

6 files changed, 251 insertions, 1 deletions

diff --git a/common/access/driver.cxx b/common/access/driver.cxx
index 4ec8433..05c18be 100644
--- a/common/access/driver.cxx
+++ b/common/access/driver.cxx
@@ -95,7 +95,8 @@ main (int argc, char* argv[])
 
       {
         transaction t (db->begin ());
-        db->persist (o.p1 ());
+        const object1_ptr& ptr (o.p1 ());
+        db->persist (ptr);
         db->persist (o.p2 ());
         db->persist (o);
         t.commit ();
diff --git a/common/makefile b/common/makefile
index 6ee2436..0fe8ffe 100644
--- a/common/makefile
+++ b/common/makefile
@@ -32,6 +32,7 @@ inverse                   \
 lazy-ptr                  \
 lifecycle                 \
 no-id                     \
+object                    \
 optimistic                \
 pragma                    \
 prepared                  \
diff --git a/common/object/driver.cxx b/common/object/driver.cxx
new file mode 100644
index 0000000..f3bad0e
--- /dev/null
+++ b/common/object/driver.cxx
@@ -0,0 +1,83 @@
+// file      : common/object/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test persistent classes.
+//
+
+#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::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv));
+
+    // Test persistent class template instantiation.
+    //
+    {
+      using namespace test1;
+
+      pair_object po;
+      po.second = "abc";
+
+      derived d;
+      d.x = "abc";
+      d.n = 123;
+
+      // persist
+      //
+      {
+        transaction t (db->begin ());
+        db->persist<pair_object> (po);
+        db->persist (d);
+        t.commit ();
+      }
+
+      // load & check
+      //
+      {
+        transaction t (db->begin ());
+        auto_ptr<pair_object> po1 (db->load<pair_object> (po.first));
+        auto_ptr<derived> d1 (db->load<derived> (d.id));
+        t.commit ();
+
+        assert (po == *po1);
+
+        assert (d.x == d1->x);
+        assert (d.n == d1->n);
+      }
+
+      // Test the API confusion.
+      //
+      {
+        transaction t (db->begin ());
+        db->update<pair_object> (po);
+        db->reload<pair_object> (po);
+        db->erase<pair_object> (po);
+
+        db->query<pair_object> ();
+        t.commit ();
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/common/object/makefile b/common/object/makefile
new file mode 100644
index 0000000..c270400
--- /dev/null
+++ b/common/object/makefile
@@ -0,0 +1,120 @@
+# file      : common/object/makefile
+# copyright : Copyright (c) 2009-2013 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
+genf    := $(call odb-gen,$(odb_hdr))
+gen     := $(addprefix $(out_base)/,$(genf))
+cxx_obj := $(addprefix $(out_base)/,$(cxx_tun:.cxx=.o)) $(filter %.o,$(gen:.cxx=.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
+
+# 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) -I$(src_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): export odb_options += --generate-schema \
+--table-prefix object_ --generate-query
+$(gen): cpp_options := -I$(src_base)
+$(gen): $(common.l.cpp-options)
+
+
+ifneq ($(db_id),common)
+$(gen): odb_options += --database $(db_id)
+else
+$(gen): odb_options += --multi-database dynamic
+endif
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/common/,,$(src_base)))
+
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): data_dist := test.std
+$(dist): export name := $(name)
+$(dist): export odb_header_stem := $(basename $(odb_hdr))
+$(dist): export extra_dist := $(data_dist) $(call vc8projs,$(name)) \
+$(call vc9projs,$(name)) $(call vc10projs,$(name)) $(call vc11projs,$(name)) \
+$(call vc12projs,$(name))
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(data_dist))
+	$(call meta-automake,../template/Makefile.am)
+	$(call meta-vc8projs,../template/template,$(name))
+	$(call meta-vc9projs,../template/template,$(name))
+	$(call meta-vc10projs,../template/template,$(name))
+	$(call meta-vc11projs,../template/template,$(name))
+	$(call meta-vc12projs,../template/template,$(name))
+
+# Test.
+#
+ifneq ($(db_id),common)
+$(eval $(call test-rule))
+else
+$(foreach d,$(databases),$(eval $(call test-rule,$d)))
+endif
+
+# Clean.
+#
+$(clean):                            \
+  $(driver).o.clean                  \
+  $(addsuffix .cxx.clean,$(cxx_obj)) \
+  $(addsuffix .cxx.clean,$(cxx_od))  \
+  $(addsuffix .hxx.clean,$(filter %.cxx,$(gen)))
+	$(call message,,rm -f $(out_base)/test.out)
+
+# 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/vc8proj.make)
+$(call include,$(bld_root)/meta/vc9proj.make)
+$(call include,$(bld_root)/meta/vc10proj.make)
+$(call include,$(bld_root)/meta/vc11proj.make)
+$(call include,$(bld_root)/meta/vc12proj.make)
+$(call include,$(bld_root)/meta/automake.make)
+
+$(call include,$(bld_root)/cxx/standard.make) # cxx_standard
+ifdef cxx_standard
+$(gen): odb_options += --std $(cxx_standard)
+$(call include,$(odb_rules))
+endif
+
+$(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/object/test.hxx b/common/object/test.hxx
new file mode 100644
index 0000000..aec17c6
--- /dev/null
+++ b/common/object/test.hxx
@@ -0,0 +1,45 @@
+// file      : common/object/test.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST_HXX
+#define TEST_HXX
+
+#include <string>
+#include <utility> // std::pair
+
+#include <odb/core.hxx>
+
+// Test persistent class template instantiation.
+//
+#pragma db namespace table("t1_")
+namespace test1
+{
+  typedef std::pair<unsigned long, std::string> pair_object;
+  #pragma db object(pair_object)
+  #pragma db member(pair_object::first) id auto
+
+  #pragma db object abstract
+  struct base_data
+  {
+    #pragma db id auto
+    unsigned long id;
+  };
+
+  template <typename T>
+  struct base: base_data
+  {
+    T x;
+  };
+
+  typedef base<std::string> base_derived;
+  #pragma db object(base_derived) abstract
+
+  #pragma db object
+  struct derived: base_derived
+  {
+    int n;
+  };
+}
+
+#endif // TEST_HXX
diff --git a/common/object/test.std b/common/object/test.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/object/test.std