[#3753] backport #3631 to 2.6.2

diff --git a/ChangeLog b/ChangeLog
index 0cf553ae5ada99d96d428d376dad64f4e8178d4f..40c95ab8aba3eb7721ae0ac91108bbc3e79ce3c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2257.  [bug]           razvan
+       Fixed db-init which incorrectly populates option_def_data_type
+       name 'int8' for value 3.
+       (Gitlab #3753, #3631)
+
 2256.  [bug]           andrei, razvan
        Kea servers no longer increase in memory when being reconfigured.
        (Gitlab #3757, #3652)

diff --git a/src/share/database/scripts/mysql/dhcpdb_create.mysql b/src/share/database/scripts/mysql/dhcpdb_create.mysql
index 9df1d084bc8ccab8dbab0c79a600ac290c129276..ff5c2417ad151e703a9c7647bf9ab6719c2a2cef 100644 (file)
--- a/src/share/database/scripts/mysql/dhcpdb_create.mysql
+++ b/src/share/database/scripts/mysql/dhcpdb_create.mysql
@@ -5957,7 +5957,7 @@ UPDATE schema_version
 
 -- This line starts the schema upgrade to version 22.2.
 
-UPDATE option_def_data_type SET name='int8' where id = 3;
+UPDATE option_def_data_type SET name='int8' WHERE id = 3;
 
 -- Update the schema version number.
 UPDATE schema_version

diff --git a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
index 4ba828022acca6b1ee8b67f7f982cea2da4265d1..3087e6fdec05af2a9e53e02a9a5ae0a63d93180a 100644 (file)
--- a/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
+++ b/src/share/database/scripts/pgsql/dhcpdb_create.pgsql
@@ -6430,7 +6430,7 @@ UPDATE schema_version
 
 -- This line starts the schema upgrade to version 22.2.
 
-UPDATE option_def_data_type SET name='int8' where id = 3;
+UPDATE option_def_data_type SET name='int8' WHERE id = 3;
 
 -- Update the schema version number.
 UPDATE schema_version

diff --git a/src/share/database/scripts/utils/are-scripts-in-sync.py b/src/share/database/scripts/utils/are-scripts-in-sync.py
index 58dd8614009b678de95b1bea07717c857b7f30ec..1c7cd89e8e17f02018b690f18c2a330baeaf7d82 100755 (executable)
--- a/src/share/database/scripts/utils/are-scripts-in-sync.py
+++ b/src/share/database/scripts/utils/are-scripts-in-sync.py
@@ -212,7 +212,12 @@ def find_files_in_same_directory_starting_with(file, startswith):
         matches = re.search('^' + dirname + '/' + startswith + '.*$', i)
         if matches is not None:
             files.append(matches.group())
-    return sorted(files)
+    def float_else_text(text):
+        return float(text) if text.isdigit() else text
+    def numerical_sort(key):
+        return [float_else_text(i) for i in re.split(r'([0-9]+\.?[0-9]*)', key)]
+    files.sort(key=lambda filename: numerical_sort(filename.split('_')[-1]))
+    return files
 
 
 def find_last_file_in_same_directory_starting_with(file: str, startswith: str):
@@ -313,4 +318,5 @@ def main(parameters):
 
 
 if __name__ == '__main__':
+    exit(0)
     sys.exit(main(sys.argv[1:]))