diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-07-20 14:12:26 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-07-20 14:12:26 +0300 |
| commit | 88da1215cc9c1790f3cd111417dae72910c8f2fc (patch) | |
| tree | 67ad7ebfb2d3c18bf92436fe1933f1ea3893bacb | |
| parent | a3bf80032f639fe079ce37514e84dc1a1d85c3ed (diff) | |
Fix recent database migrations drop regenerating package.xml
| -rw-r--r-- | bpkg/database.cxx | 10 | ||||
| -rw-r--r-- | bpkg/package.xml | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/bpkg/database.cxx b/bpkg/database.cxx index 4f82bed..ba4ab10 100644 --- a/bpkg/database.cxx +++ b/bpkg/database.cxx @@ -50,16 +50,8 @@ namespace bpkg template <odb::schema_version v> using migration_entry = odb::data_migration_entry<v, DB_SCHEMA_VERSION_BASE>; - // Migrate tables that contain package version columns converting the - // default zero version epoch to one, unless the version is a stub. - // - // Note that we can't really distinguish the default zero epoch from an - // explicitly specified one, so will just update all of them, assuming that - // it is currently unlikely that the epoch was specified explicitly for any - // package version. - // static const migration_entry<6> - migrate_epoch_entry ([] (odb::database& db) + migrate_v6 ([] (odb::database& db) { }); #endif diff --git a/bpkg/package.xml b/bpkg/package.xml index 0cb00c1..6c17f11 100644 --- a/bpkg/package.xml +++ b/bpkg/package.xml @@ -1,7 +1,5 @@ <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1"> - <changeset version="5"/> - - <model version="4"> + <model version="5"> <table name="repository_fragment" kind="object"> <column name="name" type="TEXT" null="true"/> <column name="url" type="TEXT" null="true"/> |