From f57a6e7a73e425c2301e62b49c728c12ee801bcc Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 8 Apr 2013 15:41:25 +0200 Subject: Add combined schema evolution test --- evolution/combined/driver.cxx | 122 +++++++++++++++++++++++++++++++++ evolution/combined/makefile | 142 ++++++++++++++++++++++++++++++++++++++ evolution/combined/model.hxx | 156 ++++++++++++++++++++++++++++++++++++++++++ evolution/combined/test1.hxx | 12 ++++ evolution/combined/test2.hxx | 12 ++++ evolution/makefile | 1 + 6 files changed, 445 insertions(+) create mode 100644 evolution/combined/driver.cxx create mode 100644 evolution/combined/makefile create mode 100644 evolution/combined/model.hxx create mode 100644 evolution/combined/test1.hxx create mode 100644 evolution/combined/test2.hxx diff --git a/evolution/combined/driver.cxx b/evolution/combined/driver.cxx new file mode 100644 index 0000000..c87b14e --- /dev/null +++ b/evolution/combined/driver.cxx @@ -0,0 +1,122 @@ +// file : evolution/combined/driver.cxx +// copyright : Copyright (c) 2009-2013 Code Synthesis Tools CC +// license : GNU GPL v2; see accompanying LICENSE file + +// Combined schema evolution test. +// + +#include // std::auto_ptr +#include +#include + +#include +#include + +#include + +#include "test1.hxx" +#include "test2.hxx" +#include "test1-odb.hxx" +#include "test2-odb.hxx" + +using namespace std; +using namespace odb::core; + +int +main (int argc, char* argv[]) +{ + try + { + auto_ptr db (create_database (argc, argv)); + + // 1 - base version + // 2 - migration + // 3 - current version + // + unsigned short pass (*argv[argc - 1] - '0'); + + switch (pass) + { + case 1: + { + using namespace v2; + + object o ("1"); + o.dui = 1; + o.dfk = new object1 (1); + o.acn = 1; + o.anui = 1; + o.dnui = 1; + o.dt.push_back (1); + o.dc = 1; + o.acnn.reset (); + o.afk = 1; + o.aui = 1; + + { + transaction t (db->begin ()); + db->persist (o.dfk); + db->persist (o); + t.commit (); + } + break; + } + case 2: + { + using namespace v3; + + { + transaction t (db->begin ()); + auto_ptr p (db->load ("1")); + + assert (p->ac1 == 999); + assert (!p->ac2); + assert (!p->ac3); + + // Migrate. + // + p->dfk = 999; + p->at.push_back ("abc"); + p->ac3 = 1; + p->acn.reset (); + p->acnn = 1; + + db->update (*p); + + t.commit (); + } + break; + } + case 3: + { + using namespace v3; + + { + transaction t (db->begin ()); + auto_ptr p (db->load ("1")); + + // Check post-migration. + // + assert (p->dfk == 999); + assert (p->at[0] == "abc"); + assert (*p->ac3 == 1); + assert (!p->acn); + assert (*p->acnn == 1); + + 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/combined/makefile b/evolution/combined/makefile new file mode 100644 index 0000000..493f022 --- /dev/null +++ b/evolution/combined/makefile @@ -0,0 +1,142 @@ +# file : evolution/combined/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 +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 test1.sql model.xml +gen1 := $(addprefix $(out_base)/,$(genf1)) + +genf2 := test2-odb.hxx test2-odb.ixx test2-odb.cxx test2.sql \ +test2-002-pre.sql test2-002-post.sql test2-003-pre.sql test2-003-post.sql +gen2 := $(addprefix $(out_base)/,$(genf2)) + +genf := $(genf1) $(genf2) +gen := $(gen1) $(gen2) + +$(gen): $(odb) +$(gen): odb := $(odb) +$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \ +--generate-schema --omit-create --at-once --table-prefix evo_comb_ +$(gen1) $(dist): export odb_options1 = $(odb_common_options) --schema-name \ +test1 --init-changelog --suppress-migration +$(gen2) $(dist): export odb_options2 = $(odb_common_options) --schema-name \ +test2 +$(gen1): odb_options += $(odb_options1) --changelog $(out_base)/model.xml +$(gen2): odb_options += $(odb_options2) --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 test2.hxx is compiled before test1.hxx since they share the +# changelog. Also add dependency on model.hxx +# +$(gen2): $(gen1) +$(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)/test2.sql) + $(call schema,$(out_base)/test1.sql) + # Base schema (-post is always empty). + $(call schema,$(out_base)/test2-002-pre.sql) + $(call message,test $< base,$< --options-file $(dcf_root)/db.options 1) + # Migration. + $(call schema,$(out_base)/test2-003-pre.sql) + $(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2) + $(call schema,$(out_base)/test2-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. + $(call message,,rm -f $(out_base)/test2-*.sql) # Migration files. + +# 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/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/combined/model.hxx b/evolution/combined/model.hxx new file mode 100644 index 0000000..2aede90 --- /dev/null +++ b/evolution/combined/model.hxx @@ -0,0 +1,156 @@ +// file : evolution/combined/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 +#include + +#include +#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) +{ + #pragma db object + struct object1 + { + object1 (unsigned long id = 0): id_ (id) {} + + #pragma db id + unsigned long id_; + }; + + #pragma db object + struct object + { + #pragma db id + std::string id_; + + // + // Pre pass 1. + // + + // Drop unique index. + // +#if MODEL_VERSION == 2 + #pragma db unique +#endif + unsigned long dui; + + // Alter table drop foreign key. + // +#if MODEL_VERSION == 2 + object1* dfk; +#else + #pragma db null + unsigned long dfk; +#endif + + // Add table. + // +#if MODEL_VERSION == 3 + std::vector at; +#endif + + // Add column. + // +#if MODEL_VERSION == 3 + #pragma db default(999) + unsigned long ac1; + + odb::nullable ac2; + + #pragma db not_null // Initially added as NULL, converted to NOT NULL. + odb::nullable ac3; +#endif + + // Alter column NULL. + // +#if MODEL_VERSION == 2 + unsigned long acn; +#else + odb::nullable acn; +#endif + + // + // Pre pass 2. + // + + // Add non-unique indexes. + // +#if MODEL_VERSION == 3 + #pragma db index +#endif + unsigned long anui; + + // + // Post pass 1. + // + + // Drop non-unique indexes. + // +#if MODEL_VERSION == 2 + #pragma db index +#endif + unsigned long dnui; + + // + // Post pass 2. + // + + // Drop table. + // +#if MODEL_VERSION == 2 + std::vector dt; +#endif + + // Drop column. + // +#if MODEL_VERSION == 2 + unsigned long dc; +#endif + + // Alter column NOT NULL. + // +#if MODEL_VERSION == 3 + #pragma db not_null +#endif + odb::nullable acnn; + + // Alter table add foreign key. + // +#if MODEL_VERSION == 2 + #pragma db null + unsigned long afk; +#else + object1* afk; +#endif + + // Add unique index. + // +#if MODEL_VERSION == 3 + #pragma db unique +#endif + unsigned long aui; + + public: +#if MODEL_VERSION == 2 + object (std::string id = ""): id_ (id), dfk (0) {} + ~object () {delete dfk;} +#else + object (std::string id = ""): id_ (id), afk (0) {} + ~object () {delete afk;} +#endif + }; +} + +#undef MODEL_NAMESPACE +#undef MODEL_NAMESPACE_IMPL diff --git a/evolution/combined/test1.hxx b/evolution/combined/test1.hxx new file mode 100644 index 0000000..ead9591 --- /dev/null +++ b/evolution/combined/test1.hxx @@ -0,0 +1,12 @@ +// file : evolution/combined/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 + +#define MODEL_VERSION 2 +#include "model.hxx" +#undef MODEL_VERSION + +#endif // TEST1_HXX diff --git a/evolution/combined/test2.hxx b/evolution/combined/test2.hxx new file mode 100644 index 0000000..2c75fac --- /dev/null +++ b/evolution/combined/test2.hxx @@ -0,0 +1,12 @@ +// file : evolution/combined/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 3 +#include "model.hxx" +#undef MODEL_VERSION + +#endif // TEST2_HXX diff --git a/evolution/makefile b/evolution/makefile index 867fd3e..9406d55 100644 --- a/evolution/makefile +++ b/evolution/makefile @@ -14,6 +14,7 @@ add-foreign-key \ drop-foreign-key \ add-index \ drop-index \ +combined \ template default := $(out_base)/ -- cgit v1.1