diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-19 18:39:08 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-19 18:39:08 -0400 |
| commit | b10ae0260eb86f3fce328e7506c3472f61e238b7 (patch) | |
| tree | 72954295843a562db5ea17ab89f412882b8726be | |
| parent | ed197d4c303603f74122cbcab5c9f4ea12ff5cd7 (diff) | |
| download | sqlalchemy-fix_mariadb102_default.tar.gz | |
Match parens in mysql default / on updatefix_mariadb102_default
Fixed issue where a default of CURRENT_TIMESTAMP would not
properly reflect when using MariaDB 10.2, as a parenthesis
is now added to the expression that wasn't being matched.
Change-Id: I8666d61814e8145ca12cbecad94019b44af868e3
| -rw-r--r-- | doc/build/changelog/unreleased_12/mdb102_default.rst | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/reflection.py | 4 | ||||
| -rw-r--r-- | test/dialect/mysql/test_reflection.py | 13 |
3 files changed, 15 insertions, 8 deletions
diff --git a/doc/build/changelog/unreleased_12/mdb102_default.rst b/doc/build/changelog/unreleased_12/mdb102_default.rst new file mode 100644 index 000000000..1e225fb25 --- /dev/null +++ b/doc/build/changelog/unreleased_12/mdb102_default.rst @@ -0,0 +1,6 @@ +.. change:: + :tags: bug, mysql + + Fixed issue where a default of CURRENT_TIMESTAMP would not + properly reflect when using MariaDB 10.2, as a parenthesis + is now added to the expression that wasn't being matched. diff --git a/lib/sqlalchemy/dialects/mysql/reflection.py b/lib/sqlalchemy/dialects/mysql/reflection.py index bb907045c..633cbcee9 100644 --- a/lib/sqlalchemy/dialects/mysql/reflection.py +++ b/lib/sqlalchemy/dialects/mysql/reflection.py @@ -331,8 +331,8 @@ class MySQLTableDefinitionParser(object): r"(?: +COLLATE +(?P<collate>[\w_]+))?" r"(?: +(?P<notnull>(?:NOT )?NULL))?" r"(?: +DEFAULT +(?P<default>" - r"(?:NULL|'(?:''|[^'])*'|\w+" - r"(?: +ON UPDATE \w+)?)" + r"(?:NULL|'(?:''|[^'])*'|[\w\(\)]+" + r"(?: +ON UPDATE [\w\(\)]+)?)" r"))?" r"(?: +(?P<autoincr>AUTO_INCREMENT))?" r"(?: +COMMENT +'(?P<comment>(?:''|[^'])*)')?" diff --git a/test/dialect/mysql/test_reflection.py b/test/dialect/mysql/test_reflection.py index dc088223d..a9a2e3bfa 100644 --- a/test/dialect/mysql/test_reflection.py +++ b/test/dialect/mysql/test_reflection.py @@ -14,6 +14,7 @@ from sqlalchemy.dialects.mysql import reflection as _reflection from sqlalchemy.testing import fixtures, AssertsExecutionResults from sqlalchemy import testing from sqlalchemy.testing import assert_raises_message, expect_warnings +import re class TypeReflectionTest(fixtures.TestBase): @@ -233,9 +234,9 @@ class ReflectionTest(fixtures.TestBase, AssertsExecutionResults): assert reflected.c.c5.default is None assert reflected.c.c5.server_default is None assert reflected.c.c6.default is None - eq_( - str(reflected.c.c6.server_default.arg).upper(), - "CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" + assert re.match( + r"CURRENT_TIMESTAMP(\(\))? ON UPDATE CURRENT_TIMESTAMP(\(\))?", + str(reflected.c.c6.server_default.arg).upper() ) reflected.create() try: @@ -251,9 +252,9 @@ class ReflectionTest(fixtures.TestBase, AssertsExecutionResults): assert reflected.c.c5.default is None assert reflected.c.c5.server_default is None assert reflected.c.c6.default is None - eq_( - str(reflected.c.c6.server_default.arg).upper(), - "CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP" + assert re.match( + r"CURRENT_TIMESTAMP(\(\))? ON UPDATE CURRENT_TIMESTAMP(\(\))?", + str(reflected.c.c6.server_default.arg).upper() ) def test_reflection_with_table_options(self): |