script improvs

Author: codedmonkey

.github/scripts/normalize-psql-schema.py .github/scripts/normalize-psql-dump.py.github/scripts/normalize-psql-schema.py renamed to .github/scripts/normalize-psql-dump.py

@@ -1,14 +1,13 @@
 import sys
 import re
 
-EXCLUDED_PREFIXES = ('SET ', 'SELECT ', 'GRANT ', 'REVOKE ', '\\')
-
 
 def filter_lines(text):
     """Remove irrelevant lines from the schema dump"""
+    excluded_prefixes = ('SET ', 'SELECT ', 'GRANT ', 'REVOKE ', '\\')
     lines = [
         line for line in text.splitlines(keepends=True)
-        if line.strip() and not line.startswith(EXCLUDED_PREFIXES)
+        if line.strip() and not line.startswith(excluded_prefixes)
     ]
     return ''.join(lines)
 

.github/workflows/database.yaml

@@ -179,11 +179,11 @@ jobs:
         run: |
           pg_dump -U dirigent -h localhost dirigent \
             --schema-only --no-comments --no-privileges --no-owner \
-            | python3 .github/scripts/normalize-psql-schema.py \
+            | python3 .github/scripts/normalize-psql-dump.py \
             > /tmp/schema_baseline.sql
           pg_dump -U dirigent -h localhost dirigent \
             --data-only --no-comments --no-privileges --no-owner \
-            | python3 .github/scripts/normalize-psql-schema.py \
+            | python3 .github/scripts/normalize-psql-dump.py \
             > /tmp/data_baseline.sql
 
       - name: Install Composer dependencies for current branch
@@ -205,11 +205,11 @@ jobs:
         run: |
           pg_dump -U dirigent -h localhost dirigent \
             --schema-only --no-comments --no-privileges --no-owner \
-            | python3 .github/scripts/normalize-psql-schema.py \
+            | python3 .github/scripts/normalize-psql-dump.py \
             > /tmp/schema_reverted.sql
           pg_dump -U dirigent -h localhost dirigent \
             --data-only --no-comments --no-privileges --no-owner \
-            | python3 .github/scripts/normalize-psql-schema.py \
+            | python3 .github/scripts/normalize-psql-dump.py \
             > /tmp/data_reverted.sql
 
       - name: Verify schema after revert matches baseline