Merge "Ignore newlines in expressions for Computed" into main

sqlalchemy · Jan 15, 2024 · 798f82d · 798f82d
2 parents 2d60c77 + 06aee70
commit 798f82d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/alembic/autogenerate/compare.py b/alembic/autogenerate/compare.py
@@ -983,7 +983,7 @@ def _normalize_computed_default(sqltext: str) -> str:
 
     """
 
-    return re.sub(r"[ \(\)'\"`\[\]]", "", sqltext).lower()
+    return re.sub(r"[ \(\)'\"`\[\]\t\r\n]", "", sqltext).lower()
 
 
 def _compare_computed_default(

diff --git a/alembic/testing/suite/test_autogen_computed.py b/alembic/testing/suite/test_autogen_computed.py
@@ -124,6 +124,7 @@ def test_cant_change_computed_warning(self, test_case):
         lambda: (None, None),
         lambda: (sa.Computed("5"), sa.Computed("5")),
         lambda: (sa.Computed("bar*5"), sa.Computed("bar*5")),
+        lambda: (sa.Computed("bar*5"), sa.Computed("bar * \r\n\t5")),
         (
             lambda: (sa.Computed("bar*5"), None),
             config.requirements.computed_doesnt_reflect_as_server_default,

diff --git a/docs/build/unreleased/1391.rst b/docs/build/unreleased/1391.rst
@@ -0,0 +1,6 @@
+.. change::
+    :tags: usecase, autogenerate
+    :tickets: 1391
+
+    Improve computed column compare function to support multi-line expressions.
+    Pull request courtesy of Georg Wicke-Arndt.