From fe5ed720fb6aa4148ea140db298e4020147d40bc Mon Sep 17 00:00:00 2001 From: Daniel Solnik Date: Thu, 28 Sep 2023 18:22:48 -0400 Subject: [PATCH 1/2] Update generators.py Allow for spaces between enum options --- src/sqlacodegen/generators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlacodegen/generators.py b/src/sqlacodegen/generators.py index 9ddb11cf..f673047a 100644 --- a/src/sqlacodegen/generators.py +++ b/src/sqlacodegen/generators.py @@ -68,9 +68,9 @@ from importlib.metadata import version _sqla_version = tuple(int(x) for x in version("sqlalchemy").split(".")[:2]) -_re_boolean_check_constraint = re.compile(r"(?:.*?\.)?(.*?) IN \(0, 1\)") +_re_boolean_check_constraint = re.compile(r"(?:.*?\.)?(.*?)\s+IN\s*\(0, 1\)") _re_column_name = re.compile(r'(?:(["`]?).*\1\.)?(["`]?)(.*)\2') -_re_enum_check_constraint = re.compile(r"(?:.*?\.)?(.*?) IN \((.+)\)") +_re_enum_check_constraint = re.compile(r"(?:.*?\.)?(.*?)\s+IN\s*\((.+)\)") _re_enum_item = re.compile(r"'(.*?)(? Date: Thu, 28 Sep 2023 22:24:17 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/sqlacodegen/generators.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlacodegen/generators.py b/src/sqlacodegen/generators.py index f673047a..def54326 100644 --- a/src/sqlacodegen/generators.py +++ b/src/sqlacodegen/generators.py @@ -68,9 +68,9 @@ from importlib.metadata import version _sqla_version = tuple(int(x) for x in version("sqlalchemy").split(".")[:2]) -_re_boolean_check_constraint = re.compile(r"(?:.*?\.)?(.*?)\s+IN\s*\(0, 1\)") +_re_boolean_check_constraint = re.compile(r"(?:.*?\.)?(.*?)\s+IN\s*\(0, 1\)") _re_column_name = re.compile(r'(?:(["`]?).*\1\.)?(["`]?)(.*)\2') -_re_enum_check_constraint = re.compile(r"(?:.*?\.)?(.*?)\s+IN\s*\((.+)\)") +_re_enum_check_constraint = re.compile(r"(?:.*?\.)?(.*?)\s+IN\s*\((.+)\)") _re_enum_item = re.compile(r"'(.*?)(?