fix report generation

Author: RuslanSibgatulin

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true,
+    "python.analysis.typeCheckingMode": "basic",
+    "python.analysis.extraPaths": [
+        "./src"
+    ],
+    "terminal.integrated.shellIntegration.enabled": true,
+    "[python]": {
+        "editor.defaultFormatter": "ms-python.black-formatter",
+        "editor.formatOnSave": true,
+    },
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "explicit"
+    },
+}
+

pg_diff.py

@@ -34,23 +34,23 @@ class DBChanges(enum.StrEnum):
     heading = re.match(HEADING_PATTERN, line)
     if heading:
         current_type = TOC.get(heading.group(1))
-    elif current_type in {
-        DBChanges.ColumnAdded,
-        DBChanges.ColumnDeleted,
-        DBChanges.ColumnChanged,
-    }:
-        column_name = re.match(COLUMN_PATTERN, line)
-        columns_changes.setdefault(current_type, {}).setdefault(
-            column_name.group(1),
-            [],
-        ).append(column_name.group(2))
-    else:
-        table_name = re.match(TABLE_PATTERN, line)
-        if table_name:
-            tables_changes.setdefault(
-                current_type,
+        continue
+
+    match current_type:
+        case DBChanges.ColumnAdded | DBChanges.ColumnDeleted | DBChanges.ColumnChanged:
+            column_name = re.match(COLUMN_PATTERN, line)
+            columns_changes.setdefault(current_type, {}).setdefault(
+                column_name.group(1),
                 [],
-            ).append(table_name.group(1))
+            ).append(column_name.group(2))
+        case DBChanges.TableAdded | DBChanges.TableDeleted | DBChanges.TableChanged:
+            table_name = re.match(TABLE_PATTERN, line)
+            if table_name:
+                tables_changes.setdefault(
+                    current_type,
+                    [],
+                ).append(table_name.group(1))
+
 
 sys.stdout.write("*" * 100 + "\n")
 sys.stdout.write(" " * 42 + "DB changes report\n")

pg_diff.sh

@@ -1,10 +1,10 @@
 POSTGRES_SCHEMA=public
 
 ./liquibase/liquibase --show-banner=false \
---url=$POSTGRES_TARGET_DB \
---diffTypes=tables,columns \
---defaultSchemaName=$POSTGRES_SCHEMA \
-diff \
---referenceUrl=$POSTGRES_CURRENT_DB \
+--url=$POSTGRES_CURRENT_DB \
+--diff-types=tables,columns \
+--default-schema-name=$POSTGRES_SCHEMA \
+--reference-url=$POSTGRES_REFERENCE_DB \
 --schemas=$POSTGRES_SCHEMA \
+diff \
 | python pg_diff.py

readme.md

@@ -2,14 +2,14 @@
 
 ## ENV variables
 
-- `POSTGRES_TARGET_DB` - most updated DB state (ex: development DB)
+- `POSTGRES_REFERENCE_DB` - most updated DB state (ex: development DB)
 - `POSTGRES_CURRENT_DB` - outdated DB state (ex: PROD DB before release)
 
 ## Get report
 
 ```bash
 docker run --rm -it \
--e "POSTGRES_TARGET_DB=jdbc:postgresql://postgres:5432/db-name?user=pg_user&password=secret" \
--e "POSTGRES_CURRENT_DB=jdbc:postgresql://postgres:5432/db-name?user=pg_user&password=secret" \
---network=pg-network pg-diff:latest
+-e "POSTGRES_REFERENCE_DB=jdbc:postgresql://localhost:5432/db-name?user=pg_user&password=secret" \
+-e "POSTGRES_CURRENT_DB=jdbc:postgresql://localhost:5432/db-name?user=pg_user&password=secret" \
+--network=host ghcr.io/junte/pg-diff:latest
 ```