From: Andrei Pavel <andrei@isc.org>
Date: Wed, 14 May 2025 06:46:40 +0000 (+0300)
Subject: [#3789] Extend the change to upgrade scripts down to Kea 2.6
X-Git-Tag: Kea-2.7.9~80
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5683641bf32d8649e66f1382af1be7e20daa00f6;p=thirdparty%2Fkea.git

[#3789] Extend the change to upgrade scripts down to Kea 2.6
---

diff --git a/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in b/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in
index 3445aa8c04..a5e0d0d7a8 100755
--- a/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_022_to_023.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if [ "$version" != "22.0" ] && [ "$version" != "22.1" ] && [ "$version" != "22.2" ]; then
-    printf 'This script upgrades 22.0 or 22.1 to 23.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != "22"; then
+    printf 'This script upgrades 22.* to 23.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in b/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
index 8f974ec102..9d3337b29f 100755
--- a/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_023_to_024.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if test "${version}" != "23.0"; then
-    printf 'This script upgrades 23.0 to 24.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '23'; then
+    printf 'This script upgrades 23.* to 24.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in b/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in
index 96a9f332c6..3b0b4ddc64 100755
--- a/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_024_to_025.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if test "${version}" != "24.0"; then
-    printf 'This script upgrades 24.0 to 25.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '24'; then
+    printf 'This script upgrades 24.* to 25.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
index de95d6d594..7b2cb3a10b 100755
--- a/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_025_to_026.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if test "${version}" != "25.0"; then
-    printf 'This script upgrades 25.0 to 26.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '25'; then
+    printf 'This script upgrades 25.* to 26.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in b/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in
index 8ebd55da40..7d81b797fe 100755
--- a/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_026_to_027.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if test "${version}" != "26.0"; then
-    printf 'This script upgrades 27.0 to 27.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '26'; then
+    printf 'This script upgrades 26.* to 27.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in b/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in
index 0d11734900..cfae3d9653 100755
--- a/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_027_to_028.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if test "${version}" != "27.0"; then
-    printf 'This script upgrades 27.0 to 28.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '27'; then
+    printf 'This script upgrades 27.* to 28.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/mysql/upgrade_028_to_029.sh.in b/src/share/database/scripts/mysql/upgrade_028_to_029.sh.in
index c8f0b0af14..1ce4458fe7 100755
--- a/src/share/database/scripts/mysql/upgrade_028_to_029.sh.in
+++ b/src/share/database/scripts/mysql/upgrade_028_to_029.sh.in
@@ -26,10 +26,10 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-# Check version.
-version=$(mysql_version "${@}")
-if test "${version}" != "28.0"; then
-    printf 'This script upgrades 28.0 to 29.0. '
+# Check only major version to allow for intermediary backported schema changes.
+version=$(mysql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '28'; then
+    printf 'This script upgrades 28.* to 29.0. '
     printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
diff --git a/src/share/database/scripts/pgsql/upgrade_022_to_023.sh.in b/src/share/database/scripts/pgsql/upgrade_022_to_023.sh.in
index c224c8fba0..eee3f7249a 100755
--- a/src/share/database/scripts/pgsql/upgrade_022_to_023.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_022_to_023.sh.in
@@ -26,11 +26,11 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-VERSION=$(pgsql_version "$@")
-
-if [ "$VERSION" != "22.0" ] && [ "$VERSION" != "22.1" ] && [ "$VERSION" != "22.2" ]; then
-    printf 'This script upgrades 22.0 or 22.1 to 23.0. '
-    printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+# Check only major version to allow for intermediary backported schema changes.
+version=$(pgsql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != "22"; then
+    printf 'This script upgrades 22.* to 23.0. '
+    printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in b/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in
index de65406743..041b209b82 100755
--- a/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_023_to_024.sh.in
@@ -26,11 +26,11 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-VERSION=$(pgsql_version "$@")
-
-if [ "$VERSION" != "23.0" ]; then
-    printf 'This script upgrades 23.0 to 24.0. '
-    printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+# Check only major version to allow for intermediary backported schema changes.
+version=$(pgsql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '23'; then
+    printf 'This script upgrades 23.* to 24.0. '
+    printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_024_to_025.sh.in b/src/share/database/scripts/pgsql/upgrade_024_to_025.sh.in
index 1033e5fa16..89400318b3 100755
--- a/src/share/database/scripts/pgsql/upgrade_024_to_025.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_024_to_025.sh.in
@@ -26,11 +26,11 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-VERSION=$(pgsql_version "$@")
-
-if [ "$VERSION" != "24.0" ]; then
-    printf 'This script upgrades 24.0 to 25.0. '
-    printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+# Check only major version to allow for intermediary backported schema changes.
+version=$(pgsql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '24'; then
+    printf 'This script upgrades 24.* to 25.0. '
+    printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in b/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in
index c769b958e5..451f0f1b77 100755
--- a/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_025_to_026.sh.in
@@ -26,11 +26,11 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-VERSION=$(pgsql_version "$@")
-
-if [ "$VERSION" != "25.0" ]; then
-    printf 'This script upgrades 25.0 to 26.0. '
-    printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+# Check only major version to allow for intermediary backported schema changes.
+version=$(pgsql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '25'; then
+    printf 'This script upgrades 25.* to 26.0. '
+    printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_026_to_027.sh.in b/src/share/database/scripts/pgsql/upgrade_026_to_027.sh.in
index 31a41dfc34..16e47ff7ad 100755
--- a/src/share/database/scripts/pgsql/upgrade_026_to_027.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_026_to_027.sh.in
@@ -26,11 +26,11 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-VERSION=$(pgsql_version "$@")
-
-if [ "$VERSION" != "26.0" ]; then
-    printf 'This script upgrades 26.0 to 27.0. '
-    printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+# Check only major version to allow for intermediary backported schema changes.
+version=$(pgsql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '26'; then
+    printf 'This script upgrades 26.* to 27.0. '
+    printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi
 
diff --git a/src/share/database/scripts/pgsql/upgrade_027_to_028.sh.in b/src/share/database/scripts/pgsql/upgrade_027_to_028.sh.in
index be3a235d24..ceb7d4e0e6 100755
--- a/src/share/database/scripts/pgsql/upgrade_027_to_028.sh.in
+++ b/src/share/database/scripts/pgsql/upgrade_027_to_028.sh.in
@@ -26,11 +26,11 @@ else
     . "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
 fi
 
-VERSION=$(pgsql_version "$@")
-
-if [ "$VERSION" != "27.0" ]; then
-    printf 'This script upgrades 27.0 to 28.0. '
-    printf 'Reported version is %s. Skipping upgrade.\n' "${VERSION}"
+# Check only major version to allow for intermediary backported schema changes.
+version=$(pgsql_version "${@}" | cut -d '.' -f 1)
+if test "${version}" != '27'; then
+    printf 'This script upgrades 27.* to 28.0. '
+    printf 'Reported version is %s. Skipping upgrade.\n' "${version}"
     exit 0
 fi