summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
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 /lib/sqlalchemy/dialects
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 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/mysql/reflection.py4
1 files changed, 2 insertions, 2 deletions
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>(?:''|[^'])*)')?"