summaryrefslogtreecommitdiff
path: root/odb/relational
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-04-26 11:43:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-04-26 11:43:10 +0200
commitf85d634ac895a6ad937d8bc0861cc483d07da1cb (patch)
treea165a322380ae69c21bf2e3c48e1c6738d971a76 /odb/relational
parent1bcf16e4a89a09346813c1c47e75da99f74a65fe (diff)
Add database name to changelog
Diffstat (limited to 'odb/relational')
-rw-r--r--odb/relational/changelog.cxx7
-rw-r--r--odb/relational/generate.hxx2
2 files changed, 5 insertions, 4 deletions
diff --git a/odb/relational/changelog.cxx b/odb/relational/changelog.cxx
index af6371a..bae2a2c 100644
--- a/odb/relational/changelog.cxx
+++ b/odb/relational/changelog.cxx
@@ -655,9 +655,10 @@ namespace relational
changelog* old,
std::string const& in_name,
std::string const& out_name,
- bool force_init)
+ options const& ops)
{
- cutl::shared_ptr<changelog> cl (new (shared) changelog);
+ cutl::shared_ptr<changelog> cl (
+ new (shared) changelog (ops.database ()[0].string ()));
graph& g (*cl);
if (old == 0)
@@ -673,7 +674,7 @@ namespace relational
throw operation_failed ();
}
- if (!force_init)
+ if (!ops.init_changelog ())
cerr << out_name << ": info: initializing changelog with base " <<
"version " << mv.base << endl;
diff --git a/odb/relational/generate.hxx b/odb/relational/generate.hxx
index 864f241..d26488b 100644
--- a/odb/relational/generate.hxx
+++ b/odb/relational/generate.hxx
@@ -49,7 +49,7 @@ namespace relational
semantics::relational::changelog* old, // Can be NULL.
std::string const& in_name,
std::string const& out_name,
- bool force_init);
+ options const&);
}
namespace schema