From 8653e24fba1721fe4a87397b31f911d7fe33f32c Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 25 Apr 2013 10:46:33 +0200 Subject: Add support for data migration --- evolution/data/driver.cxx | 181 ++++++++++++++++++++++++++++++++++++++++++++++ evolution/data/makefile | 147 +++++++++++++++++++++++++++++++++++++ evolution/data/model.hxx | 46 ++++++++++++ evolution/data/test1.hxx | 10 +++ evolution/data/test2.hxx | 12 +++ evolution/data/test3.hxx | 12 +++ evolution/makefile | 1 + 7 files changed, 409 insertions(+) create mode 100644 evolution/data/driver.cxx create mode 100644 evolution/data/makefile create mode 100644 evolution/data/model.hxx create mode 100644 evolution/data/test1.hxx create mode 100644 evolution/data/test2.hxx create mode 100644 evolution/data/test3.hxx (limited to 'evolution') diff --git a/evolution/data/driver.cxx b/evolution/data/driver.cxx new file mode 100644 index 0000000..0a700c7 --- /dev/null +++ b/evolution/data/driver.cxx @@ -0,0 +1,181 @@ +// file : evolution/data/driver.cxx +// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Test data migration support. +// + +#include // std::auto_ptr +#include +#include + +#include +#include +#include + +#include // DATABASE_XXX, HAVE_CXX11 +#include + +#include "test2.hxx" +#include "test3.hxx" +#include "test2-odb.hxx" +#include "test3-odb.hxx" + +using namespace std; +using namespace odb::core; + +void +migrate1 (database& db) +{ + using namespace v2; + using namespace v3; + + auto_ptr o1 (db.load (1)); + object2 o2 (1); + o2.num = o1->num; + db.persist (o2); +} + +void +migrate2 (database& db) +{ + using namespace v2; + using namespace v3; + + auto_ptr o1 (db.load (2)); + object2 o2 (2); + o2.num = o1->num; + db.persist (o2); +} + +static const data_migration_entry migrate2_entry (3, &migrate2); + +int +main (int argc, char* argv[]) +{ + schema_catalog::data_migration_function (3, &migrate1); + +#ifdef HAVE_CXX11 + schema_catalog::data_migration_function ( + 3, + [] (database& db) + { + using namespace v2; + using namespace v3; + + auto_ptr o1 (db.load (11)); + object2 o2 (11); + o2.num = o1->num; + db.persist (o2); + }); +#endif + + try + { + auto_ptr db (create_database (argc, argv, false)); + bool embedded (schema_catalog::exists (*db)); + + // 1 - base version + // 2 - migration + // 3 - current version + // + unsigned short pass (*argv[argc - 1] - '0'); + + switch (pass) + { + case 1: + { + using namespace v2; + + if (embedded) + { + transaction t (db->begin ()); + schema_catalog::drop_schema (*db); + schema_catalog::drop_schema (*db, "2"); + schema_catalog::create_schema (*db, "", false); + schema_catalog::migrate_schema (*db, 2); + t.commit (); + } + + { + transaction t (db->begin ()); + + { + object1 o1 (1); + o1.num = 123; + db->persist (o1); + } + + { + object1 o1 (2); + o1.num = 123; + db->persist (o1); + } + +#ifdef HAVE_CXX11 + { + object1 o1 (11); + o1.num = 123; + db->persist (o1); + } +#endif + t.commit (); + } + break; + } + case 2: + { + { + transaction t (db->begin ()); + + if (embedded) + schema_catalog::migrate (*db); + else + schema_catalog::migrate_data (*db); + + t.commit (); + } + + break; + } + case 3: + { + using namespace v3; + + { + transaction t (db->begin ()); + + { + auto_ptr o2 (db->load (1)); + assert (o2->num == 123); + } + + { + auto_ptr o2 (db->load (2)); + assert (o2->num == 123); + } + +#ifdef HAVE_CXX11 + { + auto_ptr o2 (db->load (11)); + assert (o2->num == 123); + } +#endif + t.commit (); + } + + 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/data/makefile b/evolution/data/makefile new file mode 100644 index 0000000..7b1cc8e --- /dev/null +++ b/evolution/data/makefile @@ -0,0 +1,147 @@ +# file : evolution/data/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 --at-once --table-prefix evo_data_ +$(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) + # Drop everything. + $(call schema,$(out_base)/test3.sql) + $(call schema,$(out_base)/test2.sql) + $(call schema,$(out_base)/test1.sql) + # Base schema. + $(call schema,$(out_base)/test3-002-pre.sql) + $(call schema,$(out_base)/test3-002-post.sql) + $(call message,test $< base,$< --options-file $(dcf_root)/db.options 1) + # Migration. + $(call schema,$(out_base)/test3-003-pre.sql) + $(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2) + $(call schema,$(out_base)/test3-003-post.sql) + # 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/data/model.hxx b/evolution/data/model.hxx new file mode 100644 index 0000000..db49a44 --- /dev/null +++ b/evolution/data/model.hxx @@ -0,0 +1,46 @@ +// file : evolution/data/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 + +#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/data/test1.hxx b/evolution/data/test1.hxx new file mode 100644 index 0000000..52b1873 --- /dev/null +++ b/evolution/data/test1.hxx @@ -0,0 +1,10 @@ +// file : evolution/data/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/data/test2.hxx b/evolution/data/test2.hxx new file mode 100644 index 0000000..8aa60fe --- /dev/null +++ b/evolution/data/test2.hxx @@ -0,0 +1,12 @@ +// file : evolution/data/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/data/test3.hxx b/evolution/data/test3.hxx new file mode 100644 index 0000000..7decfc5 --- /dev/null +++ b/evolution/data/test3.hxx @@ -0,0 +1,12 @@ +// file : evolution/data/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 diff --git a/evolution/makefile b/evolution/makefile index 98816a3..9f85cf8 100644 --- a/evolution/makefile +++ b/evolution/makefile @@ -17,6 +17,7 @@ drop-index \ combined \ embedded \ version \ +data \ template default := $(out_base)/ -- cgit v1.1