From b10ae0260eb86f3fce328e7506c3472f61e238b7 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 19 Aug 2017 18:39:08 -0400
Subject: Match parens in mysql default / on update

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
---
 lib/sqlalchemy/dialects/mysql/reflection.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/sqlalchemy/dialects/mysql')

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>(?:''|[^'])*)')?"
-- 
cgit v1.2.1