Merge branch 'QA'

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

Author: williamdes

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## [5.4.1] - 2020-10-10
+* Fix array_key_exists warning when parsing a "DEFAULT FALSE" token (#299)
+
 ## [5.4.0] - 2020-10-08
 
 * EXISTS is also a function. (#297)
@@ -54,6 +57,9 @@
 * Fix for error message with multiple CALL statements (#223)
 * Recognize the question mark character as a parameter (#242)
 
+## [4.7.1] - 2020-10-10
+* Fix array_key_exists warning when parsing a "DEFAULT FALSE" token (#299)
+
 ## [4.7.0] - 2020-10-08
 
 * EXISTS is also a function. (#297)

src/Components/AlterOperation.php

@@ -13,6 +13,8 @@
 use PhpMyAdmin\SqlParser\TokensList;
 use function array_key_exists;
 use function in_array;
+use function is_numeric;
+use function is_string;
 
 /**
  * Parses an alter operation.
@@ -262,6 +264,12 @@ public static function parse(Parser $parser, TokensList $list, array $options =
 
                 $state = 2;
             } elseif ($state === 2) {
+                $array_key = '';
+                if (is_string($token->value) || is_numeric($token->value)) {
+                    $array_key = $token->value;
+                } else {
+                    $array_key = $token->token;
+                }
                 if ($token->type === Token::TYPE_OPERATOR) {
                     if ($token->value === '(') {
                         ++$brackets;
@@ -281,9 +289,9 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                         );
                         break;
                     }
-                } elseif ((array_key_exists($token->value, self::$DB_OPTIONS)
-                    || array_key_exists($token->value, self::$TABLE_OPTIONS))
-                    && ! self::checkIfColumnDefinitionKeyword($token->value)
+                } elseif ((array_key_exists($array_key, self::$DB_OPTIONS)
+                    || array_key_exists($array_key, self::$TABLE_OPTIONS))
+                    && ! self::checkIfColumnDefinitionKeyword($array_key)
                 ) {
                     // This alter operation has finished, which means a comma
                     // was missing before start of new alter operation

tests/Components/CreateDefinitionTest.php

@@ -101,6 +101,38 @@ public function testBuild2()
         );
     }
 
+    public function testBuild3()
+    {
+        $parser = new Parser(
+            'DROP TABLE IF EXISTS `searches`;'
+            . 'CREATE TABLE `searches` ('
+            . '  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,'
+            . '  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,'
+            . '  `public_name` varchar(120) COLLATE utf8_unicode_ci NOT NULL,'
+            . '  `group_id` smallint(5) unsigned NOT NULL DEFAULT \'0\','
+            . '  `shortdesc` tinytext COLLATE utf8_unicode_ci,'
+            . '  `show_separators` tinyint(1) NOT NULL DEFAULT \'0\','
+            . '  `show_separators_two` tinyint(1) NOT NULL DEFAULT FALSE,'
+            . '  `deleted` tinyint(1) NOT NULL DEFAULT \'0\','
+            . '  PRIMARY KEY (`id`)'
+            . ') ENGINE=MyISAM  DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci ;'
+            . ''
+            . 'ALTER TABLE `searches` ADD `admins_only` BOOLEAN NOT NULL DEFAULT FALSE AFTER `show_separators`;'
+        );
+        $this->assertEquals(
+            '`public_name` varchar(120) COLLATE utf8_unicode_ci NOT NULL',
+            CreateDefinition::build($parser->statements[1]->fields[2])
+        );
+        $this->assertEquals(
+            '`show_separators` tinyint(1) NOT NULL DEFAULT \'0\'',
+            CreateDefinition::build($parser->statements[1]->fields[5])
+        );
+        $this->assertEquals(
+            '`show_separators_two` tinyint(1) NOT NULL DEFAULT FALSE',
+            CreateDefinition::build($parser->statements[1]->fields[6])
+        );
+    }
+
     public function testBuildWithInvisibleKeyword()
     {
         $parser = new Parser(