Fixing the key options and adding a test for the invisible issue

Signed-off-by: Fawzi E. Abdulfattah <iifawzie@gmail.com>

Author: iifawzi

src/Components/Key.php

@@ -45,25 +45,25 @@ class Key extends Component
             4,
             'var',
         ),
-        'INVISIBLE' => 1,
-        'VISIBLE' => 1,
+        // MariaDB options
+        'CLUSTERING' => array(
+            4,
+            'var=',
+        ),
         'ENGINE_ATTRIBUTE' => array(
-            3,
+            5,
             'var=',
         ),
         'SECONDARY_ENGINE_ATTRIBUTE' => array(
-            4,
+            5,
             'var=',
         ),
-
+        // MariaDB & MySQL options
+        'VISIBLE' => 6,
+        'INVISIBLE' => 6,
         // MariaDB options
-
-        'CLUSTERING' => array(
-            4,
-            'var=',
-        ),
-        'IGNORED' => 1,
-        'NOT IGNORED' => 1,
+        'IGNORED' => 10,
+        'NOT IGNORED' => 10,
     );
 
     /**

tests/Components/KeyTest.php

@@ -101,33 +101,33 @@ public function testParseKeyWithLengthWithAllOptions()
         $this->assertEquals('alias_type_idx', $component->name);
         $this->assertEquals(new OptionsArray(
             array(
-                1 => 'VISIBLE',
+                1 => array(
+                    'name' => 'KEY_BLOCK_SIZE',
+                    'equals' => true,
+                    'expr' => '1',
+                    'value' => '1',
+                ),
                 2 => array(
                     'name' => 'USING',
                     'equals' => false,
                     'expr' => 'BTREE',
                     'value' => 'BTREE',
                 ),
-                3 => array(
-                    'name' => 'ENGINE_ATTRIBUTE',
-                    'equals' => true,
-                    'expr' => '\'foo\'',
-                    'value' => 'foo',
-                ),
                 4 => array(
                     'name' => 'COMMENT',
                     'equals' => false,
                     'expr' => '\'my comment\'',
                     'value' => 'my comment',
                 ),
-                12 => array(
-                    'name' => 'KEY_BLOCK_SIZE',
+                5 => array(
+                    'name' => 'ENGINE_ATTRIBUTE',
                     'equals' => true,
-                    'expr' => '1',
-                    'value' => '1',
+                    'expr' => '\'foo\'',
+                    'value' => 'foo',
                 ),
-                13 => 'INVISIBLE',
-                14 => array(
+                6 => 'VISIBLE',
+                12 => 'INVISIBLE',
+                13 => array(
                     'name' => 'SECONDARY_ENGINE_ATTRIBUTE',
                     'equals' => true,
                     'expr' => '\'bar\'',

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)