Merge #354 and #349 - Fix #348 - Fixing missing KEY options for MySQL and MariaDB

Ref: phpmyadmin/phpmyadmin#17097

Signed-off-by: William Desportes <williamdes@wdes.fr>

Author: williamdes

src/Components/Key.php

@@ -31,7 +31,7 @@ class Key extends Component
     public static $KEY_OPTIONS = array(
         'KEY_BLOCK_SIZE' => array(
             1,
-            'var',
+            'var=',
         ),
         'USING' => array(
             2,
@@ -44,7 +44,26 @@ class Key extends Component
         'COMMENT' => array(
             4,
             'var',
-        )
+        ),
+        // MariaDB options
+        'CLUSTERING' => array(
+            4,
+            'var=',
+        ),
+        'ENGINE_ATTRIBUTE' => array(
+            5,
+            'var=',
+        ),
+        'SECONDARY_ENGINE_ATTRIBUTE' => array(
+            5,
+            'var=',
+        ),
+        // MariaDB & MySQL options
+        'VISIBLE' => 6,
+        'INVISIBLE' => 6,
+        // MariaDB options
+        'IGNORED' => 10,
+        'NOT IGNORED' => 10,
     );
 
     /**

tests/Components/KeyTest.php

@@ -170,6 +170,65 @@ public function testParseKeyWithLengthWithOptions()
         );
     }
 
+    public function testParseKeyWithLengthWithAllOptions()
+    {
+        $component = Key::parse(
+            new Parser(),
+            $this->getTokensList(
+                // This is not a vary plausible example but it runs
+                // Only ENGINE_ATTRIBUTE gives a not supported error but is still a valid syntax
+                'KEY `alias_type_idx` (`alias_type`(10))'
+                . ' COMMENT \'my comment\' VISIBLE KEY_BLOCK_SIZE=1'
+                . ' INVISIBLE ENGINE_ATTRIBUTE \'foo\' SECONDARY_ENGINE_ATTRIBUTE=\'bar\' USING BTREE,'
+            )
+        );
+        $this->assertEquals('KEY', $component->type);
+        $this->assertEquals('alias_type_idx', $component->name);
+        $this->assertEquals(new OptionsArray(
+            array(
+                1 => array(
+                    'name' => 'KEY_BLOCK_SIZE',
+                    'equals' => true,
+                    'expr' => '1',
+                    'value' => '1',
+                ),
+                2 => array(
+                    'name' => 'USING',
+                    'equals' => false,
+                    'expr' => 'BTREE',
+                    'value' => 'BTREE',
+                ),
+                4 => array(
+                    'name' => 'COMMENT',
+                    'equals' => false,
+                    'expr' => '\'my comment\'',
+                    'value' => 'my comment',
+                ),
+                5 => array(
+                    'name' => 'ENGINE_ATTRIBUTE',
+                    'equals' => true,
+                    'expr' => '\'foo\'',
+                    'value' => 'foo',
+                ),
+                6 => 'VISIBLE',
+                12 => 'INVISIBLE',
+                13 => array(
+                    'name' => 'SECONDARY_ENGINE_ATTRIBUTE',
+                    'equals' => true,
+                    'expr' => '\'bar\'',
+                    'value' => 'bar',
+                ),
+            )
+        ), $component->options);
+        $this->assertNull($component->expr);
+        $this->assertSame(array(
+            array(
+                'name' => 'alias_type',
+                'length' => 10,
+            )
+        ), $component->columns);
+    }
+
     public function testParseKeyExpressionWithoutOptions()
     {
         $component = Key::parse(

tests/Parser/CreateStatementTest.php

@@ -47,6 +47,7 @@ public function createProvider()
             array('parser/parseCreateTableLike'),
             array('parser/parseCreateTableSpatial'),
             array('parser/parseCreateTableTimestampWithPrecision'),
+            array('parser/parseCreateTableWithInvisibleKey'),
             array('parser/parseCreateTrigger'),
             array('parser/parseCreateUser'),
             array('parser/parseCreateView'),

tests/data/parser/parseCreateTableWithInvisibleKey.in

@@ -0,0 +1,12 @@
+CREATE TABLE `animes_comments` (
+  `anime_comment_id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `anime_id` bigint unsigned NOT NULL,
+  `user_id` bigint unsigned NOT NULL,
+  `comment_text` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL,
+  `comment_at` datetime DEFAULT NULL,
+  PRIMARY KEY (`anime_comment_id`),
+  KEY `animes_comments_animes_fk` (`anime_id`) invisible,
+  KEY `animes_comments_users_fk` (`user_id`),
+  KEY `comment_at_idx` (`comment_at`) ,
+  CONSTRAINT `animes_comments_animes_fk` FOREIGN KEY (`anime_id`) REFERENCES `animes` (`anime_id`) ON DELETE CASCADE ON UPDATE RESTRICT,
+  CONSTRAINT `animes_comments_users_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE RESTRICT)