From 18308bceaf523f4bd05cd1b7d9de5548074661fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 27 Sep 2023 12:32:21 -0300 Subject: [PATCH] Fix bugs/gh498 fixture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- tests/data/bugs/gh498.out | 152 ++++++++++++++++++++++++++++---------- 1 file changed, 114 insertions(+), 38 deletions(-) diff --git a/tests/data/bugs/gh498.out b/tests/data/bugs/gh498.out index 1b4e5d533..a89d9ace4 100644 --- a/tests/data/bugs/gh498.out +++ b/tests/data/bugs/gh498.out @@ -7,13 +7,19 @@ "last": 63, "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", + "count": 32, + "idx": 32, "tokens": [ { "@type": "PhpMyAdmin\\SqlParser\\Token", "token": "SELECT", "value": "SELECT", "keyword": "SELECT", - "type": 1, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\TokenType", + "name": "Keyword", + "value": 1 + }, "flags": 3, "position": 0 }, @@ -22,7 +28,11 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\TokenType", + "name": "Whitespace", + "value": 3 + }, "flags": 0, "position": 6 }, @@ -31,7 +41,11 @@ "token": "?", "value": "?", "keyword": null, - "type": 8, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\TokenType", + "name": "Symbol", + "value": 8 + }, "flags": 16, "position": 7 }, @@ -40,7 +54,9 @@ "token": "\n", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 8 }, @@ -49,7 +65,9 @@ "token": "FROM", "value": "FROM", "keyword": "FROM", - "type": 1, + "type": { + "@type": "@3" + }, "flags": 3, "position": 9 }, @@ -58,7 +76,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 13 }, @@ -67,7 +87,11 @@ "token": "uno", "value": "uno", "keyword": null, - "type": 0, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\TokenType", + "name": "None", + "value": 0 + }, "flags": 0, "position": 14 }, @@ -76,7 +100,9 @@ "token": "\n", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 17 }, @@ -85,7 +111,9 @@ "token": "JOIN", "value": "JOIN", "keyword": "JOIN", - "type": 1, + "type": { + "@type": "@3" + }, "flags": 3, "position": 18 }, @@ -94,7 +122,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 22 }, @@ -103,7 +133,9 @@ "token": "dos", "value": "dos", "keyword": null, - "type": 0, + "type": { + "@type": "@12" + }, "flags": 0, "position": 23 }, @@ -112,7 +144,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 26 }, @@ -121,7 +155,9 @@ "token": "ON", "value": "ON", "keyword": "ON", - "type": 1, + "type": { + "@type": "@3" + }, "flags": 3, "position": 28 }, @@ -130,7 +166,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 30 }, @@ -139,7 +177,9 @@ "token": "dos", "value": "dos", "keyword": null, - "type": 0, + "type": { + "@type": "@12" + }, "flags": 0, "position": 31 }, @@ -148,7 +188,11 @@ "token": ".", "value": ".", "keyword": null, - "type": 2, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\TokenType", + "name": "Operator", + "value": 2 + }, "flags": 16, "position": 34 }, @@ -157,7 +201,9 @@ "token": "id", "value": "id", "keyword": null, - "type": 0, + "type": { + "@type": "@12" + }, "flags": 0, "position": 35 }, @@ -166,7 +212,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 37 }, @@ -175,7 +223,9 @@ "token": "=", "value": "=", "keyword": null, - "type": 2, + "type": { + "@type": "@22" + }, "flags": 2, "position": 38 }, @@ -184,7 +234,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 39 }, @@ -193,7 +245,9 @@ "token": "uno", "value": "uno", "keyword": null, - "type": 0, + "type": { + "@type": "@12" + }, "flags": 0, "position": 40 }, @@ -202,7 +256,9 @@ "token": ".", "value": ".", "keyword": null, - "type": 2, + "type": { + "@type": "@22" + }, "flags": 16, "position": 43 }, @@ -211,7 +267,9 @@ "token": "id", "value": "id", "keyword": null, - "type": 0, + "type": { + "@type": "@12" + }, "flags": 0, "position": 44 }, @@ -220,7 +278,9 @@ "token": "\n", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 46 }, @@ -229,7 +289,9 @@ "token": "LIMIT", "value": "LIMIT", "keyword": "LIMIT", - "type": 1, + "type": { + "@type": "@3" + }, "flags": 3, "position": 47 }, @@ -238,7 +300,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 52 }, @@ -247,7 +311,9 @@ "token": "?", "value": "?", "keyword": null, - "type": 8, + "type": { + "@type": "@7" + }, "flags": 16, "position": 53 }, @@ -256,7 +322,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 54 }, @@ -265,7 +333,9 @@ "token": "OFFSET", "value": "OFFSET", "keyword": "OFFSET", - "type": 1, + "type": { + "@type": "@3" + }, "flags": 1, "position": 55 }, @@ -274,7 +344,9 @@ "token": " ", "value": " ", "keyword": null, - "type": 3, + "type": { + "@type": "@5" + }, "flags": 0, "position": 61 }, @@ -283,7 +355,9 @@ "token": "?", "value": "?", "keyword": null, - "type": 8, + "type": { + "@type": "@7" + }, "flags": 16, "position": 62 }, @@ -292,13 +366,15 @@ "token": null, "value": null, "keyword": null, - "type": 9, + "type": { + "@type": "PhpMyAdmin\\SqlParser\\TokenType", + "name": "Delimiter", + "value": 9 + }, "flags": 0, "position": null } - ], - "count": 32, - "idx": 32 + ] }, "delimiter": ";", "delimiterLen": 1, @@ -337,11 +413,11 @@ "subquery": null } ], - "index_hints": null, + "indexHints": null, "partition": null, "where": null, "group": null, - "group_options": null, + "groupOptions": null, "having": null, "order": null, "limit": { @@ -381,7 +457,7 @@ } ], "union": [], - "end_options": null, + "endOptions": null, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": []