diff options
Diffstat (limited to 'evolution/combined')
| -rw-r--r-- | evolution/combined/driver.cxx | 1 | ||||
| -rw-r--r-- | evolution/combined/makefile | 2 |
2 files changed, 1 insertions, 2 deletions
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 |