From 27d0be7e16fe0483565a9f1de5a69d34c93fe340 Mon Sep 17 00:00:00 2001 From: Eric Borczuk Date: Wed, 26 Feb 2020 23:26:56 -0500 Subject: [PATCH] Fixes: #5170 --- lib/sqlalchemy/dialects/postgresql/base.py | 7 +++++-- test/dialect/postgresql/test_reflection.py | 23 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/dialects/postgresql/base.py b/lib/sqlalchemy/dialects/postgresql/base.py index b30e777049..0b8d6f197b 100644 --- a/lib/sqlalchemy/dialects/postgresql/base.py +++ b/lib/sqlalchemy/dialects/postgresql/base.py @@ -3488,12 +3488,15 @@ class PGDialect(default.DefaultDialect): # "CHECK (((a = 1) OR ((a > 2) AND (a < 5))))" # "CHECK (((a > 1) AND (a < 5))) NOT VALID" # "CHECK (some_boolean_function(a))" - m = re.match(r"^CHECK *\((.+)\)( NOT VALID)?$", src) + # "CHECK (((a\n < 1)\n OR\n (a\n >= 5))\n)" + + m = re.match(r"^CHECK *\((.+)\)( NOT VALID)?$", src, flags=re.DOTALL) if not m: util.warn("Could not parse CHECK constraint text: %r" % src) sqltext = "" else: - sqltext = re.sub(r"^\((.+)\)$", r"\1", m.group(1)) + match_without_newlines = ''.join(m.group(1).splitlines()) + sqltext = re.sub(r"^\((.+)\)$", r"\1", match_without_newlines) entry = {"name": name, "sqltext": sqltext} if m and m.group(2): entry["dialect_options"] = {"not_valid": True} diff --git a/test/dialect/postgresql/test_reflection.py b/test/dialect/postgresql/test_reflection.py index 830a54eef0..092363e038 100644 --- a/test/dialect/postgresql/test_reflection.py +++ b/test/dialect/postgresql/test_reflection.py @@ -1582,6 +1582,29 @@ class ReflectionTest(fixtures.TestBase): ): testing.db.dialect.get_check_constraints(conn, "foo") + def test_reflect_extra_newlines(self): + rows = [("some name", "CHECK (\n(a \nIS\n NOT\n\n NULL\n)\n)")] + conn = mock.Mock( + execute=lambda *arg, **kw: mock.MagicMock( + fetchall=lambda: rows, __iter__=lambda self: iter(rows) + ) + ) + with mock.patch.object( + testing.db.dialect, "get_table_oid", lambda *arg, **kw: 1 + ): + check_constraints = testing.db.dialect.get_check_constraints( + conn, "foo" + ) + eq_( + check_constraints, + [ + { + "name": "some name", + "sqltext": "a IS NOT NULL", + } + ], + ) + def test_reflect_with_not_valid_check_constraint(self): rows = [("some name", "CHECK ((a IS NOT NULL)) NOT VALID")] conn = mock.Mock( -- 2.47.2