- Fix and test parsing of MySQL foreign key options within reflection;

this complements the work in :ticket:`2183` where we begin to support
reflection of foreign key options such as ON UPDATE/ON DELETE
cascade. [ticket:2839]

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 8a7a8bfc0b9a7e2d7ecff3460b9ca76b87045e44..1e7947cc5b0a2dc7952f4e26190f21adb790a865 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -12,6 +12,15 @@
 .. changelog::
     :version: 0.9.0
 
+    .. change::
+        :tags: bug, mysql
+        :tickets: 2839
+
+        Fix and test parsing of MySQL foreign key options within reflection;
+        this complements the work in :ticket:`2183` where we begin to support
+        reflection of foreign key options such as ON UPDATE/ON DELETE
+        cascade.
+
     .. change::
         :tags: bug, orm
         :tickets: 2787

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 07aa76f65a9084498d33cc4dfce108894a44522c..6883be5af631d167e737290301e7cda6bd8a9924 100644 (file)
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2807,7 +2807,7 @@ class MySQLTableDefinitionParser(object):
         #
         # unique constraints come back as KEYs
         kw = quotes.copy()
-        kw['on'] = 'RESTRICT|CASCASDE|SET NULL|NOACTION'
+        kw['on'] = 'RESTRICT|CASCADE|SET NULL|NOACTION'
         self._re_constraint = _re_compile(
             r'  '
             r'CONSTRAINT +'

diff --git a/test/dialect/mysql/test_reflection.py b/test/dialect/mysql/test_reflection.py
index cac613d5d3e99e5d87bc752c7b407c07ca121ad2..7494eaf4315898aa5c28a9ab772c4d557a49f2c8 100644 (file)
--- a/test/dialect/mysql/test_reflection.py
+++ b/test/dialect/mysql/test_reflection.py
@@ -298,3 +298,22 @@ class RawReflectionTest(fixtures.TestBase):
         assert regex.match('  PRIMARY KEY USING BTREE (`id`)')
         assert regex.match('  PRIMARY KEY (`id`) USING BTREE')
 
+    def test_fk_reflection(self):
+        regex = self.parser._re_constraint
+
+        m = regex.match('  CONSTRAINT `addresses_user_id_fkey` '
+                        'FOREIGN KEY (`user_id`) '
+                        'REFERENCES `users` (`id`) '
+                        'ON DELETE CASCADE ON UPDATE CASCADE')
+        eq_(m.groups(), ('addresses_user_id_fkey', '`user_id`',
+                            '`users`', '`id`', None, 'CASCADE', 'CASCADE'))
+
+
+        m = regex.match('  CONSTRAINT `addresses_user_id_fkey` '
+                        'FOREIGN KEY (`user_id`) '
+                        'REFERENCES `users` (`id`) '
+                        'ON DELETE CASCADE ON UPDATE SET NULL')
+        eq_(m.groups(), ('addresses_user_id_fkey', '`user_id`',
+                            '`users`', '`id`', None, 'CASCADE', 'SET NULL'))
+
+