Add schema name to changelog

32 files changed, 16 insertions, 32 deletions

diff --git a/evolution/add-column/driver.cxx b/evolution/add-column/driver.cxx
index a619895..68970d3 100644
--- a/evolution/add-column/driver.cxx
+++ b/evolution/add-column/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/add-column/makefile b/evolution/add-column/makefile
index 52b5371..0914c44 100644
--- a/evolution/add-column/makefile
+++ b/evolution/add-column/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/add-foreign-key/driver.cxx b/evolution/add-foreign-key/driver.cxx
index a05804a..0192357 100644
--- a/evolution/add-foreign-key/driver.cxx
+++ b/evolution/add-foreign-key/driver.cxx
@@ -48,7 +48,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/add-foreign-key/makefile b/evolution/add-foreign-key/makefile
index a385184..63ac218 100644
--- a/evolution/add-foreign-key/makefile
+++ b/evolution/add-foreign-key/makefile
@@ -42,7 +42,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/add-index/driver.cxx b/evolution/add-index/driver.cxx
index bb369e5..8d388ba 100644
--- a/evolution/add-index/driver.cxx
+++ b/evolution/add-index/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/add-index/makefile b/evolution/add-index/makefile
index 0b889aa..61b0899 100644
--- a/evolution/add-index/makefile
+++ b/evolution/add-index/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/add-table/driver.cxx b/evolution/add-table/driver.cxx
index 163fe30..bd62068 100644
--- a/evolution/add-table/driver.cxx
+++ b/evolution/add-table/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/add-table/makefile b/evolution/add-table/makefile
index 337263a..b28f057 100644
--- a/evolution/add-table/makefile
+++ b/evolution/add-table/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/alter-column/driver.cxx b/evolution/alter-column/driver.cxx
index a51d09a..1a46100 100644
--- a/evolution/alter-column/driver.cxx
+++ b/evolution/alter-column/driver.cxx
@@ -51,7 +51,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/alter-column/makefile b/evolution/alter-column/makefile
index 095620c..8884fe9 100644
--- a/evolution/alter-column/makefile
+++ b/evolution/alter-column/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/combined/driver.cxx b/evolution/combined/driver.cxx
index 4152133..c48b9fd 100644
--- a/evolution/combined/driver.cxx
+++ b/evolution/combined/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/combined/makefile b/evolution/combined/makefile
index 5c0bbbb..6bf3512 100644
--- a/evolution/combined/makefile
+++ b/evolution/combined/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/data/driver.cxx b/evolution/data/driver.cxx
index 0a700c7..7daa5c9 100644
--- a/evolution/data/driver.cxx
+++ b/evolution/data/driver.cxx
@@ -91,7 +91,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/data/makefile b/evolution/data/makefile
index 98e852a..08c0772 100644
--- a/evolution/data/makefile
+++ b/evolution/data/makefile
@@ -39,7 +39,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/drop-column/driver.cxx b/evolution/drop-column/driver.cxx
index 6e72f7d..60eba06 100644
--- a/evolution/drop-column/driver.cxx
+++ b/evolution/drop-column/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/drop-column/makefile b/evolution/drop-column/makefile
index f22097e..8f8d56d 100644
--- a/evolution/drop-column/makefile
+++ b/evolution/drop-column/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/drop-foreign-key/driver.cxx b/evolution/drop-foreign-key/driver.cxx
index bd42f5d..7d97af9 100644
--- a/evolution/drop-foreign-key/driver.cxx
+++ b/evolution/drop-foreign-key/driver.cxx
@@ -51,7 +51,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/drop-foreign-key/makefile b/evolution/drop-foreign-key/makefile
index 39e1633..cfd573d 100644
--- a/evolution/drop-foreign-key/makefile
+++ b/evolution/drop-foreign-key/makefile
@@ -42,7 +42,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/drop-index/driver.cxx b/evolution/drop-index/driver.cxx
index 7a04322..39eedcf 100644
--- a/evolution/drop-index/driver.cxx
+++ b/evolution/drop-index/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/drop-index/makefile b/evolution/drop-index/makefile
index eec3cf7..b329e16 100644
--- a/evolution/drop-index/makefile
+++ b/evolution/drop-index/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/drop-table/driver.cxx b/evolution/drop-table/driver.cxx
index 9f60214..55e2528 100644
--- a/evolution/drop-table/driver.cxx
+++ b/evolution/drop-table/driver.cxx
@@ -45,7 +45,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/drop-table/makefile b/evolution/drop-table/makefile
index ed46f61..d0d97ec 100644
--- a/evolution/drop-table/makefile
+++ b/evolution/drop-table/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/embedded/driver.cxx b/evolution/embedded/driver.cxx
index ef274ee..60c8c18 100644
--- a/evolution/embedded/driver.cxx
+++ b/evolution/embedded/driver.cxx
@@ -46,7 +46,6 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
           schema_catalog::drop_schema (*db);
-          schema_catalog::drop_schema (*db, "2");
           t.commit ();
         }
 
diff --git a/evolution/embedded/makefile b/evolution/embedded/makefile
index 3e351ad..b88f7b6 100644
--- a/evolution/embedded/makefile
+++ b/evolution/embedded/makefile
@@ -39,7 +39,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/soft-add/driver.cxx b/evolution/soft-add/driver.cxx
index 190cc0c..5ea54d5 100644
--- a/evolution/soft-add/driver.cxx
+++ b/evolution/soft-add/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/soft-add/makefile b/evolution/soft-add/makefile
index 87a8aa9..11a37ef 100644
--- a/evolution/soft-add/makefile
+++ b/evolution/soft-add/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query --generate-prepared \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/soft-delete/driver.cxx b/evolution/soft-delete/driver.cxx
index 7fc7b49..fa5c810 100644
--- a/evolution/soft-delete/driver.cxx
+++ b/evolution/soft-delete/driver.cxx
@@ -48,7 +48,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/soft-delete/makefile b/evolution/soft-delete/makefile
index f4c5091..657191b 100644
--- a/evolution/soft-delete/makefile
+++ b/evolution/soft-delete/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query --generate-prepared \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/template/driver.cxx b/evolution/template/driver.cxx
index b2ff10e..c5101c6 100644
--- a/evolution/template/driver.cxx
+++ b/evolution/template/driver.cxx
@@ -47,7 +47,6 @@ main (int argc, char* argv[])
         {
           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 ();
diff --git a/evolution/template/makefile b/evolution/template/makefile
index 1911ea8..92b2ba7 100644
--- a/evolution/template/makefile
+++ b/evolution/template/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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
diff --git a/evolution/version/driver.cxx b/evolution/version/driver.cxx
index 81ce4cf..b171969 100644
--- a/evolution/version/driver.cxx
+++ b/evolution/version/driver.cxx
@@ -48,7 +48,6 @@ main (int argc, char* argv[])
         {
           transaction t (db->begin ());
           schema_catalog::drop_schema (*db);
-          schema_catalog::drop_schema (*db, "2");
 
           assert (db->schema_version () == 0);
 
diff --git a/evolution/version/makefile b/evolution/version/makefile
index 4a2721f..1b20f52 100644
--- a/evolution/version/makefile
+++ b/evolution/version/makefile
@@ -41,7 +41,7 @@ $(gen) $(dist): odb_common_options = --generate-query \
 $(gen): odb_common_options += --database $(db_id)
 $(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
+--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