Ref #294 - Revert "ANSI_QUOTES lexer and parser test-suite proposal"

This reverts commit bd519e4. Signed-off-by: William Desportes <[email protected]>
phpmyadmin · Mar 20, 2020 · fc3917d · fc3917d
1 parent d7fa2cb
commit fc3917d
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 200 deletions.
diff --git a/src/Context.php b/src/Context.php
@@ -417,7 +417,7 @@ public static function isSymbol($str)
         }
         if ($str[0] === '@') {
             return Token::FLAG_SYMBOL_VARIABLE;
-        } elseif ($str[0] === self::getIdentifierQuote()) {
+        } elseif ($str[0] === '`') {
             return Token::FLAG_SYMBOL_BACKTICK;
         } elseif ($str[0] === ':' || $str[0] === '?') {
             return Token::FLAG_SYMBOL_PARAMETER;
@@ -443,8 +443,6 @@ public static function isString($str)
         }
         if ($str[0] === '\'') {
             return Token::FLAG_STRING_SINGLE_QUOTES;
-        } elseif (self::hasMode(self::SQL_MODE_ANSI_QUOTES) && $str[0] === '"') {
-            return null;
         } elseif ($str[0] === '"') {
             return Token::FLAG_STRING_DOUBLE_QUOTES;
         }

diff --git a/src/Lexer.php b/src/Lexer.php
@@ -935,7 +935,7 @@ public function parseSymbol()
         $str = null;
 
         if ($this->last < $this->len) {
-            if (($str = $this->parseString(Context::getIdentifierQuote())) === null) {
+            if (($str = $this->parseString('`')) === null) {
                 if (($str = $this->parseUnknown()) === null) {
                     $this->error(
                         'Variable name was expected.',

diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php
@@ -25,8 +25,7 @@ public function parseProvider()
         return array(
             array('parser/parse'),
             array('parser/parse2'),
-            array('parser/parseDelimiter'),
-            array('parser/ansi/parseAnsi')
+            array('parser/parseDelimiter')
         );
     }
 

diff --git a/tests/data/lexer/ansi/lexAnsi.in b/tests/data/lexer/ansi/lexAnsi.in
diff --git a/tests/data/lexer/ansi/lexAnsi.out b/tests/data/lexer/ansi/lexAnsi.out
diff --git a/tests/data/parser/ansi/parseAnsi.in b/tests/data/parser/ansi/parseAnsi.in