summaryrefslogtreecommitdiff
path: root/test/dialect/mysql/test_reflection.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-08-19 18:39:08 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-08-19 18:39:08 -0400
commitb10ae0260eb86f3fce328e7506c3472f61e238b7 (patch)
tree72954295843a562db5ea17ab89f412882b8726be /test/dialect/mysql/test_reflection.py
parented197d4c303603f74122cbcab5c9f4ea12ff5cd7 (diff)
downloadsqlalchemy-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
Diffstat (limited to 'test/dialect/mysql/test_reflection.py')
-rw-r--r--test/dialect/mysql/test_reflection.py13
1 files changed, 7 insertions, 6 deletions
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):