Allow NULL in expressions.

phpmyadmin · Dec 18, 2015 · 47d03c5 · 47d03c5
1 parent a023393
commit 47d03c5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/src/Components/Expression.php b/src/Components/Expression.php
@@ -186,6 +186,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
             if (($token->type === Token::TYPE_KEYWORD)
                 && ($token->flags & Token::FLAG_KEYWORD_RESERVED)
                 && ($token->value !== 'DUAL')
+                && ($token->value !== 'NULL')
             ) {
                 // Keywords may be found only between brackets.
                 if ($brackets === 0) {

diff --git a/src/Components/ExpressionArray.php b/src/Components/ExpressionArray.php
@@ -72,6 +72,7 @@ public static function parse(Parser $parser, TokensList $list, array $options =
                 && ($token->flags & Token::FLAG_KEYWORD_RESERVED)
                 && ((~$token->flags & Token::FLAG_KEYWORD_FUNCTION))
                 && ($token->value !== 'DUAL')
+                && ($token->value !== 'NULL')
             ) {
                 // No keyword is expected.
                 break;

diff --git a/src/Statement.php b/src/Statement.php
@@ -170,7 +170,6 @@ public function build()
                 if (!empty($built[$field])) {
                     continue;
                 }
-
                 $built[$field] = true;
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,7 +170,6 @@ public function build() @@
                     if (!empty($built[$field])) {
                         continue;
                     }
                     $built[$field] = true;
                 }
@@ Expand Down @@