no grep

Author: codedmonkey

.github/scripts/normalize-psql-schema.py

@@ -1,14 +1,27 @@
 import sys
 import re
 
-# sort column lines in a psql schema dump alphabetically
+EXCLUDED_PREFIXES = ('SET ', 'SELECT ', 'GRANT ', 'REVOKE ', '\\')
+
+
+def filter_lines(text):
+    """Remove irrelevant lines from the schema dump"""
+    lines = [
+        line for line in text.splitlines(keepends=True)
+        if line.strip() and not line.startswith(EXCLUDED_PREFIXES)
+    ]
+    return ''.join(lines)
+
+
 def sort_columns(match):
+    """Sort column lines in a schema dump alphabetically"""
     lines = [
         line.strip().rstrip(',')
         for line in match.group(1).split('\n')
         if line.strip()
     ]
     return '(\n    ' + ',\n    '.join(sorted(lines)) + '\n)'
 
-text = sys.stdin.read()
+
+text = filter_lines(sys.stdin.read())
 sys.stdout.write(re.sub(r'\(((?:\n    [^\n]+)+)\n\)', sort_columns, text))

.github/workflows/database.yaml

@@ -179,7 +179,6 @@ jobs:
         run: |
           pg_dump -U dirigent -h localhost dirigent \
             --schema-only --no-comments --no-privileges --no-owner \
-            | grep -vE '^(SET |SELECT |$)' \
             | python3 .github/scripts/normalize-psql-schema.py \
             > /tmp/schema_baseline.sql
           pg_dump -U dirigent -h localhost dirigent \
@@ -206,7 +205,6 @@ jobs:
         run: |
           pg_dump -U dirigent -h localhost dirigent \
             --schema-only --no-comments --no-privileges --no-owner \
-            | grep -vE '^(SET |SELECT |$)' \
             | python3 .github/scripts/normalize-psql-schema.py \
             > /tmp/schema_reverted.sql
           pg_dump -U dirigent -h localhost dirigent \