diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 10:55:38 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-08-30 10:55:38 +0200 |
| commit | cbe25ebe1e97fd1064e7479447122deb5589140f (patch) | |
| tree | fd1f90329cdbaa8fe78a4a5c1b13c87b78ab66fe | |
| parent | 181288d31428d0c9c240c670f70cae25abf6a74f (diff) | |
Remove backwards-compatibility kludges
| -rw-r--r-- | bpkg/package | 4 | ||||
| -rw-r--r-- | bpkg/package.xml | 31 |
2 files changed, 14 insertions, 21 deletions
diff --git a/bpkg/package b/bpkg/package index 533c919..f70a198 100644 --- a/bpkg/package +++ b/bpkg/package @@ -19,7 +19,7 @@ #include <bpkg/types> #include <bpkg/utility> -#pragma db model version(2, 3, open) +#pragma db model version(3, 3, open) namespace bpkg { @@ -574,8 +574,6 @@ namespace bpkg #pragma db member(prerequisites) id_column("package") \ key_column("prerequisite") value_column("") key_not_null - #pragma db member(substate) default("none") - private: friend class odb::access; selected_package () = default; diff --git a/bpkg/package.xml b/bpkg/package.xml index 268cdc4..0602880 100644 --- a/bpkg/package.xml +++ b/bpkg/package.xml @@ -1,22 +1,5 @@ <changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="sqlite" version="1"> - <changeset version="3"> - <alter-table name="selected_package"> - <add-column name="substate" type="TEXT" null="true" default="'none'"/> - </alter-table> - <add-table name="certificate" kind="object"> - <column name="fingerprint" type="TEXT" null="true"/> - <column name="name" type="TEXT" null="true"/> - <column name="organization" type="TEXT" null="true"/> - <column name="email" type="TEXT" null="true"/> - <column name="start_date" type="INTEGER" null="true"/> - <column name="end_date" type="INTEGER" null="true"/> - <primary-key> - <column name="fingerprint"/> - </primary-key> - </add-table> - </changeset> - - <model version="2"> + <model version="3"> <table name="repository" kind="object"> <column name="name" type="TEXT" null="true"/> <column name="location" type="TEXT" null="true"/> @@ -203,6 +186,7 @@ <column name="version_upstream" type="TEXT" null="true"/> <column name="version_release" type="TEXT" null="true"/> <column name="state" type="TEXT" null="true"/> + <column name="substate" type="TEXT" null="true"/> <column name="hold_package" type="INTEGER" null="true"/> <column name="hold_version" type="INTEGER" null="true"/> <column name="repository" type="TEXT" null="true"/> @@ -248,5 +232,16 @@ </references> </foreign-key> </table> + <table name="certificate" kind="object"> + <column name="fingerprint" type="TEXT" null="true"/> + <column name="name" type="TEXT" null="true"/> + <column name="organization" type="TEXT" null="true"/> + <column name="email" type="TEXT" null="true"/> + <column name="start_date" type="INTEGER" null="true"/> + <column name="end_date" type="INTEGER" null="true"/> + <primary-key> + <column name="fingerprint"/> + </primary-key> + </table> </model> </changelog> |