From 340cf0935a199240f6daaab8a347e22172f4d15b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 24 Aug 2022 22:49:30 +0300 Subject: Drop all database migrations to be backward compatible with only 0.15.0 (one minor version behind) --- libbrep/build.hxx | 2 +- libbrep/build.xml | 8 +- libbrep/package.hxx | 2 +- libbrep/package.xml | 284 +++++++++++++++++----------------------------------- migrate/migrate.cxx | 109 ++------------------ 5 files changed, 102 insertions(+), 303 deletions(-) diff --git a/libbrep/build.hxx b/libbrep/build.hxx index 8662cec..120ed5c 100644 --- a/libbrep/build.hxx +++ b/libbrep/build.hxx @@ -28,7 +28,7 @@ // Used by the data migration entries. // -#define LIBBREP_BUILD_SCHEMA_VERSION_BASE 15 +#define LIBBREP_BUILD_SCHEMA_VERSION_BASE 18 #pragma db model version(LIBBREP_BUILD_SCHEMA_VERSION_BASE, 18, closed) diff --git a/libbrep/build.xml b/libbrep/build.xml index 7828df1..821444c 100644 --- a/libbrep/build.xml +++ b/libbrep/build.xml @@ -1,11 +1,5 @@ - - - - - - - + diff --git a/libbrep/package.hxx b/libbrep/package.hxx index 8b0613e..c586d74 100644 --- a/libbrep/package.hxx +++ b/libbrep/package.hxx @@ -18,7 +18,7 @@ // Used by the data migration entries. // -#define LIBBREP_PACKAGE_SCHEMA_VERSION_BASE 21 +#define LIBBREP_PACKAGE_SCHEMA_VERSION_BASE 25 #pragma db model version(LIBBREP_PACKAGE_SCHEMA_VERSION_BASE, 25, closed) diff --git a/libbrep/package.xml b/libbrep/package.xml index e556f63..2e7a613 100644 --- a/libbrep/package.xml +++ b/libbrep/package.xml @@ -1,191 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
@@ -567,7 +381,6 @@ - @@ -613,6 +426,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + @@ -656,7 +515,7 @@ - + @@ -695,7 +554,6 @@ - @@ -741,7 +599,8 @@ - + + @@ -773,6 +632,48 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -804,6 +705,7 @@ + diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx index 7e009e0..172c374 100644 --- a/migrate/migrate.cxx +++ b/migrate/migrate.cxx @@ -208,6 +208,7 @@ create (database& db, bool extra_only) const // Register the data migration functions for the package database schema. // +#if 0 template using package_migration_entry_base = data_migration_entry; @@ -219,109 +220,11 @@ struct package_migration_entry: package_migration_entry_base : package_migration_entry_base (f, "package") {} }; -static const package_migration_entry<22> -package_migrate_v22 ([] (database& db) +static const package_migration_entry<26> +package_migrate_v26 ([] (database& db) { - // Note that for both dependency and requirement - // package_*_alternative_*s.alternative_index is copied from - // package_*_alternatives.index and package_*_alternative_*s.index is set to - // 0. - // - - // Migrate dependencies. - // - db.execute ( - "INSERT INTO \"package_dependency_alternative_dependencies\" " - "(\"tenant\", " - "\"name\", " - "\"version_epoch\", " - "\"version_canonical_upstream\", " - "\"version_canonical_release\", " - "\"version_revision\", " - "\"dependency_index\", " - "\"alternative_index\", " - "\"index\", " - "\"dep_name\", " - "\"dep_min_version_epoch\", " - "\"dep_min_version_canonical_upstream\", " - "\"dep_min_version_canonical_release\", " - "\"dep_min_version_revision\", " - "\"dep_min_version_upstream\", " - "\"dep_min_version_release\", " - "\"dep_max_version_epoch\", " - "\"dep_max_version_canonical_upstream\", " - "\"dep_max_version_canonical_release\", " - "\"dep_max_version_revision\", " - "\"dep_max_version_upstream\", " - "\"dep_max_version_release\", " - "\"dep_min_open\", " - "\"dep_max_open\", " - "\"dep_package_tenant\", " - "\"dep_package_name\", " - "\"dep_package_version_epoch\", " - "\"dep_package_version_canonical_upstream\", " - "\"dep_package_version_canonical_release\", " - "\"dep_package_version_revision\") " - "SELECT " - "\"tenant\", " - "\"name\", " - "\"version_epoch\", " - "\"version_canonical_upstream\", " - "\"version_canonical_release\", " - "\"version_revision\", " - "\"dependency_index\", " - "\"index\", " - "0, " - "\"dep_name\", " - "\"dep_min_version_epoch\", " - "\"dep_min_version_canonical_upstream\", " - "\"dep_min_version_canonical_release\", " - "\"dep_min_version_revision\", " - "\"dep_min_version_upstream\", " - "\"dep_min_version_release\", " - "\"dep_max_version_epoch\", " - "\"dep_max_version_canonical_upstream\", " - "\"dep_max_version_canonical_release\", " - "\"dep_max_version_revision\", " - "\"dep_max_version_upstream\", " - "\"dep_max_version_release\", " - "\"dep_min_open\", " - "\"dep_max_open\", " - "\"dep_package_tenant\", " - "\"dep_package_name\", " - "\"dep_package_version_epoch\", " - "\"dep_package_version_canonical_upstream\", " - "\"dep_package_version_canonical_release\", " - "\"dep_package_version_revision\" " - "FROM \"package_dependency_alternatives\""); - - // Migrate requirements. - // - db.execute ( - "INSERT INTO \"package_requirement_alternative_requirements\" " - "(\"tenant\", " - "\"name\", " - "\"version_epoch\", " - "\"version_canonical_upstream\", " - "\"version_canonical_release\", " - "\"version_revision\", " - "\"requirement_index\", " - "\"alternative_index\", " - "\"index\", " - "\"id\") " - "SELECT " - "\"tenant\", " - "\"name\", " - "\"version_epoch\", " - "\"version_canonical_upstream\", " - "\"version_canonical_release\", " - "\"version_revision\", " - "\"requirement_index\", " - "\"index\", " - "0, " - "\"id\" " - "FROM \"package_requirement_alternatives\""); }); +#endif // Register the data migration functions for the build database schema. // @@ -337,8 +240,8 @@ struct build_migration_entry: build_migration_entry_base : build_migration_entry_base (f, "build") {} }; -static const build_migration_entry<16> -build_migrate_v16 ([] (database& db) +static const build_migration_entry<19> +build_migrate_v19 ([] (database& db) { }); #endif -- cgit v1.1