aboutsummaryrefslogtreecommitdiff
path: root/evolution/add-foreign-key
diff options
context:
space:
mode:
Diffstat (limited to 'evolution/add-foreign-key')
-rw-r--r--evolution/add-foreign-key/driver.cxx17
-rw-r--r--evolution/add-foreign-key/makefile45
-rw-r--r--evolution/add-foreign-key/test1.hxx4
-rw-r--r--evolution/add-foreign-key/test2.hxx2
-rw-r--r--evolution/add-foreign-key/test3.hxx12
5 files changed, 49 insertions, 31 deletions
diff --git a/evolution/add-foreign-key/driver.cxx b/evolution/add-foreign-key/driver.cxx
index 26c1f57..a05804a 100644
--- a/evolution/add-foreign-key/driver.cxx
+++ b/evolution/add-foreign-key/driver.cxx
@@ -16,10 +16,10 @@
#include <common/config.hxx> // DATABASE_XXX
#include <common/common.hxx>
-#include "test1.hxx"
#include "test2.hxx"
-#include "test1-odb.hxx"
+#include "test3.hxx"
#include "test2-odb.hxx"
+#include "test3-odb.hxx"
using namespace std;
using namespace odb::core;
@@ -30,7 +30,7 @@ main (int argc, char* argv[])
try
{
auto_ptr<database> db (create_database (argc, argv, false));
- bool embedded (schema_catalog::exists (*db, "test2"));
+ bool embedded (schema_catalog::exists (*db));
// 1 - base version
// 2 - migration
@@ -47,9 +47,10 @@ main (int argc, char* argv[])
if (embedded)
{
transaction t (db->begin ());
- schema_catalog::create_schema (*db, "test2");
- schema_catalog::create_schema (*db, "test1");
- schema_catalog::migrate_schema (*db, 2, "test2");
+ 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 ();
}
@@ -76,7 +77,7 @@ main (int argc, char* argv[])
if (embedded)
{
transaction t (db->begin ());
- schema_catalog::migrate_schema_pre (*db, 3, "test2");
+ schema_catalog::migrate_schema_pre (*db, 3);
t.commit ();
}
@@ -112,7 +113,7 @@ main (int argc, char* argv[])
if (embedded)
{
transaction t (db->begin ());
- schema_catalog::migrate_schema_post (*db, 3, "test2");
+ schema_catalog::migrate_schema_post (*db, 3);
t.commit ();
}
break;
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index 165cf37..c4eaef2 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -5,7 +5,7 @@
include $(dir $(lastword $(MAKEFILE_LIST)))../../build/bootstrap.make
cxx_tun := driver.cxx
-odb_hdr := test1.hxx test2.hxx
+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)
@@ -29,37 +29,42 @@ $(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 model.xml
+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))
-genf := $(genf1) $(genf2)
-gen := $(gen1) $(gen2)
-gens := test1.sql test2.sql test2-002-pre.sql test2-002-post.sql \
-test2-003-pre.sql test2-003-post.sql
+genf3 := test3-odb.hxx test3-odb.ixx test3-odb.cxx
+gen3 := $(addprefix $(out_base)/,$(genf3))
+
+genf := $(genf1) $(genf2) $(genf3)
+gen := $(gen1) $(gen2) $(gen3)
+gens := test1.sql test2.sql test3.sql test3-002-pre.sql test3-002-post.sql \
+test3-003-pre.sql test3-003-post.sql
$(gen): $(odb)
$(gen): odb := $(odb)
$(gen) $(dist): odb_common_options = --database $(db_id) --generate-query \
---generate-schema --omit-create --at-once --fkeys-deferrable-mode \
-not_deferrable --table-prefix evo_add_fk_
-$(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
+--generate-schema --at-once --fkeys-deferrable-mode not_deferrable \
+--table-prefix evo_add_fk_
+$(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 test2.hxx is compiled before test1.hxx since they share the
+# 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.
@@ -88,15 +93,17 @@ $(dist):
#
$(test): $(driver)
# Drop everything.
+ $(call schema,$(out_base)/test3.sql)
$(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)
+ # 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)/test2-003-pre.sql)
+ $(call schema,$(out_base)/test3-003-pre.sql)
$(call message,test $< migration,$< --options-file $(dcf_root)/db.options 2)
- $(call schema,$(out_base)/test2-003-post.sql)
+ $(call schema,$(out_base)/test3-003-post.sql)
# Current schema.
$(call message,test $< current,$< --options-file $(dcf_root)/db.options 3)
@@ -108,14 +115,14 @@ $(clean): \
$(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.
+ $(call message,,rm -f $(out_base)/test3-*.sql) # Migration files.
# Generated .gitignore.
#
ifeq ($(out_base),$(src_base))
$(driver): | $(out_base)/.gitignore
-$(out_base)/.gitignore: files := driver $(genf) $(gens)
+$(out_base)/.gitignore: files := driver model.xml $(genf) $(gens)
$(clean): $(out_base)/.gitignore.clean
$(call include,$(bld_root)/git/gitignore.make)
diff --git a/evolution/add-foreign-key/test1.hxx b/evolution/add-foreign-key/test1.hxx
index c4281dc..0c82e25 100644
--- a/evolution/add-foreign-key/test1.hxx
+++ b/evolution/add-foreign-key/test1.hxx
@@ -5,8 +5,6 @@
#ifndef TEST1_HXX
#define TEST1_HXX
-#define MODEL_VERSION 2
-#include "model.hxx"
-#undef MODEL_VERSION
+#pragma db model version(1, 1)
#endif // TEST1_HXX
diff --git a/evolution/add-foreign-key/test2.hxx b/evolution/add-foreign-key/test2.hxx
index e2d8262..a1ba8df 100644
--- a/evolution/add-foreign-key/test2.hxx
+++ b/evolution/add-foreign-key/test2.hxx
@@ -5,7 +5,7 @@
#ifndef TEST2_HXX
#define TEST2_HXX
-#define MODEL_VERSION 3
+#define MODEL_VERSION 2
#include "model.hxx"
#undef MODEL_VERSION
diff --git a/evolution/add-foreign-key/test3.hxx b/evolution/add-foreign-key/test3.hxx
new file mode 100644
index 0000000..c24a09c
--- /dev/null
+++ b/evolution/add-foreign-key/test3.hxx
@@ -0,0 +1,12 @@
+// file : evolution/add-foreign-key/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
generated by cgit v1.1 at 2024-11-01 11:27:13 +0000