aboutsummaryrefslogtreecommitdiff
path: root/odb/database.ixx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-08-27 08:20:23 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-08-27 08:20:23 +0200
commit7c3e06b937e57bf57216b5c63b538d27da005227 (patch)
tree7215da225e37ddb9c997efb2a5de25b84b288b46 /odb/database.ixx
parent91830e3bd38a05c73d03a5dfb88997799d44274b (diff)
Add support for getting version and migration flag in one structure
Diffstat (limited to 'odb/database.ixx')
-rw-r--r--odb/database.ixx15
1 files changed, 9 insertions, 6 deletions
diff --git a/odb/database.ixx b/odb/database.ixx
index 066afd6..817aebe 100644
--- a/odb/database.ixx
+++ b/odb/database.ixx
@@ -24,19 +24,22 @@ namespace odb
inline database::schema_version_type database::
schema_version (const std::string& name) const
{
- schema_version_map::const_iterator i (schema_version_map_.find (name));
- return i != schema_version_map_.end () && i->second.version != 0
- ? i->second.version
- : load_schema_version (name).version;
+ return schema_version_migration (name).version;
}
inline bool database::
schema_migration (const std::string& name) const
{
+ return schema_version_migration (name).migration;
+ }
+
+ inline const database::schema_version_migration_type& database::
+ schema_version_migration (const std::string& name) const
+ {
schema_version_map::const_iterator i (schema_version_map_.find (name));
return i != schema_version_map_.end () && i->second.version != 0
- ? i->second.migration
- : load_schema_version (name).migration;
+ ? i->second
+ : load_schema_version (name);
}
inline void database::