aboutsummaryrefslogtreecommitdiff
path: root/evolution/data
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-09-17 12:01:47 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-09-17 12:04:03 +0200
commit649c1abcceab97c8ece976cc30bab0e3aaa3be54 (patch)
treee33b635509736d054445f92eebb73fff7e8cc5e9 /evolution/data
parent4c893bdef4b57193438e57b09627560e53f3e6d8 (diff)
Add schema name to changelog
Diffstat (limited to 'evolution/data')
-rw-r--r--evolution/data/driver.cxx1
-rw-r--r--evolution/data/makefile2
2 files changed, 1 insertions, 2 deletions
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