1. bug

2. parse null bug

Author: foolfish3

src/ClickHouseSQLParser.php

@@ -643,6 +643,7 @@ public static function token_get_all($str, $options = array())
         $tokens = array();
         if ($dont_allow_comment) {
             \preg_match_all("{[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*|\\`(?:[^\\`\\\\]|\\\\.)*\\`|\\\"(?:[^\\\"\\\\]|\\\\.)*\\\"|\\'(?:[^\\'\\\\]|\\\\.)*\\'|\\s+|\\d+(?:\\.\\d*)?(?:[Ee][\\+\\-]?\\d+)?|\\<\\=\\>|\\!\\=|\\>\\=|\\<\\=|\\<\\>|\\<\\<|\\>\\>|\\:\\=|&&|\\|\\||@@|\\-\\>|.}s", $str, $m);
+            
             foreach ($m[0] as $token) {
                 switch (isset($map[$token[0]]) ? $map[$token[0]] : -1) {
                     case 1:
@@ -661,7 +662,11 @@ public static function token_get_all($str, $options = array())
                         $tokens[] = array(self::T_WHITESPACE, $token);
                         break;
                     case 9:
-                        $tokens[] = array(self::T_IDENTIFIER_NOQUOTE, $token);
+                        if(strcasecmp($token,"NULL")==0){
+                            $tokens[] = array(self::T_CONSTANT_NULL,$token);
+                        }else{
+                            $tokens[] = array(self::T_IDENTIFIER_NOQUOTE, $token);
+                        }
                         break;
                     default:
                         $tokens[] = $token;
@@ -693,7 +698,11 @@ public static function token_get_all($str, $options = array())
                         $tokens[] = array(self::T_WHITESPACE, $token);
                         break;
                     case 9:
-                        $tokens[] = array(self::T_IDENTIFIER_NOQUOTE, $token);
+                        if(strcasecmp($token,"NULL")==0){
+                            $tokens[] = array(self::T_CONSTANT_NULL,$token);
+                        }else{
+                            $tokens[] = array(self::T_IDENTIFIER_NOQUOTE, $token);
+                        }
                         break;
                     default:
                         $tokens[] = $token;

src/ClickHouseSQLParserExt.php

@@ -52,7 +52,7 @@ protected static function parse_impl($sql, $options = array())
         if(count($tokens)==0){
             throw new \ErrorException("cannot parse as sql, empty string");
         }
-        if ($expr = self::check_and_parse_select($tokens)) {
+        if ($expr = self::check_and_parse_select($sql,$options)) {
         } elseif (self::is_token_of($tokens[0],"SHOW")) {
             list($expr, $index) = self::get_next_show($tokens, 0);
             if ($index != \count($tokens)) {