Accept USING as a prefix or postfix modifer when reflecting keys. [ticket:1117]

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 0c22d6881349757cb56a2a64b9a555c2f5965b72..daa24e4695b97016d11a9b2873ec62494a3f82f9 100644 (file)
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -2481,8 +2481,9 @@ class MySQLSchemaReflector(object):
             r'  '
             r'(?:(?P<type>\S+) )?KEY'
             r'(?: +%(iq)s(?P<name>(?:%(esc_fq)s|[^%(fq)s])+)%(fq)s)?'
-            r'(?: +USING +(?P<using>\S+))?'
+            r'(?: +USING +(?P<using_pre>\S+))?'
             r' +\((?P<columns>.+?)\)'
+            r'(?: +USING +(?P<using_post>\S+))?'
             r'(?: +KEY_BLOCK_SIZE +(?P<keyblock>\S+))?'
             r'(?: +WITH PARSER +(?P<parser>\S+))?'
             r',?$'

diff --git a/test/dialect/mysql.py b/test/dialect/mysql.py
index aca072b4b415dbd40d6469e84d4e78572f377a15..a233c25f544eda3eca601a581a89b7d18c3ae525 100644 (file)
--- a/test/dialect/mysql.py
+++ b/test/dialect/mysql.py
@@ -889,7 +889,7 @@ class SQLTest(TestBase, AssertsCompiledSQL):
 
     def test_utc_timestamp(self):
         self.assert_compile(func.utc_timestamp(), "UTC_TIMESTAMP")
-        
+
     def test_cast(self):
         t = sql.table('t', sql.column('col'))
         m = mysql
@@ -983,6 +983,23 @@ class SQLTest(TestBase, AssertsCompiledSQL):
             self.assert_compile(cast(t.c.col, type_), expected)
 
 
+class RawReflectionTest(TestBase):
+    def setUp(self):
+        self.dialect = mysql.dialect()
+        self.reflector = mysql.MySQLSchemaReflector(
+            self.dialect.identifier_preparer)
+
+    def test_key_reflection(self):
+        regex = self.reflector._re_key
+
+        assert regex.match('  PRIMARY KEY (`id`),')
+        assert regex.match('  PRIMARY KEY USING BTREE (`id`),')
+        assert regex.match('  PRIMARY KEY (`id`) USING BTREE,')
+        assert regex.match('  PRIMARY KEY (`id`)')
+        assert regex.match('  PRIMARY KEY USING BTREE (`id`)')
+        assert regex.match('  PRIMARY KEY (`id`) USING BTREE')
+
+
 class ExecutionTest(TestBase):
     """Various MySQL execution special cases."""
 
@@ -1049,51 +1066,83 @@ class MatchTest(TestBase, AssertsCompiledSQL):
             {'id': 2, 'description': 'Ruby'},
         ])
         matchtable.insert().execute([
-            {'id': 1, 'title': 'Agile Web Development with Rails', 'category_id': 2},
-            {'id': 2, 'title': 'Dive Into Python', 'category_id': 1},
-            {'id': 3, 'title': 'Programming Matz''s Ruby', 'category_id': 2},
-            {'id': 4, 'title': 'The Definitive Guide to Django', 'category_id': 1},
-            {'id': 5, 'title': 'Python in a Nutshell', 'category_id': 1}
+            {'id': 1,
+             'title': 'Agile Web Development with Rails',
+             'category_id': 2},
+            {'id': 2,
+             'title': 'Dive Into Python',
+             'category_id': 1},
+            {'id': 3,
+             'title': 'Programming Matz''s Ruby',
+             'category_id': 2},
+            {'id': 4,
+             'title': 'The Definitive Guide to Django',
+             'category_id': 1},
+            {'id': 5,
+             'title': 'Python in a Nutshell',
+             'category_id': 1}
         ])
 
     def tearDownAll(self):
         metadata.drop_all()
 
     def test_expression(self):
-        self.assert_compile(matchtable.c.title.match('somstr'), "MATCH (matchtable.title) AGAINST (%s IN BOOLEAN MODE)")
+        self.assert_compile(
+            matchtable.c.title.match('somstr'),
+            "MATCH (matchtable.title) AGAINST (%s IN BOOLEAN MODE)")
 
     def test_simple_match(self):
-        results = matchtable.select().where(matchtable.c.title.match('python')).order_by(matchtable.c.id).execute().fetchall()
+        results = (matchtable.select().
+                   where(matchtable.c.title.match('python')).
+                   order_by(matchtable.c.id).
+                   execute().
+                   fetchall())
         self.assertEquals([2, 5], [r.id for r in results])
 
     def test_simple_match_with_apostrophe(self):
-        results = matchtable.select().where(matchtable.c.title.match('"Matz''s"')).execute().fetchall()
+        results = (matchtable.select().
+                   where(matchtable.c.title.match('"Matz''s"')).
+                   execute().
+                   fetchall())
         self.assertEquals([3], [r.id for r in results])
 
     def test_or_match(self):
-        results1 = matchtable.select().where(or_(matchtable.c.title.match('nutshell'), 
-                                                 matchtable.c.title.match('ruby'))
-                                            ).order_by(matchtable.c.id).execute().fetchall()
+        results1 = (matchtable.select().
+                    where(or_(matchtable.c.title.match('nutshell'),
+                              matchtable.c.title.match('ruby'))).
+                    order_by(matchtable.c.id).
+                    execute().
+                    fetchall())
         self.assertEquals([3, 5], [r.id for r in results1])
-        results2 = matchtable.select().where(matchtable.c.title.match('nutshell ruby'), 
-                                            ).order_by(matchtable.c.id).execute().fetchall()
+        results2 = (matchtable.select().
+                    where(matchtable.c.title.match('nutshell ruby')).
+                    order_by(matchtable.c.id).
+                    execute().
+                    fetchall())
         self.assertEquals([3, 5], [r.id for r in results2])
-        
+
 
     def test_and_match(self):
-        results1 = matchtable.select().where(and_(matchtable.c.title.match('python'), 
-                                                  matchtable.c.title.match('nutshell'))
-                                            ).execute().fetchall()
+        results1 = (matchtable.select().
+                    where(and_(matchtable.c.title.match('python'),
+                               matchtable.c.title.match('nutshell'))).
+                    execute().
+                    fetchall())
         self.assertEquals([5], [r.id for r in results1])
-        results2 = matchtable.select().where(matchtable.c.title.match('+python +nutshell'), 
-                                            ).execute().fetchall()
+        results2 = (matchtable.select().
+                    where(matchtable.c.title.match('+python +nutshell')).
+                    execute().
+                    fetchall())
         self.assertEquals([5], [r.id for r in results2])
 
     def test_match_across_joins(self):
-        results = matchtable.select().where(and_(cattable.c.id==matchtable.c.category_id, 
-                                            or_(cattable.c.description.match('Ruby'), 
-                                                matchtable.c.title.match('nutshell')))
-                                           ).order_by(matchtable.c.id).execute().fetchall()
+        results = (matchtable.select().
+                   where(and_(cattable.c.id==matchtable.c.category_id,
+                              or_(cattable.c.description.match('Ruby'),
+                                  matchtable.c.title.match('nutshell')))).
+                   order_by(matchtable.c.id).
+                   execute().
+                   fetchall())
         self.assertEquals([1, 3, 5], [r.id for r in results])