From: Andrei Pavel <andrei@isc.org>
Date: Tue, 16 Jul 2024 09:25:45 +0000 (+0300)
Subject: [#3498] consider minor schema number in CI job
X-Git-Tag: Kea-2.6.1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ed501ff78090cf8d0de8798bd0fa736fa7a35f6;p=thirdparty%2Fkea.git

[#3498] consider minor schema number in CI job
---

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 399ef56a2b..58dd861400 100755
--- a/src/share/database/scripts/utils/are-scripts-in-sync.py
+++ b/src/share/database/scripts/utils/are-scripts-in-sync.py
@@ -52,13 +52,15 @@ def filter_the_noise(file, text, is_upgrade_script):
     '''
 
     # Determine the schema's latest version.
-    version = 0
+    version = None
+    pattern = re.compile(r"SET version = '(\d+)', minor = '(\d+)';")
     for i in text:
-        m = re.findall(r"SET version = '(\d+)', minor = '\d+';", i)
+        m = pattern.search(i)
         if m is not None:
-            version = max(version, int(m[0]) if len(m) else 0)
-    if version == 0:
-        print(f"ERROR: expected schema version upgrade statement of format \"SET version = '\\d+', minor = '\\d+';\" in file \"{file}\", but not found.", file=sys.stderr)
+            version = f'{m[1]}.{m[2]}'
+    if version is None:
+        print("ERROR: expected schema version upgrade statement of format "
+              f"\"SET version = '\\d+', minor = '\\d+';\" in file \"{file}\", but not found.", file=sys.stderr)
         sys.exit(2)
 
     append = False