normalize script

Author: codedmonkey

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

@@ -0,0 +1,14 @@
+import sys
+import re
+
+# sort column lines in a psql schema dump alphabetically
+def sort_columns(match):
+    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()
+sys.stdout.write(re.sub(r'\(((?:\n    [^\n]+)+)\n\)', sort_columns, text))

.github/workflows/database.yaml

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