[#3794] Fix sorting of database upgrade scripts

diff --git a/configure.ac b/configure.ac
index 57c5f80b0ef63800599b39933a511a50f06b86f9..8d11ba82bd0a5977ee2555e3977f2902ba4555a6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1767,8 +1767,8 @@ AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_020_to_021.sh],
                 [chmod +x src/share/database/scripts/mysql/upgrade_020_to_021.sh])
 AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_021_to_022.sh],
                 [chmod +x src/share/database/scripts/mysql/upgrade_021_to_022.sh])
-AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_022_to_022.1.sh],
-                [chmod +x src/share/database/scripts/mysql/upgrade_022_to_022.1.sh])
+AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_022.0_to_022.1.sh],
+                [chmod +x src/share/database/scripts/mysql/upgrade_022.0_to_022.1.sh])
 AC_CONFIG_FILES([src/share/database/scripts/mysql/upgrade_022.1_to_022.2.sh],
                 [chmod +x src/share/database/scripts/mysql/upgrade_022.1_to_022.2.sh])
 AC_CONFIG_FILES([src/share/database/scripts/mysql/wipe_data.sh],
@@ -1828,8 +1828,8 @@ AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_020_to_021.sh],
                 [chmod +x src/share/database/scripts/pgsql/upgrade_020_to_021.sh])
 AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_021_to_022.sh],
                 [chmod +x src/share/database/scripts/pgsql/upgrade_021_to_022.sh])
-AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_022_to_022.1.sh],
-                [chmod +x src/share/database/scripts/pgsql/upgrade_022_to_022.1.sh])
+AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_022.0_to_022.1.sh],
+                [chmod +x src/share/database/scripts/pgsql/upgrade_022.0_to_022.1.sh])
 AC_CONFIG_FILES([src/share/database/scripts/pgsql/upgrade_022.1_to_022.2.sh],
                 [chmod +x src/share/database/scripts/pgsql/upgrade_022.1_to_022.2.sh])
 AC_CONFIG_FILES([src/share/database/scripts/pgsql/wipe_data.sh],

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 6a321a349615ff968da20dbba925e5fe12c2e4f5..b1172ff8ca6f87334f41a27dd18b11fa0acd0037 100644 (file)
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -371,7 +371,7 @@ mysql_upgrade() {
     printf "Verifying upgrade permissions for %s\n" "$db_user"
     mysql_can_create
 
-    upgrade_scripts=$(find "${upgrade_scripts_dir}" -type f -name 'upgrade_*.sh' | sort -t'_' -k4 -V)
+    upgrade_scripts=$(find "${upgrade_scripts_dir}" -type f -name 'upgrade_*.sh' | sort -V)
     for script in ${upgrade_scripts}
     do
         echo "Processing $script file..."
@@ -419,7 +419,7 @@ pgsql_upgrade() {
     # thru an env
     export PGPASSWORD=$db_password
 
-    upgrade_scripts=$(find "${upgrade_scripts_dir}" -type f -name 'upgrade_*.sh' | sort -t'_' -k4 -V)
+    upgrade_scripts=$(find "${upgrade_scripts_dir}" -type f -name 'upgrade_*.sh' | sort -V)
     for script in ${upgrade_scripts}
     do
         echo "Processing $script file..."

diff --git a/src/share/database/scripts/mysql/.gitignore b/src/share/database/scripts/mysql/.gitignore
index 3292703425c5c3c61c2a854d1eb35da78b4c4721..99d625e31754b81a7cb26acf1a82a95e20d01bc4 100644 (file)
--- a/src/share/database/scripts/mysql/.gitignore
+++ b/src/share/database/scripts/mysql/.gitignore
@@ -30,6 +30,6 @@
 /upgrade_019_to_020.sh
 /upgrade_020_to_021.sh
 /upgrade_021_to_022.sh
-/upgrade_022_to_022.1.sh
+/upgrade_022.0_to_022.1.sh
 /upgrade_022.1_to_022.2.sh
 /wipe_data.sh

diff --git a/src/share/database/scripts/mysql/Makefile.am b/src/share/database/scripts/mysql/Makefile.am
index a86c15710ba00436d21418bccc91deaf356c1185..c9287391f38aebe6378d46289c09f0efb8646262 100644 (file)
--- a/src/share/database/scripts/mysql/Makefile.am
+++ b/src/share/database/scripts/mysql/Makefile.am
@@ -41,7 +41,7 @@ mysql_SCRIPTS += upgrade_018_to_019.sh
 mysql_SCRIPTS += upgrade_019_to_020.sh
 mysql_SCRIPTS += upgrade_020_to_021.sh
 mysql_SCRIPTS += upgrade_021_to_022.sh
-mysql_SCRIPTS += upgrade_022_to_022.1.sh
+mysql_SCRIPTS += upgrade_022.0_to_022.1.sh
 mysql_SCRIPTS += upgrade_022.1_to_022.2.sh
 mysql_SCRIPTS += wipe_data.sh
 

diff --git a/src/share/database/scripts/mysql/upgrade_022_to_022.1.sh.in b/src/share/database/scripts/mysql/upgrade_022.0_to_022.1.sh.in
similarity index 100%
rename from src/share/database/scripts/mysql/upgrade_022_to_022.1.sh.in
rename to src/share/database/scripts/mysql/upgrade_022.0_to_022.1.sh.in

diff --git a/src/share/database/scripts/pgsql/.gitignore b/src/share/database/scripts/pgsql/.gitignore
index 1fed27d121e7244d1b6e8d08803f9c17c09258af..627a6d7cfda2232f52d70ee1ed5b5a7a372b000a 100644 (file)
--- a/src/share/database/scripts/pgsql/.gitignore
+++ b/src/share/database/scripts/pgsql/.gitignore
@@ -25,6 +25,6 @@
 /upgrade_019_to_020.sh
 /upgrade_020_to_021.sh
 /upgrade_021_to_022.sh
-/upgrade_022_to_022.1.sh
+/upgrade_022.0_to_022.1.sh
 /upgrade_022.1_to_022.2.sh
 /wipe_data.sh

diff --git a/src/share/database/scripts/pgsql/Makefile.am b/src/share/database/scripts/pgsql/Makefile.am
index e8346181098058cfb3a66476d0428477f0979932..5a3aa1258940f9d7eaec2511182c5212062eef52 100644 (file)
--- a/src/share/database/scripts/pgsql/Makefile.am
+++ b/src/share/database/scripts/pgsql/Makefile.am
@@ -36,7 +36,7 @@ pgsql_SCRIPTS += upgrade_018_to_019.sh
 pgsql_SCRIPTS += upgrade_019_to_020.sh
 pgsql_SCRIPTS += upgrade_020_to_021.sh
 pgsql_SCRIPTS += upgrade_021_to_022.sh
-pgsql_SCRIPTS += upgrade_022_to_022.1.sh
+pgsql_SCRIPTS += upgrade_022.0_to_022.1.sh
 pgsql_SCRIPTS += upgrade_022.1_to_022.2.sh
 pgsql_SCRIPTS += wipe_data.sh
 

diff --git a/src/share/database/scripts/pgsql/upgrade_022_to_022.1.sh.in b/src/share/database/scripts/pgsql/upgrade_022.0_to_022.1.sh.in
similarity index 100%
rename from src/share/database/scripts/pgsql/upgrade_022_to_022.1.sh.in
rename to src/share/database/scripts/pgsql/upgrade_022.0_to_022.1.sh.in