#
#
# patch "README.encapsulation"
#  from [6abfc727291faeeba7b5a9765fc0d532c1b2ee45]
#    to [0091d08cf3c4ac0578368780fd08a11e6990aa33]
# 
# patch "cmd_db.cc"
#  from [00600193ed44613bcc5a0b56ecfbea64499f80cf]
#    to [05124dc0f527bbdb045e172f8ae6837f8ed05afa]
# 
# patch "cmd_list.cc"
#  from [a5a146e8d721c2030c7fa8ff49c75c6be8d91c54]
#    to [d6affac89cf331ad5b46a6dbe402acf23c693808]
# 
# patch "database.cc"
#  from [6e7382ffc7555810d4c542e8e1c14dd85ac57b65]
#    to [067dba3d50831eb3559c75ab4405ae20098220dd]
# 
# patch "database.hh"
#  from [3ec4411410d8cf61559ccf763e68a3d59390a96a]
#    to [961df1f9744a0c06c4a7729275e4cc5b6fb8cdb5]
#
============================================================
--- README.encapsulation	6abfc727291faeeba7b5a9765fc0d532c1b2ee45
+++ README.encapsulation	0091d08cf3c4ac0578368780fd08a11e6990aa33
@@ -8,12 +8,6 @@ database.cc:
        __app->opts.branchname
        __app->get_project()
 
-  database::test_migration_step()
-       __app->keys
-
-  database::migrate()
-       __app->keys
-
   accessor hacks:
   __app->keys
     get_key_store()
============================================================
--- cmd_db.cc	00600193ed44613bcc5a0b56ecfbea64499f80cf
+++ cmd_db.cc	05124dc0f527bbdb045e172f8ae6837f8ed05afa
@@ -97,7 +97,7 @@ CMD(db_migrate, "migrate", "", CMD_REF(d
   N(args.size() == 0,
     F("no arguments needed"));
 
-  app.db.migrate();
+  app.db.migrate(app.keys);
 }
 
 CMD(db_execute, "execute", "", CMD_REF(db), "",
@@ -370,7 +370,7 @@ CMD_HIDDEN(test_migration_step, "test_mi
 {
   if (args.size() != 1)
     throw usage(execid);
-  app.db.test_migration_step(idx(args,0)());
+  app.db.test_migration_step(idx(args,0)(), app.keys);
 }
 
 CMD_HIDDEN(rev_height, "rev_height", "", CMD_REF(informative), N_("REV"),
============================================================
--- cmd_list.cc	a5a146e8d721c2030c7fa8ff49c75c6be8d91c54
+++ cmd_list.cc	d6affac89cf331ad5b46a6dbe402acf23c693808
@@ -585,7 +585,7 @@ CMD_AUTOMATE(keys, "",
       db.get_key_ids(dbkeys);
       guard.commit();
     }
-  key_store & keys = db.get_key_store();
+  key_store & keys = app.keys;
   keys.get_key_ids(kskeys);
 
   for (vector<rsa_keypair_id>::iterator i = dbkeys.begin();
============================================================
--- database.cc	6e7382ffc7555810d4c542e8e1c14dd85ac57b65
+++ database.cc	067dba3d50831eb3559c75ab4405ae20098220dd
@@ -676,17 +676,17 @@ void
 }
 
 void
-database::migrate()
+database::migrate(key_store & keys)
 {
   ensure_open_for_maintenance();
-  migrate_sql_schema(__sql, get_filename(), __app->keys);
+  migrate_sql_schema(__sql, get_filename(), keys);
 }
 
 void
-database::test_migration_step(string const & schema)
+database::test_migration_step(string const & schema, key_store & keys)
 {
   ensure_open_for_maintenance();
-  ::test_migration_step(__sql, get_filename(), __app->keys, schema);
+  ::test_migration_step(__sql, get_filename(), keys, schema);
 }
 
 void
============================================================
--- database.hh	3ec4411410d8cf61559ccf763e68a3d59390a96a
+++ database.hh	961df1f9744a0c06c4a7729275e4cc5b6fb8cdb5
@@ -549,8 +549,8 @@ public:
   void load(std::istream &);
   void info(std::ostream &);
   void version(std::ostream &);
-  void migrate();
-  void test_migration_step(std::string const &);
+  void migrate(key_store &);
+  void test_migration_step(std::string const &, key_store &);
   // for kill_rev_locally:
   void delete_existing_rev_and_certs(revision_id const & rid);
   // for kill_branch_certs_locally: