From 649c1abcceab97c8ece976cc30bab0e3aaa3be54 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 17 Sep 2013 12:01:47 +0200
Subject: Add schema name to changelog

---
 evolution/data/driver.cxx | 1 -
 evolution/data/makefile   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'evolution/data')

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
-- 
cgit v1.1