summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES5
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py4
2 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index beac4243c..5df900199 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,11 @@ CHANGES
SQLite does not appear to support constraint
naming in any case.
+- mysql
+ - [bug] fixed regexp that filters out warnings
+ for non-reflected "PARTITION" directives,
+ thanks to George Reilly [ticket:2376]
+
- Py3K
- [bug] Fixed inappropriate usage of util.py3k
flag and renamed it to util.py3k_warning, since
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 7b0a72dff..b6982c6c3 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2559,9 +2559,7 @@ class MySQLTableDefinitionParser(object):
# PARTITION
#
# punt!
- self._re_partition = _re_compile(
- r' '
- r'(?:SUB)?PARTITION')
+ self._re_partition = _re_compile(r'(?:.*)(?:SUB)?PARTITION(?:.*)')
# Table-level options (COLLATE, ENGINE, etc.)
# Do the string options first, since they have quoted strings we need to get rid of.