Merge #422 - Incorrect order of operations to parse table/db called ``

williamdes · williamdes · commit f022373ccc22 · 2023-02-26T22:30:57.000+01:00
Pull-request: #422 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/src/Token.php b/src/Token.php
@@ -292,8 +292,8 @@ public function extract()
 
                 if (isset($str[0]) && (($str[0] === '`') || ($str[0] === '"') || ($str[0] === '\''))) {
                     $quote = $str[0];
-                    $str = str_replace($quote . $quote, $quote, $str);
                     $str = mb_substr($str, 1, -1, 'UTF-8');
+                    $str = str_replace($quote . $quote, $quote, $str);
                 }
 
                 return $str;
diff --git a/tests/data/parser/parseSelect15.out b/tests/data/parser/parseSelect15.out
@@ -51,7 +51,7 @@
                 {
                     "@type": "PhpMyAdmin\\SqlParser\\Token",
                     "token": "``````",
-                    "value": "`",
+                    "value": "``",
                     "keyword": null,
                     "type": 8,
                     "flags": 2,
@@ -87,7 +87,7 @@
                 {
                     "@type": "PhpMyAdmin\\SqlParser\\Token",
                     "token": "``````",
-                    "value": "`",
+                    "value": "``",
                     "keyword": null,
                     "type": 8,
                     "flags": 2,
@@ -595,7 +595,7 @@
                         },
                         "database": null,
                         "table": null,
-                        "column": "`",
+                        "column": "``",
                         "expr": "``````",
                         "alias": null,
                         "function": null,
@@ -624,7 +624,7 @@
                             "XOR": 1
                         },
                         "database": null,
-                        "table": "`",
+                        "table": "``",
                         "column": null,
                         "expr": "``````",
                         "alias": null,

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,8 @@ public function extract()`
`292`	`292`
`293`	`293`	if (isset($str[0]) && (($str[0] === '`') \|\| ($str[0] === '"') \|\| ($str[0] === '\''))) {
`294`	`294`	`$quote = $str[0];`
`295`		`- $str = str_replace($quote . $quote, $quote, $str);`
`296`	`295`	`$str = mb_substr($str, 1, -1, 'UTF-8');`
	`296`	`+ $str = str_replace($quote . $quote, $quote, $str);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`return $str;`