sort script defs

Author: codedmonkey

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

@@ -14,16 +14,6 @@ def filter_lines(text):
     return ''.join(lines)
 
 
-def sort_create_table_columns(match):
-    """Sort column lines in a CREATE TABLE block alphabetically"""
-    lines = [
-        line.strip().rstrip(',')
-        for line in match.group(1).split('\n')
-        if line.strip()
-    ]
-    return '(\n    ' + ',\n    '.join(sorted(lines)) + '\n)'
-
-
 def sort_copy_columns(text):
     """Sort columns in COPY blocks and reorder the data rows accordingly"""
     result = []
@@ -49,6 +39,16 @@ def sort_copy_columns(text):
     return '\n'.join(result)
 
 
+def sort_create_table_columns(match):
+    """Sort column lines in a CREATE TABLE block alphabetically"""
+    lines = [
+        line.strip().rstrip(',')
+        for line in match.group(1).split('\n')
+        if line.strip()
+    ]
+    return '(\n    ' + ',\n    '.join(sorted(lines)) + '\n)'
+
+
 text = filter_lines(sys.stdin.read())
 text = re.sub(r'\(((?:\n    [^\n]+)+)\n\)', sort_create_table_columns, text)
 text = sort_copy_columns(text)