Add support for schema version table

6 files changed, 379 insertions, 0 deletions

diff --git a/evolution/embedded/driver.cxx b/evolution/embedded/driver.cxx
new file mode 100644
index 0000000..964af16
--- /dev/null
+++ b/evolution/embedded/driver.cxx
@@ -0,0 +1,160 @@
+// file      : evolution/embedded/driver.cxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+// Test embedded schema migration.
+//
+
+#include <memory>   // std::auto_ptr
+#include <cassert>
+#include <iostream>
+
+#include <odb/database.hxx>
+#include <odb/transaction.hxx>
+#include <odb/schema-catalog.hxx>
+
+#include <common/config.hxx>  // DATABASE_XXX
+#include <common/common.hxx>
+
+#include "test2.hxx"
+#include "test3.hxx"
+#include "test2-odb.hxx"
+#include "test3-odb.hxx"
+
+using namespace std;
+using namespace odb::core;
+
+int
+main (int argc, char* argv[])
+{
+  try
+  {
+    auto_ptr<database> db (create_database (argc, argv, false));
+
+    // 1 - base version
+    // 2 - migration
+    // 3 - current version
+    //
+    unsigned short pass (*argv[argc - 1] - '0');
+
+    switch (pass)
+    {
+    case 1:
+      {
+        using namespace v2;
+
+        {
+          transaction t (db->begin ());
+          schema_catalog::drop_schema (*db);
+          schema_catalog::drop_schema (*db, "2");
+          t.commit ();
+        }
+
+        // PostgreSQL cannot continue a transaction after a query failed.
+        //
+        assert (db->schema_version () == 0);
+
+        {
+          transaction t (db->begin ());
+          schema_catalog::create_schema (*db, "", false);
+
+          assert (db->schema_version () == 1 && !db->schema_migration ());
+
+          schema_catalog::migrate_schema (*db, 2);
+          t.commit ();
+        }
+
+        assert (db->schema_version () == 2 && !db->schema_migration ());
+
+        {
+          transaction t (db->begin ());
+          object1 o1 (1);
+          o1.num = 123;
+          db->persist (o1);
+          t.commit ();
+        }
+        break;
+      }
+    case 2:
+      {
+        using namespace v2;
+        using namespace v3;
+
+        {
+          assert (db->schema_version () == 2 && !db->schema_migration ());
+
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_pre (*db, 3);
+          t.commit ();
+        }
+
+        assert (db->schema_version () == 3 && db->schema_migration ());
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object1> o1 (db->load<object1> (1));
+          object2 o2 (1);
+          o2.num = o1->num;
+          db->persist (o2);
+          t.commit ();
+        }
+
+        {
+          transaction t (db->begin ());
+          schema_catalog::migrate_schema_post (*db, 3);
+          t.commit ();
+
+          assert (db->schema_version () == 3 && !db->schema_migration ());
+        }
+        break;
+      }
+    case 3:
+      {
+        using namespace v3;
+
+        // In transaction.
+        //
+        {
+          transaction t (db->begin ());
+          assert (db->schema_version () == 3 && !db->schema_migration ());
+          t.commit ();
+        }
+
+        {
+          transaction t (db->begin ());
+          auto_ptr<object2> o2 (db->load<object2> (1));
+          assert (o2->num == 123);
+          t.commit ();
+        }
+
+        // Test the case where there is still no version table.
+        //
+        db->schema_version (0, false);
+
+        {
+          transaction t (db->begin ());
+
+#ifdef DATABASE_ORACLE
+          db->execute ("DROP TABLE \"schema_version\"");
+#else
+          db->execute ("DROP TABLE schema_version");
+#endif
+          t.commit ();
+        }
+
+        assert (db->schema_version () == 0);
+        break;
+      }
+    default:
+      {
+        cerr << "unknown pass number '" << argv[argc - 1] << "'" << endl;
+        return 1;
+      }
+    }
+  }
+  catch (const odb::exception& e)
+  {
+    cerr << e.what () << endl;
+    return 1;
+  }
+}
diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
new file mode 100644
index 0000000..dfa675a
--- /dev/null
+++ b/evolution/embedded/makefile
@@ -0,0 +1,139 @@
+# file      : evolution/embedded/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 := test1.hxx test2.hxx test3.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) -I$(src_base)
+$(cxx_obj) $(cxx_od): $(common.l.cpp-options)
+
+genf1 := test1-odb.hxx test1-odb.ixx test1-odb.cxx
+gen1  := $(addprefix $(out_base)/,$(genf1))
+
+genf2 := test2-odb.hxx test2-odb.ixx test2-odb.cxx
+gen2  := $(addprefix $(out_base)/,$(genf2))
+
+genf3 := test3-odb.hxx test3-odb.ixx test3-odb.cxx
+gen3  := $(addprefix $(out_base)/,$(genf3))
+
+genf := $(genf1) $(genf2) $(genf3)
+gen  := $(gen1) $(gen2) $(gen3)
+
+$(gen): $(odb)
+$(gen): odb := $(odb)
+$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
+--generate-schema --schema-format embedded --at-once --table-prefix evo_embedded_
+$(gen1) $(dist): export odb_options1 = $(odb_common_options) --init-changelog
+$(gen2) $(dist): export odb_options2 = $(odb_common_options) --omit-create \
+--schema-name 2 --suppress-migration
+$(gen3) $(dist): export odb_options3 = $(odb_common_options) --omit-create
+$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml
+$(gen2): odb_options += $(odb_options2) --changelog $(out_base)/model.xml
+$(gen3): odb_options += $(odb_options3) --changelog $(out_base)/model.xml
+$(gen): cpp_options := -I$(src_base)
+$(gen): $(common.l.cpp-options)
+
+$(call include-dep,$(cxx_od),$(cxx_obj),$(gen))
+
+# Make sure testN.hxx are compiled serially since they share the
+# changelog. Also add dependency on model.hxx
+#
+$(gen2): $(gen1)
+$(gen3): $(gen2)
+$(gen): $(src_base)/model.hxx
+
+# Alias for default target.
+#
+$(out_base)/: $(driver)
+
+# Dist
+#
+name := $(subst /,-,$(subst $(src_root)/evolution/,,$(src_base)))
+
+$(dist): db_id := @database@
+$(dist): sources := $(cxx_tun)
+$(dist): headers := $(odb_hdr)
+$(dist): export extra_headers := model.hxx
+$(dist): export name := $(name)
+$(dist): export extra_dist := $(call vc9projs,$(name)) \
+$(call vc10projs,$(name)) $(call vc11projs,$(name))
+$(dist):
+	$(call dist-data,$(sources) $(headers) $(extra_headers))
+	$(call meta-automake,../template/Makefile.am)
+	$(call meta-vc9projs,../template/template,$(name))
+	$(call meta-vc10projs,../template/template,$(name))
+	$(call meta-vc11projs,../template/template,$(name))
+
+# Test.
+#
+$(test): $(driver)
+        # Base schema.
+	$(call message,test $< base,$< --options-file $(dcf_root)/db.options 1)
+        # Migration.
+	$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
+        # Current schema.
+	$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
+
+# 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))
+	$(call message,,rm -f $(out_base)/model.xml) # Changelog.
+
+# Generated .gitignore.
+#
+ifeq ($(out_base),$(src_base))
+$(driver): | $(out_base)/.gitignore
+
+$(out_base)/.gitignore: files := driver model.xml $(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/vc11proj.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/evolution/embedded/model.hxx b/evolution/embedded/model.hxx
new file mode 100644
index 0000000..f5e6beb
--- /dev/null
+++ b/evolution/embedded/model.hxx
@@ -0,0 +1,46 @@
+// file      : evolution/embedded/model.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef MODEL_VERSION
+#  error model.hxx included directly
+#endif
+
+#include <odb/core.hxx>
+
+#pragma db model version(1, MODEL_VERSION)
+
+#define MODEL_NAMESPACE_IMPL(V) v##V
+#define MODEL_NAMESPACE(V) MODEL_NAMESPACE_IMPL(V)
+
+namespace MODEL_NAMESPACE(MODEL_VERSION)
+{
+#if MODEL_VERSION == 2
+  #pragma db object
+  struct object1
+  {
+    object1 (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+
+    int num;
+  };
+#endif
+
+#if MODEL_VERSION == 3
+  #pragma db object
+  struct object2
+  {
+    object2 (unsigned long id = 0): id_ (id) {}
+
+    #pragma db id
+    unsigned long id_;
+
+    int num;
+  };
+#endif
+}
+
+#undef MODEL_NAMESPACE
+#undef MODEL_NAMESPACE_IMPL
diff --git a/evolution/embedded/test1.hxx b/evolution/embedded/test1.hxx
new file mode 100644
index 0000000..6e7748d
--- /dev/null
+++ b/evolution/embedded/test1.hxx
@@ -0,0 +1,10 @@
+// file      : evolution/embedded/test1.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST1_HXX
+#define TEST1_HXX
+
+#pragma db model version(1, 1)
+
+#endif // TEST1_HXX
diff --git a/evolution/embedded/test2.hxx b/evolution/embedded/test2.hxx
new file mode 100644
index 0000000..78578e4
--- /dev/null
+++ b/evolution/embedded/test2.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/embedded/test2.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST2_HXX
+#define TEST2_HXX
+
+#define MODEL_VERSION 2
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST2_HXX
diff --git a/evolution/embedded/test3.hxx b/evolution/embedded/test3.hxx
new file mode 100644
index 0000000..ce613b6
--- /dev/null
+++ b/evolution/embedded/test3.hxx
@@ -0,0 +1,12 @@
+// file      : evolution/embedded/test3.hxx
+// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC
+// license   : GNU GPL v2; see accompanying LICENSE file
+
+#ifndef TEST3_HXX
+#define TEST3_HXX
+
+#define MODEL_VERSION 3
+#include "model.hxx"
+#undef MODEL_VERSION
+
+#endif // TEST3_HXX