diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 825d3e395..f5cad29dc 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -385,16 +385,6 @@ parameters: count: 3 path: src/Lexer.php - - - message: "#^Parameter \\#1 \\$token of class PhpMyAdmin\\\\SqlParser\\\\Token constructor expects string, null given\\.$#" - count: 1 - path: src/Lexer.php - - - - message: "#^Parameter \\#3 \\$flags of class PhpMyAdmin\\\\SqlParser\\\\Token constructor expects int, int\\|null given\\.$#" - count: 1 - path: src/Lexer.php - - message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Lexer\\:\\:\\$delimiter \\(string\\) does not accept null\\.$#" count: 1 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index d769180a1..930c9e1f9 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -577,11 +577,7 @@ str[$this->last]]]> value]]> - - null - - $flags str[$this->last + 1]]]> str[$this->last]]]> str[$this->last]]]> diff --git a/src/Lexer.php b/src/Lexer.php index a4fe42b4c..d6dab82d0 100644 --- a/src/Lexer.php +++ b/src/Lexer.php @@ -282,7 +282,7 @@ public function lex(): void } // Adding a final delimiter to mark the ending. - $list->tokens[$list->count++] = new Token(null, TokenType::Delimiter); + $list->tokens[$list->count++] = new Token('', TokenType::Delimiter); // Saving the tokens list. $this->list = $list; @@ -360,7 +360,7 @@ private function solveAmbiguityOnFunctionKeywords(): void && ($next->type !== TokenType::Operator || ! in_array($next->value, self::OPERATOR_NAME_INDICATORS, true) ) - && ($next->value !== null) + && ($next->value !== '') ) { continue; } @@ -915,7 +915,7 @@ public function parseString(string $quote = ''): Token|null $token .= $this->str[$this->last]; } - return new Token($token, TokenType::String, $flags); + return new Token($token, TokenType::String, $flags ?? Token::FLAG_NONE); } /** diff --git a/src/Token.php b/src/Token.php index 2d6031f82..088177168 100644 --- a/src/Token.php +++ b/src/Token.php @@ -64,10 +64,8 @@ class Token /** * The token it its raw string representation. - * - * @var string */ - public $token; + public string $token; /** * The value this token contains (i.e. token after some evaluation). @@ -90,10 +88,8 @@ class Token /** * The flags of this token. - * - * @var int */ - public $flags; + public int $flags; /** * The position in the initial string where this token started. @@ -110,7 +106,7 @@ class Token * @param TokenType $type the type of the token * @param int $flags the flags of the token */ - public function __construct($token, TokenType $type = TokenType::None, $flags = 0) + public function __construct(string $token, TokenType $type = TokenType::None, int $flags = self::FLAG_NONE) { $this->token = $token; $this->type = $type; diff --git a/tests/Utils/CLITest.php b/tests/Utils/CLITest.php index 6f77ce563..20c86948d 100644 --- a/tests/Utils/CLITest.php +++ b/tests/Utils/CLITest.php @@ -329,7 +329,7 @@ public static function tokenizeParamsProvider(): array $result = "[TOKEN 0]\nType = 1\nFlags = 3\nValue = 'SELECT'\nToken = 'SELECT'\n\n" . "[TOKEN 1]\nType = 3\nFlags = 0\nValue = ' '\nToken = ' '\n\n" . "[TOKEN 2]\nType = 6\nFlags = 0\nValue = 1\nToken = '1'\n\n" - . "[TOKEN 3]\nType = 9\nFlags = 0\nValue = NULL\nToken = NULL\n\n"; + . "[TOKEN 3]\nType = 9\nFlags = 0\nValue = ''\nToken = ''\n\n"; return [ [ @@ -381,7 +381,7 @@ public static function tokenizeParamsStdInProvider(): array $result = "[TOKEN 0]\nType = 1\nFlags = 3\nValue = 'SELECT'\nToken = 'SELECT'\n\n" . "[TOKEN 1]\nType = 3\nFlags = 0\nValue = ' '\nToken = ' '\n\n" . "[TOKEN 2]\nType = 6\nFlags = 0\nValue = 1\nToken = '1'\n\n" - . "[TOKEN 3]\nType = 9\nFlags = 0\nValue = NULL\nToken = NULL\n\n"; + . "[TOKEN 3]\nType = 9\nFlags = 0\nValue = ''\nToken = ''\n\n"; return [ [ diff --git a/tests/data/bugs/fuzz1.out b/tests/data/bugs/fuzz1.out index 2cce2732b..6315b6e83 100644 --- a/tests/data/bugs/fuzz1.out +++ b/tests/data/bugs/fuzz1.out @@ -2,6 +2,8 @@ "query": "ALTER..2", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER..2", "len": 8, "last": 8, @@ -51,8 +53,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -65,12 +67,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -84,9 +86,7 @@ "last": 0 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/fuzz2.out b/tests/data/bugs/fuzz2.out index 094f7f3e0..8d74555e5 100644 --- a/tests/data/bugs/fuzz2.out +++ b/tests/data/bugs/fuzz2.out @@ -2,6 +2,8 @@ "query": "WITH](", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH](", "len": 6, "last": 6, @@ -51,8 +53,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -65,12 +67,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -87,9 +89,7 @@ "last": 0 } ], - "brackets": 1, - "strict": false, - "errors": [] + "brackets": 1 }, "errors": { "lexer": [ diff --git a/tests/data/bugs/fuzz3.out b/tests/data/bugs/fuzz3.out index 19b058f33..2bbc85e6d 100644 --- a/tests/data/bugs/fuzz3.out +++ b/tests/data/bugs/fuzz3.out @@ -2,6 +2,8 @@ "query": "WITH*/A(", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH*/A(", "len": 8, "last": 8, @@ -64,8 +66,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -78,12 +80,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -107,9 +109,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/fuzz4.out b/tests/data/bugs/fuzz4.out index 1a3de819a..b1cd9c2d8 100644 --- a/tests/data/bugs/fuzz4.out +++ b/tests/data/bugs/fuzz4.out @@ -2,6 +2,8 @@ "query": "ALTeR=SET", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTeR=SET", "len": 9, "last": 9, @@ -49,8 +51,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -63,12 +65,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -93,9 +95,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/fuzz5.out b/tests/data/bugs/fuzz5.out index 85f5d8ca2..cd03e8035 100644 --- a/tests/data/bugs/fuzz5.out +++ b/tests/data/bugs/fuzz5.out @@ -2,6 +2,8 @@ "query": "+0xO", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "+0xO", "len": 4, "last": 4, @@ -38,8 +40,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -52,19 +54,17 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, "statements": [], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/fuzz6.out b/tests/data/bugs/fuzz6.out index 7f20f75f8..4bb688456 100644 --- a/tests/data/bugs/fuzz6.out +++ b/tests/data/bugs/fuzz6.out @@ -2,6 +2,8 @@ "query": "-+0x!", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-+0x!", "len": 5, "last": 5, @@ -38,8 +40,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -52,19 +54,17 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, "statements": [], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh14.out b/tests/data/bugs/gh14.out index 6c37a16c2..3fdb252ed 100644 --- a/tests/data/bugs/gh14.out +++ b/tests/data/bugs/gh14.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE\n `actor` MODIFY `actor_id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT,\n AUTO_INCREMENT = 201;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE\n `actor` MODIFY `actor_id` SMALLINT(5) UNSIGNED NOT NULL AUTO_INCREMENT,\n AUTO_INCREMENT = 201;", "len": 113, "last": 113, @@ -332,8 +334,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@35" @@ -344,12 +346,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -447,9 +449,7 @@ "last": 27 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh16.out b/tests/data/bugs/gh16.out index 74b6473eb..b9259b26a 100644 --- a/tests/data/bugs/gh16.out +++ b/tests/data/bugs/gh16.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `jos_core_acl_aro` (\n `id` int(11) NOT NULL,\n `section_value` varchar(240) NOT NULL DEFAULT '0',\n `value` varchar(240) NOT NULL DEFAULT '',\n `order_value` int(11) NOT NULL DEFAULT '0',\n `name` varchar(255) NOT NULL DEFAULT '',\n `hidden` int(11) NOT NULL DEFAULT '0',\n PRIMARY KEY (`id`),\n UNIQUE KEY `jos_section_value_value_aro` (`section_value`(100),`value`(15)) USING BTREE,\n KEY `jos_gacl_hidden_aro` (`hidden`)\n) ENGINE=InnoDB DEFAULT CHARSET=latin1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `jos_core_acl_aro` (\n `id` int(11) NOT NULL,\n `section_value` varchar(240) NOT NULL DEFAULT '0',\n `value` varchar(240) NOT NULL DEFAULT '',\n `order_value` int(11) NOT NULL DEFAULT '0',\n `name` varchar(255) NOT NULL DEFAULT '',\n `hidden` int(11) NOT NULL DEFAULT '0',\n PRIMARY KEY (`id`),\n UNIQUE KEY `jos_section_value_value_aro` (`section_value`(100),`value`(15)) USING BTREE,\n KEY `jos_gacl_hidden_aro` (`hidden`)\n) ENGINE=InnoDB DEFAULT CHARSET=latin1", "len": 476, "last": 476, @@ -1489,8 +1491,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -1503,12 +1505,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1872,9 +1874,7 @@ "last": 133 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh202.out b/tests/data/bugs/gh202.out index afff78cab..36ef59de7 100644 --- a/tests/data/bugs/gh202.out +++ b/tests/data/bugs/gh202.out @@ -2,6 +2,8 @@ "query": "update tbl_customer t set t.`description`=:yp where t.id=1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "update tbl_customer t set t.`description`=:yp where t.id=1;", "len": 59, "last": 59, @@ -268,8 +270,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@30" @@ -280,12 +282,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -333,9 +335,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh234.out b/tests/data/bugs/gh234.out index ae31aa92a..a6b78dde9 100644 --- a/tests/data/bugs/gh234.out +++ b/tests/data/bugs/gh234.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `mail_template` CHANGE COLUMN `mtpl_group` `mtpl_group` ENUM('ORDER') NULL DEFAULT NULL ;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `mail_template` CHANGE COLUMN `mtpl_group` `mtpl_group` ENUM('ORDER') NULL DEFAULT NULL ;", "len": 101, "last": 101, @@ -310,8 +312,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@33" @@ -322,12 +324,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -418,9 +420,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh317.out b/tests/data/bugs/gh317.out index b3eb553f2..c1617fa10 100644 --- a/tests/data/bugs/gh317.out +++ b/tests/data/bugs/gh317.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `demo` ADD KEY `IDX_REPAIR` (`REPAIR`);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `demo` ADD KEY `IDX_REPAIR` (`REPAIR`);", "len": 51, "last": 51, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -276,9 +278,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh412.out b/tests/data/bugs/gh412.out index 9a422185e..1e101e37f 100644 --- a/tests/data/bugs/gh412.out +++ b/tests/data/bugs/gh412.out @@ -2,6 +2,8 @@ "query": "SELECT 1, 2, ?, 3", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1, 2, ?, 3", "len": 17, "last": 17, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -168,12 +170,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -244,9 +246,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh478.out b/tests/data/bugs/gh478.out index ead08f6f6..6c7173ed6 100644 --- a/tests/data/bugs/gh478.out +++ b/tests/data/bugs/gh478.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `MY_TABLE`\nMODIFY `FOO` INT(11) NULL,\nMODIFY `MY_COLUMN` ENUM('INSERT','UPDATE','DELETE','REPLACE') NULL,\nMODIFY `BAR` VARCHAR(255) NULL;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `MY_TABLE`\nMODIFY `FOO` INT(11) NULL,\nMODIFY `MY_COLUMN` ENUM('INSERT','UPDATE','DELETE','REPLACE') NULL,\nMODIFY `BAR` VARCHAR(255) NULL;\n", "len": 150, "last": 150, @@ -554,8 +556,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@55" @@ -566,12 +568,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -738,9 +740,7 @@ "last": 46 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh492.out b/tests/data/bugs/gh492.out index 0e114d921..db98048e3 100644 --- a/tests/data/bugs/gh492.out +++ b/tests/data/bugs/gh492.out @@ -2,6 +2,8 @@ "query": "UPDATE order\nSET price = ?\nWHERE orderid = ?", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE order\nSET price = ?\nWHERE orderid = ?", "len": 51, "last": 51, @@ -231,8 +233,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -245,12 +247,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -286,9 +288,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh498.out b/tests/data/bugs/gh498.out index a89d9ace4..fc96f4fe3 100644 --- a/tests/data/bugs/gh498.out +++ b/tests/data/bugs/gh498.out @@ -2,6 +2,8 @@ "query": "SELECT ?\nFROM uno\nJOIN dos ON dos.id = uno.id\nLIMIT ? OFFSET ?", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT ?\nFROM uno\nJOIN dos ON dos.id = uno.id\nLIMIT ? OFFSET ?", "len": 63, "last": 63, @@ -363,8 +365,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -377,12 +379,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -466,9 +468,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh499.out b/tests/data/bugs/gh499.out index b82c8dbd0..82de99e2a 100644 --- a/tests/data/bugs/gh499.out +++ b/tests/data/bugs/gh499.out @@ -2,6 +2,8 @@ "query": "UPDATE\n users\nSET\n username = ?,\n id=155;\n\nUPDATE\n users\nSET\n username = :user_name,\n id=155;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE\n users\nSET\n username = ?,\n id=155;\n\nUPDATE\n users\nSET\n username = :user_name,\n id=155;", "len": 111, "last": 111, @@ -411,8 +413,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@25" @@ -423,12 +425,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -508,9 +510,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh508.out b/tests/data/bugs/gh508.out index 9994bb1f7..d555d434d 100644 --- a/tests/data/bugs/gh508.out +++ b/tests/data/bugs/gh508.out @@ -2,6 +2,8 @@ "query": "0X0F", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "0X0F", "len": 4, "last": 4, @@ -25,8 +27,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -39,19 +41,17 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, "statements": [], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh511.out b/tests/data/bugs/gh511.out index 3d4e3aaf4..28d483c85 100644 --- a/tests/data/bugs/gh511.out +++ b/tests/data/bugs/gh511.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE users_type MODIFY limitations ENUM('tout', 'rien', 'bu', 'agence', 'agence_limite', 'n-1', 'agence_inactif');\nUPDATE users_type SET limitations = 'agence_inactif' WHERE id_users_type = 19;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE users_type MODIFY limitations ENUM('tout', 'rien', 'bu', 'agence', 'agence_limite', 'n-1', 'agence_inactif');\nUPDATE users_type SET limitations = 'agence_inactif' WHERE id_users_type = 19;\n", "len": 201, "last": 201, @@ -631,8 +633,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@40" @@ -643,12 +645,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -806,9 +808,7 @@ "last": 52 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/gh9.out b/tests/data/bugs/gh9.out index 311f8299c..08822c559 100644 --- a/tests/data/bugs/gh9.out +++ b/tests/data/bugs/gh9.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM foo WHERE\nSELECT * FROM foo WHERE\n\nSTART TRANSACTION;\n\nCREATE TABLE `tb` (`uid` INT UNSIGNED NOT NULL\n`position` INT NOT NULL,\nPRIMARY KEY ( `uid` ) ,\nINDEX ( `position` )\n) ENGINE = InnoDB;\n\nCOMMIT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM foo WHERE\nSELECT * FROM foo WHERE\n\nSTART TRANSACTION;\n\nCREATE TABLE `tb` (`uid` INT UNSIGNED NOT NULL\n`position` INT NOT NULL,\nPRIMARY KEY ( `uid` ) ,\nINDEX ( `position` )\n) ENGINE = InnoDB;\n\nCOMMIT;", "len": 213, "last": 213, @@ -838,8 +840,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@28" @@ -850,12 +852,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1045,9 +1047,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/pma11800.out b/tests/data/bugs/pma11800.out index eee1b931d..075c0e11f 100644 --- a/tests/data/bugs/pma11800.out +++ b/tests/data/bugs/pma11800.out @@ -2,6 +2,8 @@ "query": "SELECT 'a' REGEXP '^[a-d]';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 'a' REGEXP '^[a-d]';", "len": 27, "last": 27, @@ -108,8 +110,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -166,9 +168,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/pma11836.out b/tests/data/bugs/pma11836.out index 3ac24c6f7..a45a8f833 100644 --- a/tests/data/bugs/pma11836.out +++ b/tests/data/bugs/pma11836.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM alumnos WHERE id = IF(id = 1, id, nombre) AND id not in (SELECT id FROM alumnos)", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM alumnos WHERE id = IF(id = 1, id, nombre) AND id not in (SELECT id FROM alumnos)", "len": 94, "last": 94, @@ -506,8 +508,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -520,12 +522,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -602,9 +604,7 @@ "last": 43 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/pma11843.out b/tests/data/bugs/pma11843.out index 96571c7b7..7c3b03f12 100644 --- a/tests/data/bugs/pma11843.out +++ b/tests/data/bugs/pma11843.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `mytable` (\n `id` int(11) NOT NULL,\n `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `mytable` (\n `id` int(11) NOT NULL,\n `created_at` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP\n);", "len": 119, "last": 119, @@ -387,8 +389,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@40" @@ -399,12 +401,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -514,9 +516,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/bugs/pma11879.out b/tests/data/bugs/pma11879.out index b2f012dc8..3780472f1 100644 --- a/tests/data/bugs/pma11879.out +++ b/tests/data/bugs/pma11879.out @@ -2,6 +2,8 @@ "query": "INSERT INTO\n tbproject(`id`, `name`, `description`, `create_dt`, `dbtype`, `useclause`, `sync_comments`)\nVALUES\n (NULL, 'testdb', 'Descrizione test', NOW(), 'mySQL', '', 1);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO\n tbproject(`id`, `name`, `description`, `create_dt`, `dbtype`, `useclause`, `sync_comments`)\nVALUES\n (NULL, 'testdb', 'Descrizione test', NOW(), 'mySQL', '', 1);", "len": 175, "last": 175, @@ -611,8 +613,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@62" @@ -623,12 +625,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -697,9 +699,7 @@ "last": 51 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/lexer/lex.out b/tests/data/lexer/lex.out index 7381b2d0a..60948b33c 100644 --- a/tests/data/lexer/lex.out +++ b/tests/data/lexer/lex.out @@ -2,6 +2,8 @@ "query": "SELECT \\\\", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT \\\\", "len": 9, "last": 9, @@ -62,8 +64,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -76,9 +78,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexBool.out b/tests/data/lexer/lexBool.out index 273b2f586..70aa6b7a2 100644 --- a/tests/data/lexer/lexBool.out +++ b/tests/data/lexer/lexBool.out @@ -2,6 +2,8 @@ "query": "SELECT true, FalSe", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT true, FalSe", "len": 18, "last": 18, @@ -86,8 +88,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -100,9 +102,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexComment.out b/tests/data/lexer/lexComment.out index 38737b946..d6f7b9857 100644 --- a/tests/data/lexer/lexComment.out +++ b/tests/data/lexer/lexComment.out @@ -2,6 +2,8 @@ "query": "# comment\nSELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */\n-- comment\n-- comment 2", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "# comment\nSELECT /*!50000 STRAIGHT_JOIN */ col1 FROM table1, table2 /* select query */\n-- comment\n-- comment 2", "len": 110, "last": 111, @@ -286,8 +288,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -300,9 +302,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexCommentEnd.out b/tests/data/lexer/lexCommentEnd.out index 972c6366e..000095ada 100644 --- a/tests/data/lexer/lexCommentEnd.out +++ b/tests/data/lexer/lexCommentEnd.out @@ -2,6 +2,8 @@ "query": "SELECT 1\n-- comment\n--", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1\n-- comment\n--", "len": 22, "last": 23, @@ -97,8 +99,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -111,9 +113,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexDelimiter.out b/tests/data/lexer/lexDelimiter.out index eb43f86f3..ecd0d94a0 100644 --- a/tests/data/lexer/lexDelimiter.out +++ b/tests/data/lexer/lexDelimiter.out @@ -2,6 +2,8 @@ "query": "DELIMITER GO\nSELECT a,b FROM foo GO\nSELECT * FROM bar", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER GO\nSELECT a,b FROM foo GO\nSELECT * FROM bar", "len": 53, "last": 53, @@ -275,8 +277,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -287,9 +289,7 @@ ] }, "delimiter": "GO", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexDelimiter2.out b/tests/data/lexer/lexDelimiter2.out index a44fbfe28..d4e54ded8 100644 --- a/tests/data/lexer/lexDelimiter2.out +++ b/tests/data/lexer/lexDelimiter2.out @@ -2,6 +2,8 @@ "query": "DELIMTER //\nSELECT a,b FROM test //\nSELECT * FROM bar //", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMTER //\nSELECT a,b FROM test //\nSELECT * FROM bar //", "len": 56, "last": 56, @@ -328,8 +330,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -342,9 +344,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexDelimiterErr1.out b/tests/data/lexer/lexDelimiterErr1.out index 8efecfdc4..f4df40024 100644 --- a/tests/data/lexer/lexDelimiterErr1.out +++ b/tests/data/lexer/lexDelimiterErr1.out @@ -2,6 +2,8 @@ "query": "DELIMITER", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER", "len": 9, "last": 9, @@ -25,8 +27,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -39,9 +41,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexDelimiterErr2.out b/tests/data/lexer/lexDelimiterErr2.out index 34e2dbfec..2e5cbeb3e 100644 --- a/tests/data/lexer/lexDelimiterErr2.out +++ b/tests/data/lexer/lexDelimiterErr2.out @@ -2,6 +2,8 @@ "query": "DELIMITER \r", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER \r", "len": 11, "last": 11, @@ -38,8 +40,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -52,9 +54,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexDelimiterErr3.out b/tests/data/lexer/lexDelimiterErr3.out index 10e108034..189c05d2d 100644 --- a/tests/data/lexer/lexDelimiterErr3.out +++ b/tests/data/lexer/lexDelimiterErr3.out @@ -2,6 +2,8 @@ "query": "DELIMITER;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER;\n", "len": 11, "last": 11, @@ -51,8 +53,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -63,9 +65,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexDelimiterLen.out b/tests/data/lexer/lexDelimiterLen.out index 3cbc4c578..0cb6db2c7 100644 --- a/tests/data/lexer/lexDelimiterLen.out +++ b/tests/data/lexer/lexDelimiterLen.out @@ -2,6 +2,8 @@ "query": "DELIMITER abcdefghijklmnopqrstuvwxyz\nSELECT 1 abcdefghijklmnopqrstuvwxyz\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER abcdefghijklmnopqrstuvwxyz\nSELECT 1 abcdefghijklmnopqrstuvwxyz\n", "len": 73, "last": 73, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -166,9 +168,7 @@ ] }, "delimiter": "abcdefghijklmno", - "delimiterLen": 15, - "strict": false, - "errors": [] + "delimiterLen": 15 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexKeyword.out b/tests/data/lexer/lexKeyword.out index 471af8e27..aff6c684f 100644 --- a/tests/data/lexer/lexKeyword.out +++ b/tests/data/lexer/lexKeyword.out @@ -2,6 +2,8 @@ "query": "SELECT 1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1", "len": 8, "last": 8, @@ -51,8 +53,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -65,9 +67,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexKeyword2.out b/tests/data/lexer/lexKeyword2.out index f3352aa2f..677ddac46 100644 --- a/tests/data/lexer/lexKeyword2.out +++ b/tests/data/lexer/lexKeyword2.out @@ -2,6 +2,8 @@ "query": "SELECT tbl.TABLE FROM tbl", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT tbl.TABLE FROM tbl", "len": 25, "last": 25, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,9 +135,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexLabel1.out b/tests/data/lexer/lexLabel1.out index eb6bab190..85ee7c7d8 100644 --- a/tests/data/lexer/lexLabel1.out +++ b/tests/data/lexer/lexLabel1.out @@ -2,6 +2,8 @@ "query": "CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n label1 : LOOP\n SET p1 = p1 + 1;\n IF p1 < 10 THEN\n ITERATE label1;\n END IF;\n LEAVE label1;\n END LOOP label1;\n SET @x = p1;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n label1 : LOOP\n SET p1 = p1 + 1;\n IF p1 < 10 THEN\n ITERATE label1;\n END IF;\n LEAVE label1;\n END LOOP label1;\n SET @x = p1;\nEND", "len": 187, "last": 187, @@ -820,8 +822,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@37" @@ -832,9 +834,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexLabel2.out b/tests/data/lexer/lexLabel2.out index 314d92d36..5314b6662 100644 --- a/tests/data/lexer/lexLabel2.out +++ b/tests/data/lexer/lexLabel2.out @@ -2,6 +2,8 @@ "query": "CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n label1: LOOP\n SET p1 = p1 + 1;\n IF p1 < 10 THEN\n ITERATE label1;\n END IF;\n LEAVE label1;\n END LOOP label1;\n SET @x = p1;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n label1: LOOP\n SET p1 = p1 + 1;\n IF p1 < 10 THEN\n ITERATE label1;\n END IF;\n LEAVE label1;\n END LOOP label1;\n SET @x = p1;\nEND", "len": 186, "last": 186, @@ -820,8 +822,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@37" @@ -832,9 +834,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexNoLabel.out b/tests/data/lexer/lexNoLabel.out index fd0c4d04f..fb093d3e3 100644 --- a/tests/data/lexer/lexNoLabel.out +++ b/tests/data/lexer/lexNoLabel.out @@ -2,6 +2,8 @@ "query": "SELECT wins FROM players WHERE auth = '[U1:123456789]' LIMIT 1\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT wins FROM players WHERE auth = '[U1:123456789]' LIMIT 1\n", "len": 63, "last": 63, @@ -244,8 +246,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -258,9 +260,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexNumber.out b/tests/data/lexer/lexNumber.out index f765d03a1..3d65815fe 100644 --- a/tests/data/lexer/lexNumber.out +++ b/tests/data/lexer/lexNumber.out @@ -2,6 +2,8 @@ "query": "SELECT 12, 34, 5.67, 0x89, -10, --11, +12, .15, 0xFFa, 0xfFA, +0xfFA, -0xFFa, -0xfFA, 1e-10, 1e10, .5e10, b'10';\n-- invalid numbers\nSELECT 12ex10, b'15', 0XFfA, -0XFfA, +0XFfA;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 12, 34, 5.67, 0x89, -10, --11, +12, .15, 0xFFa, 0xfFA, +0xfFA, -0xFFa, -0xfFA, 1e-10, 1e10, .5e10, b'10';\n-- invalid numbers\nSELECT 12ex10, b'15', 0XFfA, -0XFfA, +0XFfA;", "len": 176, "last": 176, @@ -842,8 +844,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@58" @@ -854,9 +856,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexOperator.out b/tests/data/lexer/lexOperator.out index 6acc08123..48b671a58 100644 --- a/tests/data/lexer/lexOperator.out +++ b/tests/data/lexer/lexOperator.out @@ -2,6 +2,8 @@ "query": "SELECT 1 + 2", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1 + 2", "len": 12, "last": 12, @@ -97,8 +99,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -111,9 +113,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexOperatorStarIsArithmetic.out b/tests/data/lexer/lexOperatorStarIsArithmetic.out index 929b5c296..589dd999f 100644 --- a/tests/data/lexer/lexOperatorStarIsArithmetic.out +++ b/tests/data/lexer/lexOperatorStarIsArithmetic.out @@ -2,6 +2,8 @@ "query": "SELECT 2*3\nSELECT 2 * 3\nSELECT field * 8\nSELECT 8 * field\nSELECT foo * bar\nSELECT `escaped_field` * 16\nSELECT 16 * `escaped_field`\nSELECT `foo` * `bar`\nSELECT `foo`*`bar`\nSELECT 1 * (SELECT COUNT(1) FROM nb_rows)\nSELECT (SELECT COUNT(1) FROM nb_rows) * 1\nSELECT (SELECT COUNT(1) FROM nb_rows) * (SELECT COUNT(1) FROM nb_rows)\nSELECT (1 * 1) * (2 * 2)\nSELECT 1 * (2 * (3 * (4 * 5)))\nSELECT 2.71 * 3.14\nSELECT 2.71 * -3.14\nSELECT -2.71 * 3.14\nSELECT -2.71 * -3.14\nSELECT 0xABC * 0xCBA\nSELECT 0xABC * -0xCBA\nSELECT -0xABC * 0xCBA\nSELECT -0xABC * -0xCBA\n\n-- Now same but with comments inside (C style comments could conflicts with operator if lexer is failing)\nSELECT 2 * /* comment */3\nSELECT 2/* comment */ * 3\nSELECT 2/* comment with * inside */ * 3\nSELECT /* comment */ field /* comment */ * /* comment */ 8 /* comment */\nSELECT /* comment */ 8 /* comment */ * /* comment */ field /* comment */\nSELECT /* comment */ foo /* comment */ * /* comment */ bar /* comment */\nSELECT /* comment */ `escaped_field` /* comment */ * /* comment */ 16 /* comment */\nSELECT /* comment */ 16 /* comment */ * /* comment */ `escaped_field` /* comment */\nSELECT /* comment */ `foo` /* comment */ * /* comment */ `bar` /* comment */\nSELECT /* `comment` */ `foo` /* `comment` */ * /* `comment` */ `bar` /* `comment` */\nSELECT /* comment */ 1 /* comment */ * /* comment */ (SELECT COUNT(/* comment */1/* comment */) /* comment */ FROM nb_rows)\nSELECT /* comment */ (SELECT COUNT(1) /* comment */FROM/* comment */ nb_rows) /* comment */ * /* comment */ 1\nSELECT (SELECT /* comment */ COUNT(1) /* comment */ FROM /* comment */ nb_rows) /* comment */ * /* comment */ (SELECT COUNT(1) FROM nb_rows)\nSELECT (1 * 1) /* comment */ * /* comment */ (2 * 2)\nSELECT /* comment */ 1 /* comment */ * /* comment */ (2 /* comment */ * /* comment */ (3 /* comment */ * /* comment */ (4 /* comment */ * /* comment */ 5))) /* comment */\nSELECT 2.71 /* comment */ * /* comment */ 3.14\nSELECT 2.71 /* comment */ * /* comment */ -3.14\nSELECT -2.71 /* comment */ * /* comment */ 3.14\nSELECT -2.71 /* comment */ * /* comment */ -3.14\nSELECT 0xABC /* comment */ * /* comment */ 0xCBA\nSELECT 0xABC /* comment */ * /* comment */ -0xCBA\nSELECT -0xABC /* comment */ * /* comment */ 0xCBA\nSELECT -0xABC /* comment */ * /* comment */ -0xCBA\nSELECT 1 /* comment with FROM keyword */ * /* comment with USING keyword */1\nSELECT 1 /* comment with ) */ * /* comment with , keyword */1\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 2*3\nSELECT 2 * 3\nSELECT field * 8\nSELECT 8 * field\nSELECT foo * bar\nSELECT `escaped_field` * 16\nSELECT 16 * `escaped_field`\nSELECT `foo` * `bar`\nSELECT `foo`*`bar`\nSELECT 1 * (SELECT COUNT(1) FROM nb_rows)\nSELECT (SELECT COUNT(1) FROM nb_rows) * 1\nSELECT (SELECT COUNT(1) FROM nb_rows) * (SELECT COUNT(1) FROM nb_rows)\nSELECT (1 * 1) * (2 * 2)\nSELECT 1 * (2 * (3 * (4 * 5)))\nSELECT 2.71 * 3.14\nSELECT 2.71 * -3.14\nSELECT -2.71 * 3.14\nSELECT -2.71 * -3.14\nSELECT 0xABC * 0xCBA\nSELECT 0xABC * -0xCBA\nSELECT -0xABC * 0xCBA\nSELECT -0xABC * -0xCBA\n\n-- Now same but with comments inside (C style comments could conflicts with operator if lexer is failing)\nSELECT 2 * /* comment */3\nSELECT 2/* comment */ * 3\nSELECT 2/* comment with * inside */ * 3\nSELECT /* comment */ field /* comment */ * /* comment */ 8 /* comment */\nSELECT /* comment */ 8 /* comment */ * /* comment */ field /* comment */\nSELECT /* comment */ foo /* comment */ * /* comment */ bar /* comment */\nSELECT /* comment */ `escaped_field` /* comment */ * /* comment */ 16 /* comment */\nSELECT /* comment */ 16 /* comment */ * /* comment */ `escaped_field` /* comment */\nSELECT /* comment */ `foo` /* comment */ * /* comment */ `bar` /* comment */\nSELECT /* `comment` */ `foo` /* `comment` */ * /* `comment` */ `bar` /* `comment` */\nSELECT /* comment */ 1 /* comment */ * /* comment */ (SELECT COUNT(/* comment */1/* comment */) /* comment */ FROM nb_rows)\nSELECT /* comment */ (SELECT COUNT(1) /* comment */FROM/* comment */ nb_rows) /* comment */ * /* comment */ 1\nSELECT (SELECT /* comment */ COUNT(1) /* comment */ FROM /* comment */ nb_rows) /* comment */ * /* comment */ (SELECT COUNT(1) FROM nb_rows)\nSELECT (1 * 1) /* comment */ * /* comment */ (2 * 2)\nSELECT /* comment */ 1 /* comment */ * /* comment */ (2 /* comment */ * /* comment */ (3 /* comment */ * /* comment */ (4 /* comment */ * /* comment */ 5))) /* comment */\nSELECT 2.71 /* comment */ * /* comment */ 3.14\nSELECT 2.71 /* comment */ * /* comment */ -3.14\nSELECT -2.71 /* comment */ * /* comment */ 3.14\nSELECT -2.71 /* comment */ * /* comment */ -3.14\nSELECT 0xABC /* comment */ * /* comment */ 0xCBA\nSELECT 0xABC /* comment */ * /* comment */ -0xCBA\nSELECT -0xABC /* comment */ * /* comment */ 0xCBA\nSELECT -0xABC /* comment */ * /* comment */ -0xCBA\nSELECT 1 /* comment with FROM keyword */ * /* comment with USING keyword */1\nSELECT 1 /* comment with ) */ * /* comment with , keyword */1\n\n", "len": 2429, "last": 2429, @@ -7407,8 +7409,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -7421,9 +7423,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexOperatorStarIsWildcard.out b/tests/data/lexer/lexOperatorStarIsWildcard.out index 77025c590..4ed29e171 100644 --- a/tests/data/lexer/lexOperatorStarIsWildcard.out +++ b/tests/data/lexer/lexOperatorStarIsWildcard.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM\nSELECT *FROM\nSELECT a.* FROM\nSELECT a.*,b.* FROM\nSELECT a.*, b.* FROM\nSELECT a.*, /* with a comment */ b.* FROM\nSELECT a.*,/* with a comment */b.* FROM\nSELECT a.* /* comment */ FROM\n-- SELECT a.*/* comment */ FROM (This one is not working yet because of https://github.com/phpmyadmin/sql-parser/issues/285. Please uncomment when this issue is fixed.)\nSELECT DISTINCT * FROM\nSELECT DISTINCT *FROM\nSELECT DISTINCT a.* FROM\nSELECT DISTINCT a.*,b.* FROM\nSELECT DISTINCT a.*, b.* FROM\nSELECT DISTINCT a.*, /* with a comment */ b.* FROM\nSELECT DISTINCT a.*,/* with a comment */b.* FROM\nSELECT DISTINCT a.* /* comment */ FROM\n-- SELECT DISTINCT a.*/* comment */ FROM (This one is not working yet because of https://github.com/phpmyadmin/sql-parser/issues/285. Please uncomment when this issue is fixed.)\nSELECT `*` FROM table_name\nSELECT `*`.* FROM table_name AS `*`\nSELECT COUNT(*) FROM table_name\nSELECT COUNT( * ) FROM table_name\nSELECT COUNT( * /* comment with *,USING,FROM */) FROM table_name\nSELECT COUNT(`*`) FROM table_name\nSELECT 1 FROM table_name WHERE LABEL LIKE '%*%'\nDELETE a.* USING\nDELETE a.*, b.* USING\nDELETE a.* ,b.* USING\nDELETE a.* , b.* USING\nDELETE a.* /* comment */ USING\nDELETE a.* /* comment */, b.* /*comment*/ USING\nDELETE a.* /* comment */ ,b.* /*comment*/ USING\nDELETE a.* /* comment */ , b.* /*comment*/ USING\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM\nSELECT *FROM\nSELECT a.* FROM\nSELECT a.*,b.* FROM\nSELECT a.*, b.* FROM\nSELECT a.*, /* with a comment */ b.* FROM\nSELECT a.*,/* with a comment */b.* FROM\nSELECT a.* /* comment */ FROM\n-- SELECT a.*/* comment */ FROM (This one is not working yet because of https://github.com/phpmyadmin/sql-parser/issues/285. Please uncomment when this issue is fixed.)\nSELECT DISTINCT * FROM\nSELECT DISTINCT *FROM\nSELECT DISTINCT a.* FROM\nSELECT DISTINCT a.*,b.* FROM\nSELECT DISTINCT a.*, b.* FROM\nSELECT DISTINCT a.*, /* with a comment */ b.* FROM\nSELECT DISTINCT a.*,/* with a comment */b.* FROM\nSELECT DISTINCT a.* /* comment */ FROM\n-- SELECT DISTINCT a.*/* comment */ FROM (This one is not working yet because of https://github.com/phpmyadmin/sql-parser/issues/285. Please uncomment when this issue is fixed.)\nSELECT `*` FROM table_name\nSELECT `*`.* FROM table_name AS `*`\nSELECT COUNT(*) FROM table_name\nSELECT COUNT( * ) FROM table_name\nSELECT COUNT( * /* comment with *,USING,FROM */) FROM table_name\nSELECT COUNT(`*`) FROM table_name\nSELECT 1 FROM table_name WHERE LABEL LIKE '%*%'\nDELETE a.* USING\nDELETE a.*, b.* USING\nDELETE a.* ,b.* USING\nDELETE a.* , b.* USING\nDELETE a.* /* comment */ USING\nDELETE a.* /* comment */, b.* /*comment*/ USING\nDELETE a.* /* comment */ ,b.* /*comment*/ USING\nDELETE a.* /* comment */ , b.* /*comment*/ USING\n\n", "len": 1348, "last": 1348, @@ -4219,8 +4221,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -4233,9 +4235,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexString.out b/tests/data/lexer/lexString.out index 505a58927..6358d1cc3 100644 --- a/tests/data/lexer/lexString.out +++ b/tests/data/lexer/lexString.out @@ -2,6 +2,8 @@ "query": "SELECT 'foo', \"bar\", \"foo\\\\ bar\"", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 'foo', \"bar\", \"foo\\\\ bar\"", "len": 32, "last": 32, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,9 +135,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexStringErr1.out b/tests/data/lexer/lexStringErr1.out index 10c1c6441..52fd1d2a1 100644 --- a/tests/data/lexer/lexStringErr1.out +++ b/tests/data/lexer/lexStringErr1.out @@ -2,6 +2,8 @@ "query": "SELECT 'foo', \"bar\", \"foo\\\\ bar", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 'foo', \"bar\", \"foo\\\\ bar", "len": 31, "last": 32, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,9 +135,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbol.out b/tests/data/lexer/lexSymbol.out index 462691912..08b65d864 100644 --- a/tests/data/lexer/lexSymbol.out +++ b/tests/data/lexer/lexSymbol.out @@ -2,6 +2,8 @@ "query": "SET @idx := 1;\nSELECT @idx, @`idx`, @'idx', @@hostname", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET @idx := 1;\nSELECT @idx, @`idx`, @'idx', @@hostname", "len": 54, "last": 54, @@ -255,8 +257,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -267,9 +269,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolErr1.out b/tests/data/lexer/lexSymbolErr1.out index 442670a42..37a852d5c 100644 --- a/tests/data/lexer/lexSymbolErr1.out +++ b/tests/data/lexer/lexSymbolErr1.out @@ -2,6 +2,8 @@ "query": "SET @idx := 1;\nSELECT @idx, @`idx`, @'idx", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET @idx := 1;\nSELECT @idx, @`idx`, @'idx", "len": 41, "last": 42, @@ -222,8 +224,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -234,9 +236,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolErr2.out b/tests/data/lexer/lexSymbolErr2.out index 6f74259a9..84dd47bcd 100644 --- a/tests/data/lexer/lexSymbolErr2.out +++ b/tests/data/lexer/lexSymbolErr2.out @@ -2,6 +2,8 @@ "query": "SET @idx := 1;\nSELECT @idx, @`idx`, @ ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET @idx := 1;\nSELECT @idx, @`idx`, @ ", "len": 38, "last": 38, @@ -222,8 +224,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -234,9 +236,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolErr3.out b/tests/data/lexer/lexSymbolErr3.out index a5f1b79cc..d7bf41786 100644 --- a/tests/data/lexer/lexSymbolErr3.out +++ b/tests/data/lexer/lexSymbolErr3.out @@ -2,6 +2,8 @@ "query": "SELECT `idx", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT `idx", "len": 11, "last": 12, @@ -51,8 +53,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -65,9 +67,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolUser1.out b/tests/data/lexer/lexSymbolUser1.out index 4a36f4b15..27c643d8c 100644 --- a/tests/data/lexer/lexSymbolUser1.out +++ b/tests/data/lexer/lexSymbolUser1.out @@ -2,6 +2,8 @@ "query": "CREATE USER 'user'@'hostname' IDENTIFIED BY 'password';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE USER 'user'@'hostname' IDENTIFIED BY 'password';", "len": 55, "last": 55, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,9 +168,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolUser2.out b/tests/data/lexer/lexSymbolUser2.out index 2f37584b1..1f1e7518f 100644 --- a/tests/data/lexer/lexSymbolUser2.out +++ b/tests/data/lexer/lexSymbolUser2.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user'@'hostname' IDENTIFIED WITH mysql_native_password BY 'password';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user'@'hostname' IDENTIFIED WITH mysql_native_password BY 'password';", "len": 81, "last": 81, @@ -178,8 +180,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@21" @@ -190,9 +192,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolUser3.out b/tests/data/lexer/lexSymbolUser3.out index 20ded3178..bfe497f7b 100644 --- a/tests/data/lexer/lexSymbolUser3.out +++ b/tests/data/lexer/lexSymbolUser3.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user'@'hostname' WITH MAX_QUERIES_PER_HOUR 500 MAX_UPDATES_PER_HOUR 100;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user'@'hostname' WITH MAX_QUERIES_PER_HOUR 500 MAX_UPDATES_PER_HOUR 100;", "len": 84, "last": 84, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,9 +212,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolUser4_mariadb_100400.out b/tests/data/lexer/lexSymbolUser4_mariadb_100400.out index 35d8cabdb..9edfdc2d2 100644 --- a/tests/data/lexer/lexSymbolUser4_mariadb_100400.out +++ b/tests/data/lexer/lexSymbolUser4_mariadb_100400.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user'@'hostname' IDENTIFIED VIA mysql_native_password BY 'password';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user'@'hostname' IDENTIFIED VIA mysql_native_password BY 'password';", "len": 80, "last": 80, @@ -178,8 +180,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@21" @@ -190,9 +192,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexSymbolUser5_mariadb_100400.out b/tests/data/lexer/lexSymbolUser5_mariadb_100400.out index 545a82f0b..c2c4ba9d2 100644 --- a/tests/data/lexer/lexSymbolUser5_mariadb_100400.out +++ b/tests/data/lexer/lexSymbolUser5_mariadb_100400.out @@ -2,6 +2,8 @@ "query": "CREATE USER 'user'@'hostname' IDENTIFIED VIA mysql_native_password BY 'password';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE USER 'user'@'hostname' IDENTIFIED VIA mysql_native_password BY 'password';", "len": 81, "last": 81, @@ -178,8 +180,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@21" @@ -190,9 +192,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexUtf8.out b/tests/data/lexer/lexUtf8.out index 1dfac40a7..d2074090b 100644 --- a/tests/data/lexer/lexUtf8.out +++ b/tests/data/lexer/lexUtf8.out @@ -2,6 +2,8 @@ "query": "select * from école", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": { "@type": "PhpMyAdmin\\SqlParser\\UtfString", "str": "select * from école", @@ -104,8 +106,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -118,9 +120,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexWhitespace.out b/tests/data/lexer/lexWhitespace.out index 314e6eb8e..11ca65a25 100644 --- a/tests/data/lexer/lexWhitespace.out +++ b/tests/data/lexer/lexWhitespace.out @@ -2,6 +2,8 @@ "query": "\n\n\nSELECT \n\t\t'w h i t e\t\ts p a c e'\n\n\t\t\n\t\t\t\n \n ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "\n\n\nSELECT \n\t\t'w h i t e\t\ts p a c e'\n\n\t\t\n\t\t\t\n \n ", "len": 79, "last": 79, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,9 +89,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/lexer/lexWildcardThenComment.out b/tests/data/lexer/lexWildcardThenComment.out index 88a0037d4..022bde98f 100644 --- a/tests/data/lexer/lexWildcardThenComment.out +++ b/tests/data/lexer/lexWildcardThenComment.out @@ -2,6 +2,8 @@ "query": "SELECT */* comment */\n\nSELECT /* comment */*\n\nSELECT 2*/* comment */3\n\nSELECT 2/* comment */*3\n\nSELECT */*\ncomment\non\nmultiple\nlines\n*/FROM\n\nDELETE foo.*/* foo */ USING\n\nDELETE foo.*/* foo */,bar.*/*bar*/ USING\n\nSELECT `*`/*with comment*/ AS star_field\n\nSELECT `*`,*/*with comment*/\n\nDELETE a.*/*multi\nline /* with C open tag\ncomment inside */ USING\n\nSELECT 2*/* operator */3 + 3/* operator */*2,/* start wildcard */*/* end wildcard */\n\nSELECT `*`/*a*/*/*b*/`*`\n\n-- invalid queries\n/* SELECT */*", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT */* comment */\n\nSELECT /* comment */*\n\nSELECT 2*/* comment */3\n\nSELECT 2/* comment */*3\n\nSELECT */*\ncomment\non\nmultiple\nlines\n*/FROM\n\nDELETE foo.*/* foo */ USING\n\nDELETE foo.*/* foo */,bar.*/*bar*/ USING\n\nSELECT `*`/*with comment*/ AS star_field\n\nSELECT `*`,*/*with comment*/\n\nDELETE a.*/*multi\nline /* with C open tag\ncomment inside */ USING\n\nSELECT 2*/* operator */3 + 3/* operator */*2,/* start wildcard */*/* end wildcard */\n\nSELECT `*`/*a*/*/*b*/`*`\n\n-- invalid queries\n/* SELECT */*", "len": 495, "last": 495, @@ -1214,8 +1216,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -1228,9 +1230,7 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": null, "errors": { diff --git a/tests/data/misc/parseParameter.out b/tests/data/misc/parseParameter.out index 351ccb0d9..f384dae51 100644 --- a/tests/data/misc/parseParameter.out +++ b/tests/data/misc/parseParameter.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `person` (`firstname`, `lastname`, `email`) VALUES (:firstname, :lastname, :email);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `person` (`firstname`, `lastname`, `email`) VALUES (:firstname, :lastname, :email);", "len": 95, "last": 95, @@ -330,8 +332,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@34" @@ -342,12 +344,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -404,9 +406,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/misc/parseParameter2.out b/tests/data/misc/parseParameter2.out index 9c0c6b6ed..e0e7e382d 100644 --- a/tests/data/misc/parseParameter2.out +++ b/tests/data/misc/parseParameter2.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `person` (`firstname`, `lastname`, `email`) VALUES (?, ?, ?);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `person` (`firstname`, `lastname`, `email`) VALUES (?, ?, ?);", "len": 73, "last": 73, @@ -330,8 +332,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@34" @@ -342,12 +344,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -404,9 +406,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parse.out b/tests/data/parser/parse.out index aaad9614a..b31e35c83 100644 --- a/tests/data/parser/parse.out +++ b/tests/data/parser/parse.out @@ -2,6 +2,8 @@ "query": "SELECT 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1;", "len": 9, "last": 9, @@ -64,8 +66,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@9" @@ -76,12 +78,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -122,9 +124,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parse2.out b/tests/data/parser/parse2.out index 9373143d9..62ef4b942 100644 --- a/tests/data/parser/parse2.out +++ b/tests/data/parser/parse2.out @@ -2,6 +2,8 @@ "query": "(SELECT 1);((SELECT 2));", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "(SELECT 1);((SELECT 2));", "len": 24, "last": 24, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -269,9 +271,7 @@ "last": 12 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter.out b/tests/data/parser/parseAlter.out index 9971ffce0..d77b01aa5 100644 --- a/tests/data/parser/parseAlter.out +++ b/tests/data/parser/parseAlter.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `actor`\n ADD PRIMARY KEY (`actor_id`),\n ADD KEY `idx_actor_last_name` (`last_name`);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `actor`\n ADD PRIMARY KEY (`actor_id`),\n ADD KEY `idx_actor_last_name` (`last_name`);", "len": 102, "last": 102, @@ -297,8 +299,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -309,12 +311,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -398,9 +400,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter10.out b/tests/data/parser/parseAlter10.out index 9f3712fab..ae6e03608 100644 --- a/tests/data/parser/parseAlter10.out +++ b/tests/data/parser/parseAlter10.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `database`.`table` MODIFY `field` INT(11) AUTO_INCREMENT PRIMARY KEY;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `database`.`table` MODIFY `field` INT(11) AUTO_INCREMENT PRIMARY KEY;", "len": 81, "last": 81, @@ -255,8 +257,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@28" @@ -267,12 +269,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -347,9 +349,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter11.out b/tests/data/parser/parseAlter11.out index c4acc8ec2..bee239ec7 100644 --- a/tests/data/parser/parseAlter11.out +++ b/tests/data/parser/parseAlter11.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `actor` ADD `last_update2` SET ('value1','value2','value3') NOT NULL AFTER last_update", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `actor` ADD `last_update2` SET ('value1','value2','value3') NOT NULL AFTER last_update", "len": 98, "last": 98, @@ -299,8 +301,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -313,12 +315,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -387,9 +389,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter12.out b/tests/data/parser/parseAlter12.out index 6d5b6bf5b..5211f83a7 100644 --- a/tests/data/parser/parseAlter12.out +++ b/tests/data/parser/parseAlter12.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE actor ALTER last_update2 SET DEFAULT 'value1';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE actor ALTER last_update2 SET DEFAULT 'value1';", "len": 58, "last": 58, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -269,9 +271,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter13.out b/tests/data/parser/parseAlter13.out index 2615ec466..91b8d4423 100644 --- a/tests/data/parser/parseAlter13.out +++ b/tests/data/parser/parseAlter13.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `actor` ADD `last_update2` SET ('value1','value2','value3')", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `actor` ADD `last_update2` SET ('value1','value2','value3')", "len": 71, "last": 71, @@ -231,8 +233,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -245,12 +247,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -304,9 +306,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter14.out b/tests/data/parser/parseAlter14.out index f5f8ea84f..80c41f6b2 100644 --- a/tests/data/parser/parseAlter14.out +++ b/tests/data/parser/parseAlter14.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `table` ADD UNIQUE KEY `functional_index` (`field1`,`field2`, (IFNULL(`field3`,0)));\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `table` ADD UNIQUE KEY `functional_index` (`field1`,`field2`, (IFNULL(`field3`,0)));\n", "len": 97, "last": 97, @@ -343,8 +345,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@35" @@ -355,12 +357,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -459,9 +461,7 @@ "last": 27 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter2.out b/tests/data/parser/parseAlter2.out index df4d94d11..1bb1a91ad 100644 --- a/tests/data/parser/parseAlter2.out +++ b/tests/data/parser/parseAlter2.out @@ -2,6 +2,8 @@ "query": "ALTER /* */ TABLE /* */ table\nCONVERT /* */ TO /* */ CHARACTER /* */ SET /* */ utf8;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER /* */ TABLE /* */ table\nCONVERT /* */ TO /* */ CHARACTER /* */ SET /* */ utf8;", "len": 84, "last": 84, @@ -330,8 +332,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@34" @@ -342,12 +344,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -385,9 +387,7 @@ "last": 27 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter3.out b/tests/data/parser/parseAlter3.out index d723f5086..cc3d0a10a 100644 --- a/tests/data/parser/parseAlter3.out +++ b/tests/data/parser/parseAlter3.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `tbl` CHANGE `uid` `uid` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT\n\nALTER TABLE `tbl` CHANGE `field_1` `field_2` INT( 10 ) UNSIGNED NOT NULL", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `tbl` CHANGE `uid` `uid` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT\n\nALTER TABLE `tbl` CHANGE `field_1` `field_2` INT( 10 ) UNSIGNED NOT NULL", "len": 153, "last": 153, @@ -539,8 +541,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -553,12 +555,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -654,9 +656,7 @@ "last": 47 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter4.out b/tests/data/parser/parseAlter4.out index e71d34df0..7630a5f83 100644 --- a/tests/data/parser/parseAlter4.out +++ b/tests/data/parser/parseAlter4.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE my_table COMMENT='Comment of table';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE my_table COMMENT='Comment of table';", "len": 48, "last": 48, @@ -134,8 +136,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@17" @@ -146,12 +148,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -197,9 +199,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter5.out b/tests/data/parser/parseAlter5.out index 044e185b5..6edcc7e77 100644 --- a/tests/data/parser/parseAlter5.out +++ b/tests/data/parser/parseAlter5.out @@ -2,6 +2,8 @@ "query": "ALTER DATABASE `abc` CHARACTER SET = 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER DATABASE `abc` CHARACTER SET = 'utf8'", "len": 43, "last": 43, @@ -143,8 +145,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -157,12 +159,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -208,9 +210,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter6.out b/tests/data/parser/parseAlter6.out index b6145a067..8400dd63d 100644 --- a/tests/data/parser/parseAlter6.out +++ b/tests/data/parser/parseAlter6.out @@ -2,6 +2,8 @@ "query": "ALTER VIEW `abc` AS SELECT `a` FROM `b`", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER VIEW `abc` AS SELECT `a` FROM `b`", "len": 39, "last": 39, @@ -183,8 +185,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -197,12 +199,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -268,9 +270,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter7.out b/tests/data/parser/parseAlter7.out index 296d013cd..fa7308a60 100644 --- a/tests/data/parser/parseAlter7.out +++ b/tests/data/parser/parseAlter7.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `tbl` CHANGE `uid` `uid` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT, CHANGE `field_1` `field_2` INT( 10 ) UNSIGNED NOT NULL", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `tbl` CHANGE `uid` `uid` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT, CHANGE `field_1` `field_2` INT( 10 ) UNSIGNED NOT NULL", "len": 135, "last": 135, @@ -484,8 +486,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -498,12 +500,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -654,9 +656,7 @@ "last": 42 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter8.out b/tests/data/parser/parseAlter8.out index 4944df6a6..beec8503c 100644 --- a/tests/data/parser/parseAlter8.out +++ b/tests/data/parser/parseAlter8.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `api_tab_user` CHANGE `rank_id` `rank_id` INT(4) NOT NULL DEFAULT '4';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `api_tab_user` CHANGE `rank_id` `rank_id` INT(4) NOT NULL DEFAULT '4';", "len": 82, "last": 82, @@ -279,8 +281,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -291,12 +293,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -383,9 +385,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlter9.out b/tests/data/parser/parseAlter9.out index ab3dba29a..8b463cc5e 100644 --- a/tests/data/parser/parseAlter9.out +++ b/tests/data/parser/parseAlter9.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE place CHANGE COLUMN plc_location_type gplc_location_type ENUM('LOCATION') CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE place CHANGE COLUMN plc_location_type gplc_location_type ENUM('LOCATION') CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci' NOT NULL;", "len": 142, "last": 142, @@ -343,8 +345,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@36" @@ -355,12 +357,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -460,9 +462,7 @@ "last": 28 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterErr.out b/tests/data/parser/parseAlterErr.out index 2b5001cad..924143736 100644 --- a/tests/data/parser/parseAlterErr.out +++ b/tests/data/parser/parseAlterErr.out @@ -2,6 +2,8 @@ "query": "-- missing comma between alter operations\nALTER TABLE `tbl` CHANGE `uid` `uid` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT CHANGE `field_1` `field_2` INT( 10 ) UNSIGNED NOT NULL", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- missing comma between alter operations\nALTER TABLE `tbl` CHANGE `uid` `uid` INT( 10 ) UNSIGNED NOT NULL AUTO_INCREMENT CHANGE `field_1` `field_2` INT( 10 ) UNSIGNED NOT NULL", "len": 176, "last": 176, @@ -497,8 +499,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -511,12 +513,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -612,9 +614,7 @@ "last": 43 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterErr2.out b/tests/data/parser/parseAlterErr2.out index 7864ebca6..5300c5cb7 100644 --- a/tests/data/parser/parseAlterErr2.out +++ b/tests/data/parser/parseAlterErr2.out @@ -2,6 +2,8 @@ "query": "-- missing comma between alter operations\nALTER TABLE tb_foo CHANGE inmsg inmsg date NULL AFTER outmsg2 CHANGE inmsg2 inmsg2 time NULL AFTER inmsg;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- missing comma between alter operations\nALTER TABLE tb_foo CHANGE inmsg inmsg date NULL AFTER outmsg2 CHANGE inmsg2 inmsg2 time NULL AFTER inmsg;\n", "len": 148, "last": 148, @@ -429,8 +431,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@42" @@ -441,12 +443,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -527,9 +529,7 @@ "last": 35 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterErr3.out b/tests/data/parser/parseAlterErr3.out index 6b5ead9e7..fbbb20d41 100644 --- a/tests/data/parser/parseAlterErr3.out +++ b/tests/data/parser/parseAlterErr3.out @@ -2,6 +2,8 @@ "query": "-- missing comma between alter operations\nALTER TABLE `database`.`table` MODIFY `field` INT(11) AUTO_INCREMENT PRIMARY KEY;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- missing comma between alter operations\nALTER TABLE `database`.`table` MODIFY `field` INT(11) AUTO_INCREMENT PRIMARY KEY;\n", "len": 124, "last": 124, @@ -290,8 +292,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -302,12 +304,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -382,9 +384,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterErr4.out b/tests/data/parser/parseAlterErr4.out index f7f83dd61..b22ae8c01 100644 --- a/tests/data/parser/parseAlterErr4.out +++ b/tests/data/parser/parseAlterErr4.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE actor ALTER last_update2 SET DEFAULT value1';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE actor ALTER last_update2 SET DEFAULT value1';", "len": 57, "last": 58, @@ -196,8 +198,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -272,9 +274,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [ diff --git a/tests/data/parser/parseAlterEvent.out b/tests/data/parser/parseAlterEvent.out index 36701cd72..94f5fa127 100644 --- a/tests/data/parser/parseAlterEvent.out +++ b/tests/data/parser/parseAlterEvent.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ENABLE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ENABLE;\n", "len": 29, "last": 29, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent2.out b/tests/data/parser/parseAlterEvent2.out index 8189850d6..032dca61a 100644 --- a/tests/data/parser/parseAlterEvent2.out +++ b/tests/data/parser/parseAlterEvent2.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event DISABLE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event DISABLE;\n", "len": 30, "last": 30, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent3.out b/tests/data/parser/parseAlterEvent3.out index 90dfc1964..e7ebd5b72 100644 --- a/tests/data/parser/parseAlterEvent3.out +++ b/tests/data/parser/parseAlterEvent3.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event DISABLE ON SLAVE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event DISABLE ON SLAVE;\n", "len": 39, "last": 39, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent4.out b/tests/data/parser/parseAlterEvent4.out index 9fab71618..3e4dd5f00 100644 --- a/tests/data/parser/parseAlterEvent4.out +++ b/tests/data/parser/parseAlterEvent4.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON COMPLETION PRESERVE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON COMPLETION PRESERVE;\n", "len": 45, "last": 45, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent5.out b/tests/data/parser/parseAlterEvent5.out index 55cad7404..0d29b27b3 100644 --- a/tests/data/parser/parseAlterEvent5.out +++ b/tests/data/parser/parseAlterEvent5.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON COMPLETION NOT PRESERVE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON COMPLETION NOT PRESERVE;\n", "len": 49, "last": 49, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent6.out b/tests/data/parser/parseAlterEvent6.out index 33e66b6df..103fac175 100644 --- a/tests/data/parser/parseAlterEvent6.out +++ b/tests/data/parser/parseAlterEvent6.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event RENAME TO my_new_event;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event RENAME TO my_new_event;\n", "len": 45, "last": 45, @@ -163,8 +165,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@17" @@ -175,12 +177,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -236,9 +238,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent7.out b/tests/data/parser/parseAlterEvent7.out index a72059736..d74581a21 100644 --- a/tests/data/parser/parseAlterEvent7.out +++ b/tests/data/parser/parseAlterEvent7.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event COMMENT 'This is an event';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event COMMENT 'This is an event';\n", "len": 49, "last": 49, @@ -143,8 +145,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@16" @@ -155,12 +157,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -206,9 +208,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent8.out b/tests/data/parser/parseAlterEvent8.out index dc1e6a785..cc450ee82 100644 --- a/tests/data/parser/parseAlterEvent8.out +++ b/tests/data/parser/parseAlterEvent8.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event DO\n SELECT * FROM my_table;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event DO\n SELECT * FROM my_table;\n", "len": 50, "last": 50, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -221,12 +223,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -292,9 +294,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEvent9.out b/tests/data/parser/parseAlterEvent9.out index c35b97ea9..3e23554c9 100644 --- a/tests/data/parser/parseAlterEvent9.out +++ b/tests/data/parser/parseAlterEvent9.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT old_db.old_event RENAME TO new_db.new_event;\nALTER EVENT `old_db`.`old_event` RENAME TO `new_db`.`new_event`;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT old_db.old_event RENAME TO new_db.new_event;\nALTER EVENT `old_db`.`old_event` RENAME TO `new_db`.`new_event`;\n", "len": 122, "last": 122, @@ -398,8 +400,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -410,12 +412,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -521,9 +523,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventComplete.out b/tests/data/parser/parseAlterEventComplete.out index 4c9834294..b35e3ec13 100644 --- a/tests/data/parser/parseAlterEventComplete.out +++ b/tests/data/parser/parseAlterEventComplete.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event\n ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP + INTERVAL 4 WEEK\n ENDS '2099-12-30 23:12:01' + INTERVAL 1 DAY\n ON COMPLETION NOT PRESERVE\n RENAME TO my_complete_event\n DISABLE\n COMMENT 'String as a comment'\n DO\n SELECT * FROM my_table;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event\n ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP + INTERVAL 4 WEEK\n ENDS '2099-12-30 23:12:01' + INTERVAL 1 DAY\n ON COMPLETION NOT PRESERVE\n RENAME TO my_complete_event\n DISABLE\n COMMENT 'String as a comment'\n DO\n SELECT * FROM my_table;\n", "len": 303, "last": 303, @@ -719,8 +721,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@70" @@ -731,12 +733,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -872,9 +874,7 @@ "last": 61 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventErr.out b/tests/data/parser/parseAlterEventErr.out index c834e7762..b87dadae7 100644 --- a/tests/data/parser/parseAlterEventErr.out +++ b/tests/data/parser/parseAlterEventErr.out @@ -2,6 +2,8 @@ "query": "-- No option in ALTER EVENT.\nALTER EVENT my_event;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- No option in ALTER EVENT.\nALTER EVENT my_event;\n", "len": 51, "last": 51, @@ -121,8 +123,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@14" @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -166,9 +168,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleAt.out b/tests/data/parser/parseAlterEventOnScheduleAt.out index 6ca9e8716..d498109d8 100644 --- a/tests/data/parser/parseAlterEventOnScheduleAt.out +++ b/tests/data/parser/parseAlterEventOnScheduleAt.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n AT '2023-01-01 01:23:45';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n AT '2023-01-01 01:23:45';\n", "len": 61, "last": 61, @@ -165,8 +167,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -177,12 +179,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -238,9 +240,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleAt2.out b/tests/data/parser/parseAlterEventOnScheduleAt2.out index a032eb162..ec21f2b45 100644 --- a/tests/data/parser/parseAlterEventOnScheduleAt2.out +++ b/tests/data/parser/parseAlterEventOnScheduleAt2.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n AT '2023-01-01 01:23:45' + INTERVAL 1 DAY;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n AT '2023-01-01 01:23:45' + INTERVAL 1 DAY;\n", "len": 78, "last": 78, @@ -257,8 +259,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@28" @@ -269,12 +271,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -330,9 +332,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleEvery.out b/tests/data/parser/parseAlterEventOnScheduleEvery.out index 37bd03f50..086594bf7 100644 --- a/tests/data/parser/parseAlterEventOnScheduleEvery.out +++ b/tests/data/parser/parseAlterEventOnScheduleEvery.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK;\n", "len": 49, "last": 49, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -199,12 +201,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -260,9 +262,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleEvery2.out b/tests/data/parser/parseAlterEventOnScheduleEvery2.out index 8bbb9ee7d..c96c9a9f3 100644 --- a/tests/data/parser/parseAlterEventOnScheduleEvery2.out +++ b/tests/data/parser/parseAlterEventOnScheduleEvery2.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK + INTERVAL 4 HOUR;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK + INTERVAL 4 HOUR;\n", "len": 67, "last": 67, @@ -277,8 +279,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -350,9 +352,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleEvery3.out b/tests/data/parser/parseAlterEventOnScheduleEvery3.out index e47d7fc43..e03bc1a8d 100644 --- a/tests/data/parser/parseAlterEventOnScheduleEvery3.out +++ b/tests/data/parser/parseAlterEventOnScheduleEvery3.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP;\n", "len": 76, "last": 76, @@ -231,8 +233,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@24" @@ -243,12 +245,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -319,9 +321,7 @@ "last": 17 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleEvery4.out b/tests/data/parser/parseAlterEventOnScheduleEvery4.out index 4b5f5db97..d1d3bf42e 100644 --- a/tests/data/parser/parseAlterEventOnScheduleEvery4.out +++ b/tests/data/parser/parseAlterEventOnScheduleEvery4.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP + INTERVAL 4 HOUR;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP + INTERVAL 4 HOUR;\n", "len": 94, "last": 94, @@ -321,8 +323,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@33" @@ -333,12 +335,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -409,9 +411,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleEvery5.out b/tests/data/parser/parseAlterEventOnScheduleEvery5.out index 0c528e3f7..5ed5f1c34 100644 --- a/tests/data/parser/parseAlterEventOnScheduleEvery5.out +++ b/tests/data/parser/parseAlterEventOnScheduleEvery5.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP\n ENDS '2099-12-30 23:12:01';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP\n ENDS '2099-12-30 23:12:01';\n", "len": 105, "last": 105, @@ -277,8 +279,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -380,9 +382,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventOnScheduleEvery6.out b/tests/data/parser/parseAlterEventOnScheduleEvery6.out index 6152891c9..40bba927f 100644 --- a/tests/data/parser/parseAlterEventOnScheduleEvery6.out +++ b/tests/data/parser/parseAlterEventOnScheduleEvery6.out @@ -2,6 +2,8 @@ "query": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP\n ENDS '2099-12-30 23:12:01' + INTERVAL 1 DAY;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER EVENT my_event ON SCHEDULE\n EVERY 2 WEEK\n STARTS CURRENT_TIMESTAMP\n ENDS '2099-12-30 23:12:01' + INTERVAL 1 DAY;\n", "len": 122, "last": 122, @@ -367,8 +369,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@38" @@ -379,12 +381,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -470,9 +472,7 @@ "last": 29 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventWithDefiner.out b/tests/data/parser/parseAlterEventWithDefiner.out index 724e8be17..5bf10747e 100644 --- a/tests/data/parser/parseAlterEventWithDefiner.out +++ b/tests/data/parser/parseAlterEventWithDefiner.out @@ -2,6 +2,8 @@ "query": "ALTER DEFINER = user EVENT my_event ENABLE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER DEFINER = user EVENT my_event ENABLE;\n", "len": 44, "last": 44, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -199,12 +201,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -260,9 +262,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterEventWithOtherDefiners.out b/tests/data/parser/parseAlterEventWithOtherDefiners.out index a22abcae6..c7bf9b4e0 100644 --- a/tests/data/parser/parseAlterEventWithOtherDefiners.out +++ b/tests/data/parser/parseAlterEventWithOtherDefiners.out @@ -2,6 +2,8 @@ "query": "ALTER DEFINER = 'user' EVENT my_event ENABLE;\nALTER DEFINER = `user` EVENT my_event ENABLE;\nALTER DEFINER = user@host EVENT my_event ENABLE;\nALTER DEFINER = 'user'@'host' EVENT my_event ENABLE;\nALTER DEFINER = `user`@`host` EVENT my_event ENABLE;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER DEFINER = 'user' EVENT my_event ENABLE;\nALTER DEFINER = `user` EVENT my_event ENABLE;\nALTER DEFINER = user@host EVENT my_event ENABLE;\nALTER DEFINER = 'user'@'host' EVENT my_event ENABLE;\nALTER DEFINER = `user`@`host` EVENT my_event ENABLE;\n", "len": 247, "last": 247, @@ -862,8 +864,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@21" @@ -874,12 +876,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1135,9 +1137,7 @@ "last": 74 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterRenameColumn.out b/tests/data/parser/parseAlterRenameColumn.out index 9b191d2f8..78e506655 100644 --- a/tests/data/parser/parseAlterRenameColumn.out +++ b/tests/data/parser/parseAlterRenameColumn.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE myTable RENAME COLUMN foo TO bar;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE myTable RENAME COLUMN foo TO bar;\n", "len": 46, "last": 46, @@ -207,8 +209,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@21" @@ -219,12 +221,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -281,9 +283,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterRenameColumns.out b/tests/data/parser/parseAlterRenameColumns.out index fbed88e6a..be1d07414 100644 --- a/tests/data/parser/parseAlterRenameColumns.out +++ b/tests/data/parser/parseAlterRenameColumns.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE myTable RENAME COLUMN a TO b,\n RENAME COLUMN b TO c,\n RENAME COLUMN c TO d,\n RENAME COLUMN d TO a;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE myTable RENAME COLUMN a TO b,\n RENAME COLUMN b TO c,\n RENAME COLUMN c TO d,\n RENAME COLUMN d TO a;\n", "len": 168, "last": 168, @@ -572,8 +574,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@55" @@ -584,12 +586,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -730,9 +732,7 @@ "last": 48 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableAddSpatialIndex1.out b/tests/data/parser/parseAlterTableAddSpatialIndex1.out index 78c8fea6c..3d33446a1 100644 --- a/tests/data/parser/parseAlterTableAddSpatialIndex1.out +++ b/tests/data/parser/parseAlterTableAddSpatialIndex1.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE testtable ADD SPATIAL INDEX(`mypoint`), ALGORITHM=INPLACE, LOCK=SHARED;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE testtable ADD SPATIAL INDEX(`mypoint`), ALGORITHM=INPLACE, LOCK=SHARED;", "len": 83, "last": 83, @@ -277,8 +279,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@30" @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -382,9 +384,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet1.out b/tests/data/parser/parseAlterTableCharacterSet1.out index 05161ce53..03818f25a 100644 --- a/tests/data/parser/parseAlterTableCharacterSet1.out +++ b/tests/data/parser/parseAlterTableCharacterSet1.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `d` DEFAULT CHARSET=hp8 COLLATE hp8_english_ci;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `d` DEFAULT CHARSET=hp8 COLLATE hp8_english_ci;\n", "len": 60, "last": 60, @@ -189,8 +191,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@21" @@ -201,12 +203,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -266,9 +268,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet2.out b/tests/data/parser/parseAlterTableCharacterSet2.out index 43ef8e296..6ea8072ab 100644 --- a/tests/data/parser/parseAlterTableCharacterSet2.out +++ b/tests/data/parser/parseAlterTableCharacterSet2.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `d` CHARSET=hp8\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `d` CHARSET=hp8\n\n", "len": 29, "last": 29, @@ -132,8 +134,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -146,12 +148,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -202,9 +204,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet3.out b/tests/data/parser/parseAlterTableCharacterSet3.out index 3595d6285..17847fa0b 100644 --- a/tests/data/parser/parseAlterTableCharacterSet3.out +++ b/tests/data/parser/parseAlterTableCharacterSet3.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `d` CHARSET=hp8;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `d` CHARSET=hp8;\n", "len": 29, "last": 29, @@ -145,8 +147,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@17" @@ -157,12 +159,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -210,9 +212,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet4.out b/tests/data/parser/parseAlterTableCharacterSet4.out index 3aac7fbd5..f4c101e8d 100644 --- a/tests/data/parser/parseAlterTableCharacterSet4.out +++ b/tests/data/parser/parseAlterTableCharacterSet4.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE tbl_name CONVERT TO CHARACTER SET charset_name;\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE tbl_name CONVERT TO CHARACTER SET charset_name;\n\n", "len": 61, "last": 61, @@ -185,8 +187,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@19" @@ -197,12 +199,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -258,9 +260,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet5.out b/tests/data/parser/parseAlterTableCharacterSet5.out index 44b60a4e4..3e23c9901 100644 --- a/tests/data/parser/parseAlterTableCharacterSet5.out +++ b/tests/data/parser/parseAlterTableCharacterSet5.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `d` CHARACTER SET utf8;\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `d` CHARACTER SET utf8;\n\n", "len": 37, "last": 37, @@ -143,8 +145,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@16" @@ -155,12 +157,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -210,9 +212,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet6.out b/tests/data/parser/parseAlterTableCharacterSet6.out index a98d21861..a54c112a0 100644 --- a/tests/data/parser/parseAlterTableCharacterSet6.out +++ b/tests/data/parser/parseAlterTableCharacterSet6.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `d` CHARACTER SET utf8 COLLATE utf8_general_ci;\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `d` CHARACTER SET utf8 COLLATE utf8_general_ci;\n\n", "len": 61, "last": 61, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -199,12 +201,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -264,9 +266,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCharacterSet7.out b/tests/data/parser/parseAlterTableCharacterSet7.out index 18e1201ff..27f791c84 100644 --- a/tests/data/parser/parseAlterTableCharacterSet7.out +++ b/tests/data/parser/parseAlterTableCharacterSet7.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `d` CHARACTER SET utf8 COLLATE utf8_general_ci;\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `d` CHARACTER SET utf8 COLLATE utf8_general_ci;\n\n", "len": 75, "last": 75, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -199,12 +201,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -264,9 +266,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableCoalescePartition.out b/tests/data/parser/parseAlterTableCoalescePartition.out index 10cff8c74..bec3281e3 100644 --- a/tests/data/parser/parseAlterTableCoalescePartition.out +++ b/tests/data/parser/parseAlterTableCoalescePartition.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `MY_TABLE` COALESCE PARTITION 2;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `MY_TABLE` COALESCE PARTITION 2;", "len": 44, "last": 44, @@ -132,8 +134,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@16" @@ -144,12 +146,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -195,9 +197,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableDropAddIndex1.out b/tests/data/parser/parseAlterTableDropAddIndex1.out index 1032ee3c4..cc73372c1 100644 --- a/tests/data/parser/parseAlterTableDropAddIndex1.out +++ b/tests/data/parser/parseAlterTableDropAddIndex1.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE testtable DROP INDEX my_index2, ADD INDEX my_index3(id, id3) USING BTREE, ALGORITHM=COPY;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE testtable DROP INDEX my_index2, ADD INDEX my_index3(id, id3) USING BTREE, ALGORITHM=COPY;\n", "len": 102, "last": 102, @@ -407,8 +409,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@40" @@ -419,12 +421,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -537,9 +539,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableDropColumn1.out b/tests/data/parser/parseAlterTableDropColumn1.out index cf09deb51..0b847b140 100644 --- a/tests/data/parser/parseAlterTableDropColumn1.out +++ b/tests/data/parser/parseAlterTableDropColumn1.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `testtable` DROP COLUMN `id2`, ALGORITHM=INPLACE, LOCK=NONE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `testtable` DROP COLUMN `id2`, ALGORITHM=INPLACE, LOCK=NONE;", "len": 72, "last": 72, @@ -266,8 +268,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -278,12 +280,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -368,9 +370,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableModifyColumn.out b/tests/data/parser/parseAlterTableModifyColumn.out index 8e92b07aa..9ceeca2a4 100644 --- a/tests/data/parser/parseAlterTableModifyColumn.out +++ b/tests/data/parser/parseAlterTableModifyColumn.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE testtable MODIFY COLUMN id INT(11) FIRST, ALGORITHM=INPLACE, LOCK=SHARED;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE testtable MODIFY COLUMN id INT(11) FIRST, ALGORITHM=INPLACE, LOCK=SHARED;", "len": 85, "last": 85, @@ -343,8 +345,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@36" @@ -355,12 +357,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -464,9 +466,7 @@ "last": 28 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableModifyColumnEnum1.out b/tests/data/parser/parseAlterTableModifyColumnEnum1.out index 68ef9fc6a..0b308f888 100644 --- a/tests/data/parser/parseAlterTableModifyColumnEnum1.out +++ b/tests/data/parser/parseAlterTableModifyColumnEnum1.out @@ -2,6 +2,8 @@ "query": "-- ENUM with a string that is a database option.\nALTER TABLE `test_table` MODIFY `COL` ENUM(\"COLLATE\") NULL;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- ENUM with a string that is a database option.\nALTER TABLE `test_table` MODIFY `COL` ENUM(\"COLLATE\") NULL;\n", "len": 109, "last": 109, @@ -246,8 +248,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@27" @@ -258,12 +260,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -332,9 +334,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableModifyColumnEnum2.out b/tests/data/parser/parseAlterTableModifyColumnEnum2.out index 642c8140f..47dbfeebf 100644 --- a/tests/data/parser/parseAlterTableModifyColumnEnum2.out +++ b/tests/data/parser/parseAlterTableModifyColumnEnum2.out @@ -2,6 +2,8 @@ "query": "-- ENUM with a string that is a table option.\nALTER TABLE `test_table` MODIFY `COL` ENUM(\"LOCK\") NULL;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- ENUM with a string that is a table option.\nALTER TABLE `test_table` MODIFY `COL` ENUM(\"LOCK\") NULL;\n", "len": 103, "last": 103, @@ -246,8 +248,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@27" @@ -258,12 +260,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -332,9 +334,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableModifyColumnEnum3.out b/tests/data/parser/parseAlterTableModifyColumnEnum3.out index 2233f52d7..02c9ae3f1 100644 --- a/tests/data/parser/parseAlterTableModifyColumnEnum3.out +++ b/tests/data/parser/parseAlterTableModifyColumnEnum3.out @@ -2,6 +2,8 @@ "query": "-- ENUM with a string that is a statement.\nALTER TABLE `test_table` MODIFY `COL` ENUM(\"INSERT\") NULL;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- ENUM with a string that is a statement.\nALTER TABLE `test_table` MODIFY `COL` ENUM(\"INSERT\") NULL;\n", "len": 102, "last": 102, @@ -246,8 +248,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@27" @@ -258,12 +260,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -332,9 +334,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTablePartitionByRange1.out b/tests/data/parser/parseAlterTablePartitionByRange1.out index e254b832b..5f134877d 100644 --- a/tests/data/parser/parseAlterTablePartitionByRange1.out +++ b/tests/data/parser/parseAlterTablePartitionByRange1.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE trips PARTITION BY RANGE (MONTH(trip_date))\n(\n PARTITION p01 VALUES LESS THAN (02),\n PARTITION p02 VALUES LESS THAN (03),\n PARTITION p03 VALUES LESS THAN (04),\n PARTITION p04 VALUES LESS THAN (05),\n PARTITION p05 VALUES LESS THAN (06),\n PARTITION p06 VALUES LESS THAN (07),\n PARTITION p07 VALUES LESS THAN (08),\n PARTITION p08 VALUES LESS THAN (09),\n PARTITION p09 VALUES LESS THAN (10),\n PARTITION p10 VALUES LESS THAN (11),\n PARTITION p11 VALUES LESS THAN (12),\n PARTITION p12 VALUES LESS THAN (13),\n PARTITION pmaxval VALUES LESS THAN MAXVALUE\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE trips PARTITION BY RANGE (MONTH(trip_date))\n(\n PARTITION p01 VALUES LESS THAN (02),\n PARTITION p02 VALUES LESS THAN (03),\n PARTITION p03 VALUES LESS THAN (04),\n PARTITION p04 VALUES LESS THAN (05),\n PARTITION p05 VALUES LESS THAN (06),\n PARTITION p06 VALUES LESS THAN (07),\n PARTITION p07 VALUES LESS THAN (08),\n PARTITION p08 VALUES LESS THAN (09),\n PARTITION p09 VALUES LESS THAN (10),\n PARTITION p10 VALUES LESS THAN (11),\n PARTITION p11 VALUES LESS THAN (12),\n PARTITION p12 VALUES LESS THAN (13),\n PARTITION pmaxval VALUES LESS THAN MAXVALUE\n);", "len": 600, "last": 600, @@ -2081,8 +2083,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@194" @@ -2093,12 +2095,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -2898,9 +2900,7 @@ "last": 186 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTablePartitionByRange2.out b/tests/data/parser/parseAlterTablePartitionByRange2.out index 9970cf96d..89f8dc27d 100644 --- a/tests/data/parser/parseAlterTablePartitionByRange2.out +++ b/tests/data/parser/parseAlterTablePartitionByRange2.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE d PARTITION BY RANGE (MONTH(departure_date))\n(\nPARTITION p01 VALUES LESS THAN (02) ,\nPARTITION pmaxval VALUES LESS THAN MAXVALUE\n);\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE d PARTITION BY RANGE (MONTH(departure_date))\n(\nPARTITION p01 VALUES LESS THAN (02) ,\nPARTITION pmaxval VALUES LESS THAN MAXVALUE\n);\n", "len": 144, "last": 144, @@ -530,8 +532,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@52" @@ -542,12 +544,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -698,9 +700,7 @@ "last": 44 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableRenameIndex1.out b/tests/data/parser/parseAlterTableRenameIndex1.out index a765c55a4..f7165a142 100644 --- a/tests/data/parser/parseAlterTableRenameIndex1.out +++ b/tests/data/parser/parseAlterTableRenameIndex1.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE `transactions` RENAME INDEX `fk_transactions_catalog_entries1_idx` TO `fk_transactions_catalog_entries2_idx`", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE `transactions` RENAME INDEX `fk_transactions_catalog_entries1_idx` TO `fk_transactions_catalog_entries2_idx`", "len": 120, "last": 120, @@ -183,8 +185,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -197,12 +199,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -255,9 +257,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableRenameIndex2.out b/tests/data/parser/parseAlterTableRenameIndex2.out index 27d691d89..207bac742 100644 --- a/tests/data/parser/parseAlterTableRenameIndex2.out +++ b/tests/data/parser/parseAlterTableRenameIndex2.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE testtable RENAME INDEX my_index TO my_index2, ALGORITHM=INPLACE, LOCK=NONE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE testtable RENAME INDEX my_index TO my_index2, ALGORITHM=INPLACE, LOCK=NONE;", "len": 87, "last": 87, @@ -308,8 +310,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@32" @@ -320,12 +322,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -412,9 +414,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterTableSetAutoIncrementError.out b/tests/data/parser/parseAlterTableSetAutoIncrementError.out index 65edb4d29..5925ed1ca 100644 --- a/tests/data/parser/parseAlterTableSetAutoIncrementError.out +++ b/tests/data/parser/parseAlterTableSetAutoIncrementError.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE t1 AUTO_INCREMENT\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE t1 AUTO_INCREMENT\n", "len": 30, "last": 30, @@ -106,8 +108,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -171,9 +173,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser.out b/tests/data/parser/parseAlterUser.out index 1ea9cfd70..9debb34c5 100644 --- a/tests/data/parser/parseAlterUser.out +++ b/tests/data/parser/parseAlterUser.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'jeffrey'@'localhost'\n IDENTIFIED BY 'new_password' PASSWORD EXPIRE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'jeffrey'@'localhost'\n IDENTIFIED BY 'new_password' PASSWORD EXPIRE;", "len": 80, "last": 80, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -280,9 +282,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser1.out b/tests/data/parser/parseAlterUser1.out index 1a98dbff1..f27a1e735 100644 --- a/tests/data/parser/parseAlterUser1.out +++ b/tests/data/parser/parseAlterUser1.out @@ -2,6 +2,8 @@ "query": "ALTER USER trevor REQUIRE NONE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER trevor REQUIRE NONE;", "len": 31, "last": 31, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -193,9 +195,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser10.out b/tests/data/parser/parseAlterUser10.out index c7a61a9bd..29594d596 100644 --- a/tests/data/parser/parseAlterUser10.out +++ b/tests/data/parser/parseAlterUser10.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'bob'@'localhost' IDENTIFIED WITH mysql_native_password USING PASSWORD('vp8LAf4#wu2V&Wi*iJWC#3KPotsHzx3u');\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'bob'@'localhost' IDENTIFIED WITH mysql_native_password USING PASSWORD('vp8LAf4#wu2V&Wi*iJWC#3KPotsHzx3u');\n\n", "len": 120, "last": 120, @@ -224,8 +226,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@25" @@ -236,12 +238,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -306,9 +308,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser2.out b/tests/data/parser/parseAlterUser2.out index 43e991cfb..051342a54 100644 --- a/tests/data/parser/parseAlterUser2.out +++ b/tests/data/parser/parseAlterUser2.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user'@'localhost' ACCOUNT LOCK;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user'@'localhost' ACCOUNT LOCK;", "len": 43, "last": 43, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -189,9 +191,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser3.out b/tests/data/parser/parseAlterUser3.out index 73d3590fa..a5140a788 100644 --- a/tests/data/parser/parseAlterUser3.out +++ b/tests/data/parser/parseAlterUser3.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'testosama' REQUIRE SSL WITH MAX_CONNECTIONS_PER_HOUR 20;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'testosama' REQUIRE SSL WITH MAX_CONNECTIONS_PER_HOUR 20;", "len": 68, "last": 68, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -271,9 +273,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser4.out b/tests/data/parser/parseAlterUser4.out index eedb65e81..0f75011d6 100644 --- a/tests/data/parser/parseAlterUser4.out +++ b/tests/data/parser/parseAlterUser4.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user'\n WITH MAX_QUERIES_PER_HOUR 500 MAX_UPDATES_PER_HOUR 100;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user'\n WITH MAX_QUERIES_PER_HOUR 500 MAX_UPDATES_PER_HOUR 100;", "len": 75, "last": 75, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -277,9 +279,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser5.out b/tests/data/parser/parseAlterUser5.out index 610789884..cfc6e9523 100644 --- a/tests/data/parser/parseAlterUser5.out +++ b/tests/data/parser/parseAlterUser5.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user' PASSWORD EXPIRE NEVER", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user' PASSWORD EXPIRE NEVER", "len": 39, "last": 39, @@ -139,8 +141,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -153,12 +155,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -213,9 +215,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser6.out b/tests/data/parser/parseAlterUser6.out index 580b90575..3d2914d3c 100644 --- a/tests/data/parser/parseAlterUser6.out +++ b/tests/data/parser/parseAlterUser6.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user' ATTRIBUTE '{\"baz\": \"faz\", \"foo\": \"moo\"}';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user' ATTRIBUTE '{\"baz\": \"faz\", \"foo\": \"moo\"}';", "len": 59, "last": 59, @@ -132,8 +134,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@16" @@ -144,12 +146,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -195,9 +197,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser7.out b/tests/data/parser/parseAlterUser7.out index b1400d967..649800085 100644 --- a/tests/data/parser/parseAlterUser7.out +++ b/tests/data/parser/parseAlterUser7.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user' PASSWORD EXPIRE INTERVAL 180 DAY;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user' PASSWORD EXPIRE INTERVAL 180 DAY;", "len": 51, "last": 51, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -277,9 +279,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser8.out b/tests/data/parser/parseAlterUser8.out index 74135a136..ac71fee50 100644 --- a/tests/data/parser/parseAlterUser8.out +++ b/tests/data/parser/parseAlterUser8.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'user' COMMENT ''", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'user' COMMENT ''", "len": 28, "last": 28, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -182,9 +184,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterUser9.out b/tests/data/parser/parseAlterUser9.out index 19c395f4b..d07128cf2 100644 --- a/tests/data/parser/parseAlterUser9.out +++ b/tests/data/parser/parseAlterUser9.out @@ -2,6 +2,8 @@ "query": "ALTER USER 'bob'@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD('vp8LAf4#wu2V&Wi*iJWC#3KPotsHzx3u');\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER USER 'bob'@'localhost' IDENTIFIED VIA mysql_native_password USING PASSWORD('vp8LAf4#wu2V&Wi*iJWC#3KPotsHzx3u');\n", "len": 118, "last": 118, @@ -246,8 +248,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@27" @@ -258,12 +260,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -338,9 +340,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAlterWithInvisible.out b/tests/data/parser/parseAlterWithInvisible.out index c91b33b53..cf25cbf85 100644 --- a/tests/data/parser/parseAlterWithInvisible.out +++ b/tests/data/parser/parseAlterWithInvisible.out @@ -2,6 +2,8 @@ "query": "ALTER TABLE t MODIFY x INT INVISIBLE, MODIFY y INT, MODIFY z INT NOT NULL DEFAULT 4;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ALTER TABLE t MODIFY x INT INVISIBLE, MODIFY y INT, MODIFY z INT NOT NULL DEFAULT 4;\n", "len": 85, "last": 85, @@ -409,8 +411,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@41" @@ -421,12 +423,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -554,9 +556,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAnalyzeErr1.out b/tests/data/parser/parseAnalyzeErr1.out index 00f1e4fd3..e4ba350d0 100644 --- a/tests/data/parser/parseAnalyzeErr1.out +++ b/tests/data/parser/parseAnalyzeErr1.out @@ -2,6 +2,8 @@ "query": "ANALYZE NO_WRITE_TO_BINLOG", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYZE NO_WRITE_TO_BINLOG", "len": 26, "last": 26, @@ -49,8 +51,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -63,12 +65,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -89,9 +91,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAnalyzeErr2.out b/tests/data/parser/parseAnalyzeErr2.out index 24f866144..4de4984db 100644 --- a/tests/data/parser/parseAnalyzeErr2.out +++ b/tests/data/parser/parseAnalyzeErr2.out @@ -2,6 +2,8 @@ "query": "ANALYZE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYZE", "len": 7, "last": 7, @@ -25,8 +27,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -39,12 +41,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -62,9 +64,7 @@ "last": 0 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAnalyzeTable.out b/tests/data/parser/parseAnalyzeTable.out index bc449af1d..eaa0f723d 100644 --- a/tests/data/parser/parseAnalyzeTable.out +++ b/tests/data/parser/parseAnalyzeTable.out @@ -2,6 +2,8 @@ "query": "ANALYZE TABLE tbl", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYZE TABLE tbl", "len": 17, "last": 17, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,12 +89,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -121,9 +123,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseAnalyzeTable1.out b/tests/data/parser/parseAnalyzeTable1.out index cec350c57..15324eedf 100644 --- a/tests/data/parser/parseAnalyzeTable1.out +++ b/tests/data/parser/parseAnalyzeTable1.out @@ -2,6 +2,8 @@ "query": "ANALYZE NO_WRITE_TO_BINLOG TABLE tbl", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYZE NO_WRITE_TO_BINLOG TABLE tbl", "len": 36, "last": 36, @@ -95,8 +97,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -109,12 +111,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -144,9 +146,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseArrayErr1.out b/tests/data/parser/parseArrayErr1.out index a3b81e717..6e36480db 100644 --- a/tests/data/parser/parseArrayErr1.out +++ b/tests/data/parser/parseArrayErr1.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM foo PARTITION bar, baz);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM foo PARTITION bar, baz);", "len": 38, "last": 38, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -271,9 +273,7 @@ "last": 14 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseArrayErr3.out b/tests/data/parser/parseArrayErr3.out index abd926c6b..cb91235ad 100644 --- a/tests/data/parser/parseArrayErr3.out +++ b/tests/data/parser/parseArrayErr3.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM foo PARTITION (bar, baz;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM foo PARTITION (bar, baz;", "len": 38, "last": 38, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -277,9 +279,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCall.out b/tests/data/parser/parseCall.out index ca89fbca7..d2ac961e2 100644 --- a/tests/data/parser/parseCall.out +++ b/tests/data/parser/parseCall.out @@ -2,6 +2,8 @@ "query": "CALL foo();", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CALL foo();", "len": 11, "last": 11, @@ -88,8 +90,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -100,12 +102,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -126,9 +128,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCall2.out b/tests/data/parser/parseCall2.out index 7c80ee5da..6a37b3af1 100644 --- a/tests/data/parser/parseCall2.out +++ b/tests/data/parser/parseCall2.out @@ -2,6 +2,8 @@ "query": "CALL foo(@bar, @baz);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CALL foo(@bar, @baz);", "len": 21, "last": 21, @@ -134,8 +136,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@17" @@ -146,12 +148,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -178,9 +180,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCall3.out b/tests/data/parser/parseCall3.out index 678e20974..49bdf7ebb 100644 --- a/tests/data/parser/parseCall3.out +++ b/tests/data/parser/parseCall3.out @@ -2,6 +2,8 @@ "query": "CALL foo;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CALL foo;", "len": 9, "last": 9, @@ -64,8 +66,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@9" @@ -76,12 +78,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -98,9 +100,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCall4.out b/tests/data/parser/parseCall4.out index a23133e5a..51f9f7b31 100644 --- a/tests/data/parser/parseCall4.out +++ b/tests/data/parser/parseCall4.out @@ -2,6 +2,8 @@ "query": "call e();call f", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "call e();call f", "len": 15, "last": 15, @@ -121,8 +123,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -170,9 +172,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCall5.out b/tests/data/parser/parseCall5.out index deafdd918..ebe4d3a88 100644 --- a/tests/data/parser/parseCall5.out +++ b/tests/data/parser/parseCall5.out @@ -2,6 +2,8 @@ "query": "call e;call f", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "call e;call f", "len": 13, "last": 13, @@ -97,8 +99,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@9" @@ -109,12 +111,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -142,9 +144,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateDatabase.out b/tests/data/parser/parseCreateDatabase.out index 0c3fd4fb9..e6c8b1969 100644 --- a/tests/data/parser/parseCreateDatabase.out +++ b/tests/data/parser/parseCreateDatabase.out @@ -2,6 +2,8 @@ "query": "CREATE DATABASE IF NOT EXISTS pma DEFAULT CHARSET 'utf8';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE DATABASE IF NOT EXISTS pma DEFAULT CHARSET 'utf8';", "len": 57, "last": 57, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -223,9 +225,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateDatabaseErr.out b/tests/data/parser/parseCreateDatabaseErr.out index 287e2f8a9..3ba8a444b 100644 --- a/tests/data/parser/parseCreateDatabaseErr.out +++ b/tests/data/parser/parseCreateDatabaseErr.out @@ -2,6 +2,8 @@ "query": "CREATE DATABASE IF NOT EXISTS pma ENGINE='InnoDB' DEFAULT CHARSET 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE DATABASE IF NOT EXISTS pma ENGINE='InnoDB' DEFAULT CHARSET 'utf8'", "len": 72, "last": 72, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -201,12 +203,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -251,9 +253,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateFunction.out b/tests/data/parser/parseCreateFunction.out index 82a6c5fb3..0ba2021c5 100644 --- a/tests/data/parser/parseCreateFunction.out +++ b/tests/data/parser/parseCreateFunction.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE FUNCTION F_TEST(uid INT) RETURNS VARCHAR\nBEGIN\n DECLARE username VARCHAR DEFAULT \"\";\n SELECT username INTO username FROM users WHERE ID = uid;\n RETURN username;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER $$\nCREATE FUNCTION F_TEST(uid INT) RETURNS VARCHAR\nBEGIN\n DECLARE username VARCHAR DEFAULT \"\";\n SELECT username INTO username FROM users WHERE ID = uid;\n RETURN username;\nEND", "len": 193, "last": 193, @@ -673,8 +675,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -685,12 +687,12 @@ ] }, "delimiter": "$$", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -880,9 +882,7 @@ "last": 59 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateFunctionErr1.out b/tests/data/parser/parseCreateFunctionErr1.out index 0453d2402..86cd343ba 100644 --- a/tests/data/parser/parseCreateFunctionErr1.out +++ b/tests/data/parser/parseCreateFunctionErr1.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE FUNCTION F_TEST(uid INT)\nBEGIN\n DECLARE username VARCHAR DEFAULT \"\";\n SELECT username INTO username FROM users WHERE ID = uid;\n RETURN username;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER $$\nCREATE FUNCTION F_TEST(uid INT)\nBEGIN\n DECLARE username VARCHAR DEFAULT \"\";\n SELECT username INTO username FROM users WHERE ID = uid;\n RETURN username;\nEND", "len": 177, "last": 177, @@ -629,8 +631,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -641,12 +643,12 @@ ] }, "delimiter": "$$", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -821,9 +823,7 @@ "last": 55 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateFunctionErr2.out b/tests/data/parser/parseCreateFunctionErr2.out index 4e332a0db..eef7c6e56 100644 --- a/tests/data/parser/parseCreateFunctionErr2.out +++ b/tests/data/parser/parseCreateFunctionErr2.out @@ -2,6 +2,8 @@ "query": "CREATE FUNCTION test() RETURNS", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE FUNCTION test() RETURNS", "len": 30, "last": 30, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -182,9 +184,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateFunctionErr3.out b/tests/data/parser/parseCreateFunctionErr3.out index d9afdad92..1a03be119 100644 --- a/tests/data/parser/parseCreateFunctionErr3.out +++ b/tests/data/parser/parseCreateFunctionErr3.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE FUNCTION coincide\nEND;$$\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER $$\nCREATE FUNCTION coincide\nEND;$$\n", "len": 45, "last": 45, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -188,12 +190,12 @@ ] }, "delimiter": "$$", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -237,9 +239,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateOrReplaceView1.out b/tests/data/parser/parseCreateOrReplaceView1.out index 24a38b175..4c09fd551 100644 --- a/tests/data/parser/parseCreateOrReplaceView1.out +++ b/tests/data/parser/parseCreateOrReplaceView1.out @@ -2,6 +2,8 @@ "query": "CREATE OR REPLACE VIEW xviewmytable AS SELECT mytable.id AS id, mytable.personid AS personid FROM mytable WHERE (mytable.birth > '1990-01-19') GROUP BY mytable.personid ;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE OR REPLACE VIEW xviewmytable AS SELECT mytable.id AS id, mytable.personid AS personid FROM mytable WHERE (mytable.birth > '1990-01-19') GROUP BY mytable.personid ;", "len": 172, "last": 172, @@ -596,8 +598,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@59" @@ -608,12 +610,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -736,9 +738,7 @@ "last": 51 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateProcedure.out b/tests/data/parser/parseCreateProcedure.out index acfe9d17f..bfb3c99a2 100644 --- a/tests/data/parser/parseCreateProcedure.out +++ b/tests/data/parser/parseCreateProcedure.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE PROCEDURE P_TEST(uid INT)\nBEGIN\n SELECT username FROM users WHERE ID = uid;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER $$\nCREATE PROCEDURE P_TEST(uid INT)\nBEGIN\n SELECT username FROM users WHERE ID = uid;\nEND", "len": 102, "last": 102, @@ -407,8 +409,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -419,12 +421,12 @@ ] }, "delimiter": "$$", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -545,9 +547,7 @@ "last": 35 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateProcedure1.out b/tests/data/parser/parseCreateProcedure1.out index 1cf5a9d78..d1b6faad8 100644 --- a/tests/data/parser/parseCreateProcedure1.out +++ b/tests/data/parser/parseCreateProcedure1.out @@ -2,6 +2,8 @@ "query": "CREATE DEFINER=`root`@`%` PROCEDURE `test2`(IN `_var` INT) NOT DETERMINISTIC NO SQL SQL SECURITY INVOKER SELECT _var", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE DEFINER=`root`@`%` PROCEDURE `test2`(IN `_var` INT) NOT DETERMINISTIC NO SQL SQL SECURITY INVOKER SELECT _var", "len": 116, "last": 116, @@ -352,8 +354,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -366,12 +368,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -470,9 +472,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateProcedure2.out b/tests/data/parser/parseCreateProcedure2.out index d9de9a6f0..4436acbd5 100644 --- a/tests/data/parser/parseCreateProcedure2.out +++ b/tests/data/parser/parseCreateProcedure2.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE PROCEDURE P_TEST(IN uid INT, IN unused VARCHAR)\nBEGIN\n SELECT username FROM users WHERE ID = uid;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELIMITER $$\nCREATE PROCEDURE P_TEST(IN uid INT, IN unused VARCHAR)\nBEGIN\n SELECT username FROM users WHERE ID = uid;\nEND", "len": 124, "last": 124, @@ -506,8 +508,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -518,12 +520,12 @@ ] }, "delimiter": "$$", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -659,9 +661,7 @@ "last": 44 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateProcedure3.out b/tests/data/parser/parseCreateProcedure3.out index f45efbe3e..d65c17a3a 100644 --- a/tests/data/parser/parseCreateProcedure3.out +++ b/tests/data/parser/parseCreateProcedure3.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE DEFINER=`user`@`localhost` PROCEDURE `multiDBqueryRun_V1`(IN `query` TEXT, IN `table_name_var` VARCHAR(255), IN `columns_used_var` TEXT, IN `where_text_var` TEXT, IN `separator_value_var` VARCHAR(255)) COMMENT 'Query: SingleDB → MultiDB (All DBs) + run it' NOT DETERMINISTIC MODIFIES SQL DATA SQL SECURITY INVOKER BEGIN\nSET @TABLE_NAME = table_name_var;\nSET @WHERE_TEXT = where_text_var;\nSET @COLUMNS_USED = columns_used_var;\nSET @MULTIDB_QUERY = CONCAT('SELECT \"$MULTIDB\" FROM `$MULTIDB`.', @TABLE_NAME, @WHERE_TEXT);\n\n-- EXECUTION --\nCREATE TEMPORARY TABLE `MULTIDB_TEMP_DB_TBL_COLS` AS\nSELECT * FROM (\n SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME\n FROM INFORMATION_SCHEMA.COLUMNS\n WHERE\n TABLE_SCHEMA NOT IN('mysql', 'test', 'tmp', 'information_schema', 'sys', 'performance_schema') AND\n TABLE_NAME = @TABLE_NAME AND\n FIND_IN_SET(COLUMN_NAME, @COLUMNS_USED)\n) tbl\nGROUP BY\n TABLE_SCHEMA,\n TABLE_NAME;\n\nSELECT GROUP_CONCAT(REPLACE(@MULTIDB_QUERY, '$MULTIDB', CONCAT('', TABLE_SCHEMA, '')) SEPARATOR \"\\nUNION ALL\\n\")\nINTO @stmt_sql\nFROM `MULTIDB_TEMP_DB_TBL_COLS`;\n\nPREPARE stmt FROM @stmt_sql;\nEXECUTE stmt;\nDEALLOCATE PREPARE stmt;\nEND", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": { "@type": "PhpMyAdmin\\SqlParser\\UtfString", "str": "DELIMITER $$\nCREATE DEFINER=`user`@`localhost` PROCEDURE `multiDBqueryRun_V1`(IN `query` TEXT, IN `table_name_var` VARCHAR(255), IN `columns_used_var` TEXT, IN `where_text_var` TEXT, IN `separator_value_var` VARCHAR(255)) COMMENT 'Query: SingleDB → MultiDB (All DBs) + run it' NOT DETERMINISTIC MODIFIES SQL DATA SQL SECURITY INVOKER BEGIN\nSET @TABLE_NAME = table_name_var;\nSET @WHERE_TEXT = where_text_var;\nSET @COLUMNS_USED = columns_used_var;\nSET @MULTIDB_QUERY = CONCAT('SELECT \"$MULTIDB\" FROM `$MULTIDB`.', @TABLE_NAME, @WHERE_TEXT);\n\n-- EXECUTION --\nCREATE TEMPORARY TABLE `MULTIDB_TEMP_DB_TBL_COLS` AS\nSELECT * FROM (\n SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME\n FROM INFORMATION_SCHEMA.COLUMNS\n WHERE\n TABLE_SCHEMA NOT IN('mysql', 'test', 'tmp', 'information_schema', 'sys', 'performance_schema') AND\n TABLE_NAME = @TABLE_NAME AND\n FIND_IN_SET(COLUMN_NAME, @COLUMNS_USED)\n) tbl\nGROUP BY\n TABLE_SCHEMA,\n TABLE_NAME;\n\nSELECT GROUP_CONCAT(REPLACE(@MULTIDB_QUERY, '$MULTIDB', CONCAT('', TABLE_SCHEMA, '')) SEPARATOR \"\\nUNION ALL\\n\")\nINTO @stmt_sql\nFROM `MULTIDB_TEMP_DB_TBL_COLS`;\n\nPREPARE stmt FROM @stmt_sql;\nEXECUTE stmt;\nDEALLOCATE PREPARE stmt;\nEND", @@ -2963,8 +2965,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@8" @@ -2975,12 +2977,12 @@ ] }, "delimiter": "$$", - "delimiterLen": 2, - "strict": false, - "errors": [] + "delimiterLen": 2 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@2" }, @@ -3731,9 +3733,7 @@ "last": 266 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateProcedure4.out b/tests/data/parser/parseCreateProcedure4.out index 740f42b65..d65349c5b 100644 --- a/tests/data/parser/parseCreateProcedure4.out +++ b/tests/data/parser/parseCreateProcedure4.out @@ -2,6 +2,8 @@ "query": "DELIMITER $$\nCREATE DEFINER=`user`@`localhost` PROCEDURE `multiDBqueryRun_V12`(IN `query` TEXT, IN `table_name_var` VARCHAR(255), IN `columns_used_var` TEXT, IN `where_text_var` TEXT, IN `separator_value_var` VARCHAR(255)) COMMENT 'Query: SingleDB → MultiDB (All DBs) + run it' NOT DETERMINISTIC MODIFIES SQL DATA SQL SECURITY INVOKER BEGIN\nSET @TABLE_NAME = table_name_var;\nSET @WHERE_TEXT = where_text_var;\nSET @COLUMNS_USED = columns_used_var;\nSET @MULTIDB_QUERY = CONCAT('SELECT \"$MULTIDB\" FROM `$MULTIDB`.', @TABLE_NAME, @WHERE_TEXT);\n\n-- EXECUTION --\nCREATE TEMPORARY TABLE `MULTIDB_TEMP_DB_TBL_COLS` AS\nSELECT * FROM (\n SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME\n FROM INFORMATION_SCHEMA.COLUMNS\n WHERE\n TABLE_SCHEMA NOT IN('mysql', 'test', 'tmp', 'information_schema', 'sys', 'performance_schema') AND\n TABLE_NAME = @TABLE_NAME AND\n FIND_IN_SET(COLUMN_NAME, @COLUMNS_USED)\n) tbl\nGROUP BY\n TABLE_SCHEMA,\n TABLE_NAME;\n\nSELECT GROUP_CONCAT(REPLACE(@MULTIDB_QUERY, '$MULTIDB', CONCAT('', TABLE_SCHEMA, '')) SEPARATOR \"\\nUNION ALL\\n\")\nINTO @stmt_sql\nFROM `MULTIDB_TEMP_DB_TBL_COLS`;\n\nPREPARE stmt FROM @stmt_sql;\nEXECUTE stmt;\nDEALLOCATE PREPARE stmt;\nEND$$\n\n--\n-- Functions\n--\nDELIMITER $$\nCREATE DEFINER=`root`@`localhost` FUNCTION `attrParentShiftIds` (`parent_id` TEXT, `option_id_shift` INT, `option_value_id_shift` INT) RETURNS TEXT CHARSET utf8mb4 COLLATE utf8mb4_unicode_520_ci DETERMINISTIC READS SQL DATA SQL SECURITY INVOKER BEGIN\n DECLARE i INT UNSIGNED DEFAULT 0;\n DECLARE pair_count INT UNSIGNED;\n DECLARE result TEXT DEFAULT '';\n\n DECLARE pair VARCHAR(255) DEFAULT '';\n DECLARE oid INT DEFAULT '';\n DECLARE vid INT DEFAULT '';\n\n SET pair_count = substrCount(parent_id, ',') + 1;\n\n WHILE i < pair_count DO\n SET result = CONCAT(result, IF(i <= 0, '', ','));\n\n SET pair = split(parent_id, ',', i + 1);\n\n SET oid = split(pair, '-', 1) + option_id_shift;\n SET vid = split(pair, '-', 2) + option_value_id_shift;\n\n SET pair = CONCAT(oid, '-', vid);\n SET result = CONCAT(result, pair);\n\n SET i = i + 1;\n END WHILE;\n\n RETURN result;\nEND$$\n\nDELIMITER $$\nCREATE DEFINER=`user`@`localhost` FUNCTION `split` (`string` TEXT, `delim` TEXT, `n` INT) RETURNS TEXT CHARSET utf8mb4 COLLATE utf8mb4_unicode_520_ci DETERMINISTIC SQL SECURITY INVOKER RETURN IF(\n (LENGTH(string) - LENGTH(REPLACE(string, delim, ''))) / LENGTH(delim) < n - 1,\n NULL,\n SUBSTRING_INDEX(SUBSTRING_INDEX(string, delim, n), delim, -1)\n)$$\n\nDELIMITER $$\nCREATE DEFINER=`root`@`localhost` FUNCTION `substrCount` (`s` VARCHAR(255), `ss` VARCHAR(255)) RETURNS TINYINT(3) UNSIGNED DETERMINISTIC READS SQL DATA SQL SECURITY INVOKER BEGIN\nDECLARE COUNT TINYINT(3) UNSIGNED;\nDECLARE OFFSET_I TINYINT(3) UNSIGNED;\nDECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET s = NULL;\n\nSET COUNT = 0;\nSET OFFSET_I = 1;\n\nREPEAT\nIF NOT ISNULL(s) AND OFFSET_I > 0 THEN\nSET OFFSET_I = LOCATE(ss, s, OFFSET_I);\nIF OFFSET_I > 0 THEN\nSET COUNT = COUNT + 1;\nSET OFFSET_I = OFFSET_I + 1;\nEND IF;\nEND IF;\nUNTIL ISNULL(s) OR OFFSET_I = 0 END REPEAT;\n\nRETURN COUNT;\nEND$$\n\nDELIMITER ;\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": { "@type": "PhpMyAdmin\\SqlParser\\UtfString", "str": "DELIMITER $$\nCREATE DEFINER=`user`@`localhost` PROCEDURE `multiDBqueryRun_V12`(IN `query` TEXT, IN `table_name_var` VARCHAR(255), IN `columns_used_var` TEXT, IN `where_text_var` TEXT, IN `separator_value_var` VARCHAR(255)) COMMENT 'Query: SingleDB → MultiDB (All DBs) + run it' NOT DETERMINISTIC MODIFIES SQL DATA SQL SECURITY INVOKER BEGIN\nSET @TABLE_NAME = table_name_var;\nSET @WHERE_TEXT = where_text_var;\nSET @COLUMNS_USED = columns_used_var;\nSET @MULTIDB_QUERY = CONCAT('SELECT \"$MULTIDB\" FROM `$MULTIDB`.', @TABLE_NAME, @WHERE_TEXT);\n\n-- EXECUTION --\nCREATE TEMPORARY TABLE `MULTIDB_TEMP_DB_TBL_COLS` AS\nSELECT * FROM (\n SELECT TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME\n FROM INFORMATION_SCHEMA.COLUMNS\n WHERE\n TABLE_SCHEMA NOT IN('mysql', 'test', 'tmp', 'information_schema', 'sys', 'performance_schema') AND\n TABLE_NAME = @TABLE_NAME AND\n FIND_IN_SET(COLUMN_NAME, @COLUMNS_USED)\n) tbl\nGROUP BY\n TABLE_SCHEMA,\n TABLE_NAME;\n\nSELECT GROUP_CONCAT(REPLACE(@MULTIDB_QUERY, '$MULTIDB', CONCAT('', TABLE_SCHEMA, '')) SEPARATOR \"\\nUNION ALL\\n\")\nINTO @stmt_sql\nFROM `MULTIDB_TEMP_DB_TBL_COLS`;\n\nPREPARE stmt FROM @stmt_sql;\nEXECUTE stmt;\nDEALLOCATE PREPARE stmt;\nEND$$\n\n--\n-- Functions\n--\nDELIMITER $$\nCREATE DEFINER=`root`@`localhost` FUNCTION `attrParentShiftIds` (`parent_id` TEXT, `option_id_shift` INT, `option_value_id_shift` INT) RETURNS TEXT CHARSET utf8mb4 COLLATE utf8mb4_unicode_520_ci DETERMINISTIC READS SQL DATA SQL SECURITY INVOKER BEGIN\n DECLARE i INT UNSIGNED DEFAULT 0;\n DECLARE pair_count INT UNSIGNED;\n DECLARE result TEXT DEFAULT '';\n\n DECLARE pair VARCHAR(255) DEFAULT '';\n DECLARE oid INT DEFAULT '';\n DECLARE vid INT DEFAULT '';\n\n SET pair_count = substrCount(parent_id, ',') + 1;\n\n WHILE i < pair_count DO\n SET result = CONCAT(result, IF(i <= 0, '', ','));\n\n SET pair = split(parent_id, ',', i + 1);\n\n SET oid = split(pair, '-', 1) + option_id_shift;\n SET vid = split(pair, '-', 2) + option_value_id_shift;\n\n SET pair = CONCAT(oid, '-', vid);\n SET result = CONCAT(result, pair);\n\n SET i = i + 1;\n END WHILE;\n\n RETURN result;\nEND$$\n\nDELIMITER $$\nCREATE DEFINER=`user`@`localhost` FUNCTION `split` (`string` TEXT, `delim` TEXT, `n` INT) RETURNS TEXT CHARSET utf8mb4 COLLATE utf8mb4_unicode_520_ci DETERMINISTIC SQL SECURITY INVOKER RETURN IF(\n (LENGTH(string) - LENGTH(REPLACE(string, delim, ''))) / LENGTH(delim) < n - 1,\n NULL,\n SUBSTRING_INDEX(SUBSTRING_INDEX(string, delim, n), delim, -1)\n)$$\n\nDELIMITER $$\nCREATE DEFINER=`root`@`localhost` FUNCTION `substrCount` (`s` VARCHAR(255), `ss` VARCHAR(255)) RETURNS TINYINT(3) UNSIGNED DETERMINISTIC READS SQL DATA SQL SECURITY INVOKER BEGIN\nDECLARE COUNT TINYINT(3) UNSIGNED;\nDECLARE OFFSET_I TINYINT(3) UNSIGNED;\nDECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET s = NULL;\n\nSET COUNT = 0;\nSET OFFSET_I = 1;\n\nREPEAT\nIF NOT ISNULL(s) AND OFFSET_I > 0 THEN\nSET OFFSET_I = LOCATE(ss, s, OFFSET_I);\nIF OFFSET_I > 0 THEN\nSET COUNT = COUNT + 1;\nSET OFFSET_I = OFFSET_I + 1;\nEND IF;\nEND IF;\nUNTIL ISNULL(s) OR OFFSET_I = 0 END REPEAT;\n\nRETURN COUNT;\nEND$$\n\nDELIMITER ;\n\n", @@ -10212,8 +10214,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@8" @@ -10224,12 +10226,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@2" }, @@ -12837,9 +12839,7 @@ "last": 919 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateSchema.out b/tests/data/parser/parseCreateSchema.out index 0c3fd4fb9..e6c8b1969 100644 --- a/tests/data/parser/parseCreateSchema.out +++ b/tests/data/parser/parseCreateSchema.out @@ -2,6 +2,8 @@ "query": "CREATE DATABASE IF NOT EXISTS pma DEFAULT CHARSET 'utf8';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE DATABASE IF NOT EXISTS pma DEFAULT CHARSET 'utf8';", "len": 57, "last": 57, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -223,9 +225,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateSchemaErr.out b/tests/data/parser/parseCreateSchemaErr.out index b3cf5cba1..3df559e12 100644 --- a/tests/data/parser/parseCreateSchemaErr.out +++ b/tests/data/parser/parseCreateSchemaErr.out @@ -2,6 +2,8 @@ "query": "CREATE SCHEMA IF NOT EXISTS pma ENGINE='InnoDB' DEFAULT CHARSET 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE SCHEMA IF NOT EXISTS pma ENGINE='InnoDB' DEFAULT CHARSET 'utf8'", "len": 70, "last": 70, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -201,12 +203,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -251,9 +253,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable.out b/tests/data/parser/parseCreateTable.out index a3841a8d6..bbd9f6b48 100644 --- a/tests/data/parser/parseCreateTable.out +++ b/tests/data/parser/parseCreateTable.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE IF NOT EXISTS users (\n `id` INT NOT NULL AUTO_INCREMENT,\n username VARCHAR(64) NULL,\n `password` VARCHAR(256) DEFAULT '123456',\n CONSTRAINT pk_id PRIMARY KEY (`id`),\n UNIQUE (username)\n) ENGINE=InnoDB;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE IF NOT EXISTS users (\n `id` INT NOT NULL AUTO_INCREMENT,\n username VARCHAR(64) NULL,\n `password` VARCHAR(256) DEFAULT '123456',\n CONSTRAINT pk_id PRIMARY KEY (`id`),\n UNIQUE (username)\n) ENGINE=InnoDB;", "len": 229, "last": 229, @@ -732,8 +734,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@73" @@ -744,12 +746,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -936,9 +938,7 @@ "last": 63 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable10.out b/tests/data/parser/parseCreateTable10.out index 22853d58a..07506f7ed 100644 --- a/tests/data/parser/parseCreateTable10.out +++ b/tests/data/parser/parseCreateTable10.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `trips2` (\n `id` bigint(20) UNSIGNED NOT NULL PRIMARY KEY COMMENT 'Unique trip Id',\n `trip_code` int(11) UNSIGNED NOT NULL COMMENT 'Trip code',\n `trip_category` int(11) UNSIGNED NOT NULL COMMENT 'Trip category',\n `trip_date` date NOT NULL COMMENT 'The trip date'\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'The trips';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `trips2` (\n `id` bigint(20) UNSIGNED NOT NULL PRIMARY KEY COMMENT 'Unique trip Id',\n `trip_code` int(11) UNSIGNED NOT NULL COMMENT 'Trip code',\n `trip_category` int(11) UNSIGNED NOT NULL COMMENT 'Trip category',\n `trip_date` date NOT NULL COMMENT 'The trip date'\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'The trips';", "len": 383, "last": 383, @@ -1062,8 +1064,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@103" @@ -1074,12 +1076,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1278,9 +1280,7 @@ "last": 93 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable11.out b/tests/data/parser/parseCreateTable11.out index 2a738da1b..dc7705e70 100644 --- a/tests/data/parser/parseCreateTable11.out +++ b/tests/data/parser/parseCreateTable11.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `trips` (\n `id` bigint(20) UNSIGNED NOT NULL COMMENT 'Unique trip Id',\n `trip_category` int(11) UNSIGNED NOT NULL COMMENT 'Trip category',\n `trip_month` int(11) UNSIGNED NOT NULL COMMENT 'Trip month',\n `trip_date` date NOT NULL COMMENT 'The trip date'\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'The trips'\nPARTITION BY RANGE(trip_month) SUBPARTITION BY HASH(DAY(trip_date)) (\n PARTITION p_month_Jan\n VALUES\n LESS THAN (0) (\n SUBPARTITION p_month_Jan_day_0,\n SUBPARTITION p_month_Jan_day_1,\n SUBPARTITION p_month_Jan_day_2,\n SUBPARTITION p_month_Jan_day_3,\n SUBPARTITION p_month_Jan_day_4,\n SUBPARTITION p_month_Jan_day_5,\n SUBPARTITION p_month_Jan_day_6,\n SUBPARTITION p_month_Jan_day_7,\n SUBPARTITION p_month_Jan_day_8,\n SUBPARTITION p_month_Jan_day_9,\n SUBPARTITION p_month_Jan_day_10,\n SUBPARTITION p_month_Jan_day_11,\n SUBPARTITION p_month_Jan_day_12,\n SUBPARTITION p_month_Jan_day_13,\n SUBPARTITION p_month_Jan_day_14,\n SUBPARTITION p_month_Jan_day_15,\n SUBPARTITION p_month_Jan_day_16,\n SUBPARTITION p_month_Jan_day_17,\n SUBPARTITION p_month_Jan_day_18,\n SUBPARTITION p_month_Jan_day_19,\n SUBPARTITION p_month_Jan_day_20,\n SUBPARTITION p_month_Jan_day_21,\n SUBPARTITION p_month_Jan_day_22,\n SUBPARTITION p_month_Jan_day_23,\n SUBPARTITION p_month_Jan_day_24,\n SUBPARTITION p_month_Jan_day_25,\n SUBPARTITION p_month_Jan_day_26,\n SUBPARTITION p_month_Jan_day_27,\n SUBPARTITION p_month_Jan_day_28,\n SUBPARTITION p_month_Jan_day_29,\n SUBPARTITION p_month_Jan_day_30,\n SUBPARTITION p_month_Jan_day_31\n ),\n PARTITION p_month_Feb\n VALUES\n LESS THAN (1) (\n SUBPARTITION p_month_Feb_day_0,\n SUBPARTITION p_month_Feb_day_1,\n SUBPARTITION p_month_Feb_day_2,\n SUBPARTITION p_month_Feb_day_3,\n SUBPARTITION p_month_Feb_day_4,\n SUBPARTITION p_month_Feb_day_5,\n SUBPARTITION p_month_Feb_day_6,\n SUBPARTITION p_month_Feb_day_7,\n SUBPARTITION p_month_Feb_day_8,\n SUBPARTITION p_month_Feb_day_9,\n SUBPARTITION p_month_Feb_day_10,\n SUBPARTITION p_month_Feb_day_11,\n SUBPARTITION p_month_Feb_day_12,\n SUBPARTITION p_month_Feb_day_13,\n SUBPARTITION p_month_Feb_day_14,\n SUBPARTITION p_month_Feb_day_15,\n SUBPARTITION p_month_Feb_day_16,\n SUBPARTITION p_month_Feb_day_17,\n SUBPARTITION p_month_Feb_day_18,\n SUBPARTITION p_month_Feb_day_19,\n SUBPARTITION p_month_Feb_day_20,\n SUBPARTITION p_month_Feb_day_21,\n SUBPARTITION p_month_Feb_day_22,\n SUBPARTITION p_month_Feb_day_23,\n SUBPARTITION p_month_Feb_day_24,\n SUBPARTITION p_month_Feb_day_25,\n SUBPARTITION p_month_Feb_day_26,\n SUBPARTITION p_month_Feb_day_27,\n SUBPARTITION p_month_Feb_day_28,\n SUBPARTITION p_month_Feb_day_29,\n SUBPARTITION p_month_Feb_day_30,\n SUBPARTITION p_month_Feb_day_31\n ),\n PARTITION p_month_Mar\n VALUES\n LESS THAN (2) (\n SUBPARTITION p_month_Mar_day_0,\n SUBPARTITION p_month_Mar_day_1,\n SUBPARTITION p_month_Mar_day_2,\n SUBPARTITION p_month_Mar_day_3,\n SUBPARTITION p_month_Mar_day_4,\n SUBPARTITION p_month_Mar_day_5,\n SUBPARTITION p_month_Mar_day_6,\n SUBPARTITION p_month_Mar_day_7,\n SUBPARTITION p_month_Mar_day_8,\n SUBPARTITION p_month_Mar_day_9,\n SUBPARTITION p_month_Mar_day_10,\n SUBPARTITION p_month_Mar_day_11,\n SUBPARTITION p_month_Mar_day_12,\n SUBPARTITION p_month_Mar_day_13,\n SUBPARTITION p_month_Mar_day_14,\n SUBPARTITION p_month_Mar_day_15,\n SUBPARTITION p_month_Mar_day_16,\n SUBPARTITION p_month_Mar_day_17,\n SUBPARTITION p_month_Mar_day_18,\n SUBPARTITION p_month_Mar_day_19,\n SUBPARTITION p_month_Mar_day_20,\n SUBPARTITION p_month_Mar_day_21,\n SUBPARTITION p_month_Mar_day_22,\n SUBPARTITION p_month_Mar_day_23,\n SUBPARTITION p_month_Mar_day_24,\n SUBPARTITION p_month_Mar_day_25,\n SUBPARTITION p_month_Mar_day_26,\n SUBPARTITION p_month_Mar_day_27,\n SUBPARTITION p_month_Mar_day_28,\n SUBPARTITION p_month_Mar_day_29,\n SUBPARTITION p_month_Mar_day_30,\n SUBPARTITION p_month_Mar_day_31\n ),\n PARTITION p_month_Apr\n VALUES\n LESS THAN (3) (\n SUBPARTITION p_month_Apr_day_0,\n SUBPARTITION p_month_Apr_day_1,\n SUBPARTITION p_month_Apr_day_2,\n SUBPARTITION p_month_Apr_day_3,\n SUBPARTITION p_month_Apr_day_4,\n SUBPARTITION p_month_Apr_day_5,\n SUBPARTITION p_month_Apr_day_6,\n SUBPARTITION p_month_Apr_day_7,\n SUBPARTITION p_month_Apr_day_8,\n SUBPARTITION p_month_Apr_day_9,\n SUBPARTITION p_month_Apr_day_10,\n SUBPARTITION p_month_Apr_day_11,\n SUBPARTITION p_month_Apr_day_12,\n SUBPARTITION p_month_Apr_day_13,\n SUBPARTITION p_month_Apr_day_14,\n SUBPARTITION p_month_Apr_day_15,\n SUBPARTITION p_month_Apr_day_16,\n SUBPARTITION p_month_Apr_day_17,\n SUBPARTITION p_month_Apr_day_18,\n SUBPARTITION p_month_Apr_day_19,\n SUBPARTITION p_month_Apr_day_20,\n SUBPARTITION p_month_Apr_day_21,\n SUBPARTITION p_month_Apr_day_22,\n SUBPARTITION p_month_Apr_day_23,\n SUBPARTITION p_month_Apr_day_24,\n SUBPARTITION p_month_Apr_day_25,\n SUBPARTITION p_month_Apr_day_26,\n SUBPARTITION p_month_Apr_day_27,\n SUBPARTITION p_month_Apr_day_28,\n SUBPARTITION p_month_Apr_day_29,\n SUBPARTITION p_month_Apr_day_30,\n SUBPARTITION p_month_Apr_day_31\n ),\n PARTITION p_month_Mai\n VALUES\n LESS THAN (4) (\n SUBPARTITION p_month_Mai_day_0,\n SUBPARTITION p_month_Mai_day_1,\n SUBPARTITION p_month_Mai_day_2,\n SUBPARTITION p_month_Mai_day_3,\n SUBPARTITION p_month_Mai_day_4,\n SUBPARTITION p_month_Mai_day_5,\n SUBPARTITION p_month_Mai_day_6,\n SUBPARTITION p_month_Mai_day_7,\n SUBPARTITION p_month_Mai_day_8,\n SUBPARTITION p_month_Mai_day_9,\n SUBPARTITION p_month_Mai_day_10,\n SUBPARTITION p_month_Mai_day_11,\n SUBPARTITION p_month_Mai_day_12,\n SUBPARTITION p_month_Mai_day_13,\n SUBPARTITION p_month_Mai_day_14,\n SUBPARTITION p_month_Mai_day_15,\n SUBPARTITION p_month_Mai_day_16,\n SUBPARTITION p_month_Mai_day_17,\n SUBPARTITION p_month_Mai_day_18,\n SUBPARTITION p_month_Mai_day_19,\n SUBPARTITION p_month_Mai_day_20,\n SUBPARTITION p_month_Mai_day_21,\n SUBPARTITION p_month_Mai_day_22,\n SUBPARTITION p_month_Mai_day_23,\n SUBPARTITION p_month_Mai_day_24,\n SUBPARTITION p_month_Mai_day_25,\n SUBPARTITION p_month_Mai_day_26,\n SUBPARTITION p_month_Mai_day_27,\n SUBPARTITION p_month_Mai_day_28,\n SUBPARTITION p_month_Mai_day_29,\n SUBPARTITION p_month_Mai_day_30,\n SUBPARTITION p_month_Mai_day_31\n ),\n PARTITION p_month_Jun\n VALUES\n LESS THAN (5) (\n SUBPARTITION p_month_Jun_day_0,\n SUBPARTITION p_month_Jun_day_1,\n SUBPARTITION p_month_Jun_day_2,\n SUBPARTITION p_month_Jun_day_3,\n SUBPARTITION p_month_Jun_day_4,\n SUBPARTITION p_month_Jun_day_5,\n SUBPARTITION p_month_Jun_day_6,\n SUBPARTITION p_month_Jun_day_7,\n SUBPARTITION p_month_Jun_day_8,\n SUBPARTITION p_month_Jun_day_9,\n SUBPARTITION p_month_Jun_day_10,\n SUBPARTITION p_month_Jun_day_11,\n SUBPARTITION p_month_Jun_day_12,\n SUBPARTITION p_month_Jun_day_13,\n SUBPARTITION p_month_Jun_day_14,\n SUBPARTITION p_month_Jun_day_15,\n SUBPARTITION p_month_Jun_day_16,\n SUBPARTITION p_month_Jun_day_17,\n SUBPARTITION p_month_Jun_day_18,\n SUBPARTITION p_month_Jun_day_19,\n SUBPARTITION p_month_Jun_day_20,\n SUBPARTITION p_month_Jun_day_21,\n SUBPARTITION p_month_Jun_day_22,\n SUBPARTITION p_month_Jun_day_23,\n SUBPARTITION p_month_Jun_day_24,\n SUBPARTITION p_month_Jun_day_25,\n SUBPARTITION p_month_Jun_day_26,\n SUBPARTITION p_month_Jun_day_27,\n SUBPARTITION p_month_Jun_day_28,\n SUBPARTITION p_month_Jun_day_29,\n SUBPARTITION p_month_Jun_day_30,\n SUBPARTITION p_month_Jun_day_31\n ),\n PARTITION p_month_Jul\n VALUES\n LESS THAN (6) (\n SUBPARTITION p_month_Jul_day_0,\n SUBPARTITION p_month_Jul_day_1,\n SUBPARTITION p_month_Jul_day_2,\n SUBPARTITION p_month_Jul_day_3,\n SUBPARTITION p_month_Jul_day_4,\n SUBPARTITION p_month_Jul_day_5,\n SUBPARTITION p_month_Jul_day_6,\n SUBPARTITION p_month_Jul_day_7,\n SUBPARTITION p_month_Jul_day_8,\n SUBPARTITION p_month_Jul_day_9,\n SUBPARTITION p_month_Jul_day_10,\n SUBPARTITION p_month_Jul_day_11,\n SUBPARTITION p_month_Jul_day_12,\n SUBPARTITION p_month_Jul_day_13,\n SUBPARTITION p_month_Jul_day_14,\n SUBPARTITION p_month_Jul_day_15,\n SUBPARTITION p_month_Jul_day_16,\n SUBPARTITION p_month_Jul_day_17,\n SUBPARTITION p_month_Jul_day_18,\n SUBPARTITION p_month_Jul_day_19,\n SUBPARTITION p_month_Jul_day_20,\n SUBPARTITION p_month_Jul_day_21,\n SUBPARTITION p_month_Jul_day_22,\n SUBPARTITION p_month_Jul_day_23,\n SUBPARTITION p_month_Jul_day_24,\n SUBPARTITION p_month_Jul_day_25,\n SUBPARTITION p_month_Jul_day_26,\n SUBPARTITION p_month_Jul_day_27,\n SUBPARTITION p_month_Jul_day_28,\n SUBPARTITION p_month_Jul_day_29,\n SUBPARTITION p_month_Jul_day_30,\n SUBPARTITION p_month_Jul_day_31\n ),\n PARTITION p_month_Aug\n VALUES\n LESS THAN (7) (\n SUBPARTITION p_month_Aug_day_0,\n SUBPARTITION p_month_Aug_day_1,\n SUBPARTITION p_month_Aug_day_2,\n SUBPARTITION p_month_Aug_day_3,\n SUBPARTITION p_month_Aug_day_4,\n SUBPARTITION p_month_Aug_day_5,\n SUBPARTITION p_month_Aug_day_6,\n SUBPARTITION p_month_Aug_day_7,\n SUBPARTITION p_month_Aug_day_8,\n SUBPARTITION p_month_Aug_day_9,\n SUBPARTITION p_month_Aug_day_10,\n SUBPARTITION p_month_Aug_day_11,\n SUBPARTITION p_month_Aug_day_12,\n SUBPARTITION p_month_Aug_day_13,\n SUBPARTITION p_month_Aug_day_14,\n SUBPARTITION p_month_Aug_day_15,\n SUBPARTITION p_month_Aug_day_16,\n SUBPARTITION p_month_Aug_day_17,\n SUBPARTITION p_month_Aug_day_18,\n SUBPARTITION p_month_Aug_day_19,\n SUBPARTITION p_month_Aug_day_20,\n SUBPARTITION p_month_Aug_day_21,\n SUBPARTITION p_month_Aug_day_22,\n SUBPARTITION p_month_Aug_day_23,\n SUBPARTITION p_month_Aug_day_24,\n SUBPARTITION p_month_Aug_day_25,\n SUBPARTITION p_month_Aug_day_26,\n SUBPARTITION p_month_Aug_day_27,\n SUBPARTITION p_month_Aug_day_28,\n SUBPARTITION p_month_Aug_day_29,\n SUBPARTITION p_month_Aug_day_30,\n SUBPARTITION p_month_Aug_day_31\n ),\n PARTITION p_month_Sep\n VALUES\n LESS THAN (8) (\n SUBPARTITION p_month_Sep_day_0,\n SUBPARTITION p_month_Sep_day_1,\n SUBPARTITION p_month_Sep_day_2,\n SUBPARTITION p_month_Sep_day_3,\n SUBPARTITION p_month_Sep_day_4,\n SUBPARTITION p_month_Sep_day_5,\n SUBPARTITION p_month_Sep_day_6,\n SUBPARTITION p_month_Sep_day_7,\n SUBPARTITION p_month_Sep_day_8,\n SUBPARTITION p_month_Sep_day_9,\n SUBPARTITION p_month_Sep_day_10,\n SUBPARTITION p_month_Sep_day_11,\n SUBPARTITION p_month_Sep_day_12,\n SUBPARTITION p_month_Sep_day_13,\n SUBPARTITION p_month_Sep_day_14,\n SUBPARTITION p_month_Sep_day_15,\n SUBPARTITION p_month_Sep_day_16,\n SUBPARTITION p_month_Sep_day_17,\n SUBPARTITION p_month_Sep_day_18,\n SUBPARTITION p_month_Sep_day_19,\n SUBPARTITION p_month_Sep_day_20,\n SUBPARTITION p_month_Sep_day_21,\n SUBPARTITION p_month_Sep_day_22,\n SUBPARTITION p_month_Sep_day_23,\n SUBPARTITION p_month_Sep_day_24,\n SUBPARTITION p_month_Sep_day_25,\n SUBPARTITION p_month_Sep_day_26,\n SUBPARTITION p_month_Sep_day_27,\n SUBPARTITION p_month_Sep_day_28,\n SUBPARTITION p_month_Sep_day_29,\n SUBPARTITION p_month_Sep_day_30,\n SUBPARTITION p_month_Sep_day_31\n ),\n PARTITION p_month_Oct\n VALUES\n LESS THAN (9) (\n SUBPARTITION p_month_Oct_day_0,\n SUBPARTITION p_month_Oct_day_1,\n SUBPARTITION p_month_Oct_day_2,\n SUBPARTITION p_month_Oct_day_3,\n SUBPARTITION p_month_Oct_day_4,\n SUBPARTITION p_month_Oct_day_5,\n SUBPARTITION p_month_Oct_day_6,\n SUBPARTITION p_month_Oct_day_7,\n SUBPARTITION p_month_Oct_day_8,\n SUBPARTITION p_month_Oct_day_9,\n SUBPARTITION p_month_Oct_day_10,\n SUBPARTITION p_month_Oct_day_11,\n SUBPARTITION p_month_Oct_day_12,\n SUBPARTITION p_month_Oct_day_13,\n SUBPARTITION p_month_Oct_day_14,\n SUBPARTITION p_month_Oct_day_15,\n SUBPARTITION p_month_Oct_day_16,\n SUBPARTITION p_month_Oct_day_17,\n SUBPARTITION p_month_Oct_day_18,\n SUBPARTITION p_month_Oct_day_19,\n SUBPARTITION p_month_Oct_day_20,\n SUBPARTITION p_month_Oct_day_21,\n SUBPARTITION p_month_Oct_day_22,\n SUBPARTITION p_month_Oct_day_23,\n SUBPARTITION p_month_Oct_day_24,\n SUBPARTITION p_month_Oct_day_25,\n SUBPARTITION p_month_Oct_day_26,\n SUBPARTITION p_month_Oct_day_27,\n SUBPARTITION p_month_Oct_day_28,\n SUBPARTITION p_month_Oct_day_29,\n SUBPARTITION p_month_Oct_day_30,\n SUBPARTITION p_month_Oct_day_31\n ),\n PARTITION p_month_Nov\n VALUES\n LESS THAN (10) (\n SUBPARTITION p_month_Nov_day_0,\n SUBPARTITION p_month_Nov_day_1,\n SUBPARTITION p_month_Nov_day_2,\n SUBPARTITION p_month_Nov_day_3,\n SUBPARTITION p_month_Nov_day_4,\n SUBPARTITION p_month_Nov_day_5,\n SUBPARTITION p_month_Nov_day_6,\n SUBPARTITION p_month_Nov_day_7,\n SUBPARTITION p_month_Nov_day_8,\n SUBPARTITION p_month_Nov_day_9,\n SUBPARTITION p_month_Nov_day_10,\n SUBPARTITION p_month_Nov_day_11,\n SUBPARTITION p_month_Nov_day_12,\n SUBPARTITION p_month_Nov_day_13,\n SUBPARTITION p_month_Nov_day_14,\n SUBPARTITION p_month_Nov_day_15,\n SUBPARTITION p_month_Nov_day_16,\n SUBPARTITION p_month_Nov_day_17,\n SUBPARTITION p_month_Nov_day_18,\n SUBPARTITION p_month_Nov_day_19,\n SUBPARTITION p_month_Nov_day_20,\n SUBPARTITION p_month_Nov_day_21,\n SUBPARTITION p_month_Nov_day_22,\n SUBPARTITION p_month_Nov_day_23,\n SUBPARTITION p_month_Nov_day_24,\n SUBPARTITION p_month_Nov_day_25,\n SUBPARTITION p_month_Nov_day_26,\n SUBPARTITION p_month_Nov_day_27,\n SUBPARTITION p_month_Nov_day_28,\n SUBPARTITION p_month_Nov_day_29,\n SUBPARTITION p_month_Nov_day_30,\n SUBPARTITION p_month_Nov_day_31\n ),\n PARTITION p_month_Dec\n VALUES\n LESS THAN (11) (\n SUBPARTITION p_month_Dec_day_0,\n SUBPARTITION p_month_Dec_day_1,\n SUBPARTITION p_month_Dec_day_2,\n SUBPARTITION p_month_Dec_day_3,\n SUBPARTITION p_month_Dec_day_4,\n SUBPARTITION p_month_Dec_day_5,\n SUBPARTITION p_month_Dec_day_6,\n SUBPARTITION p_month_Dec_day_7,\n SUBPARTITION p_month_Dec_day_8,\n SUBPARTITION p_month_Dec_day_9,\n SUBPARTITION p_month_Dec_day_10,\n SUBPARTITION p_month_Dec_day_11,\n SUBPARTITION p_month_Dec_day_12,\n SUBPARTITION p_month_Dec_day_13,\n SUBPARTITION p_month_Dec_day_14,\n SUBPARTITION p_month_Dec_day_15,\n SUBPARTITION p_month_Dec_day_16,\n SUBPARTITION p_month_Dec_day_17,\n SUBPARTITION p_month_Dec_day_18,\n SUBPARTITION p_month_Dec_day_19,\n SUBPARTITION p_month_Dec_day_20,\n SUBPARTITION p_month_Dec_day_21,\n SUBPARTITION p_month_Dec_day_22,\n SUBPARTITION p_month_Dec_day_23,\n SUBPARTITION p_month_Dec_day_24,\n SUBPARTITION p_month_Dec_day_25,\n SUBPARTITION p_month_Dec_day_26,\n SUBPARTITION p_month_Dec_day_27,\n SUBPARTITION p_month_Dec_day_28,\n SUBPARTITION p_month_Dec_day_29,\n SUBPARTITION p_month_Dec_day_30,\n SUBPARTITION p_month_Dec_day_31\n )\n)", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `trips` (\n `id` bigint(20) UNSIGNED NOT NULL COMMENT 'Unique trip Id',\n `trip_category` int(11) UNSIGNED NOT NULL COMMENT 'Trip category',\n `trip_month` int(11) UNSIGNED NOT NULL COMMENT 'Trip month',\n `trip_date` date NOT NULL COMMENT 'The trip date'\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'The trips'\nPARTITION BY RANGE(trip_month) SUBPARTITION BY HASH(DAY(trip_date)) (\n PARTITION p_month_Jan\n VALUES\n LESS THAN (0) (\n SUBPARTITION p_month_Jan_day_0,\n SUBPARTITION p_month_Jan_day_1,\n SUBPARTITION p_month_Jan_day_2,\n SUBPARTITION p_month_Jan_day_3,\n SUBPARTITION p_month_Jan_day_4,\n SUBPARTITION p_month_Jan_day_5,\n SUBPARTITION p_month_Jan_day_6,\n SUBPARTITION p_month_Jan_day_7,\n SUBPARTITION p_month_Jan_day_8,\n SUBPARTITION p_month_Jan_day_9,\n SUBPARTITION p_month_Jan_day_10,\n SUBPARTITION p_month_Jan_day_11,\n SUBPARTITION p_month_Jan_day_12,\n SUBPARTITION p_month_Jan_day_13,\n SUBPARTITION p_month_Jan_day_14,\n SUBPARTITION p_month_Jan_day_15,\n SUBPARTITION p_month_Jan_day_16,\n SUBPARTITION p_month_Jan_day_17,\n SUBPARTITION p_month_Jan_day_18,\n SUBPARTITION p_month_Jan_day_19,\n SUBPARTITION p_month_Jan_day_20,\n SUBPARTITION p_month_Jan_day_21,\n SUBPARTITION p_month_Jan_day_22,\n SUBPARTITION p_month_Jan_day_23,\n SUBPARTITION p_month_Jan_day_24,\n SUBPARTITION p_month_Jan_day_25,\n SUBPARTITION p_month_Jan_day_26,\n SUBPARTITION p_month_Jan_day_27,\n SUBPARTITION p_month_Jan_day_28,\n SUBPARTITION p_month_Jan_day_29,\n SUBPARTITION p_month_Jan_day_30,\n SUBPARTITION p_month_Jan_day_31\n ),\n PARTITION p_month_Feb\n VALUES\n LESS THAN (1) (\n SUBPARTITION p_month_Feb_day_0,\n SUBPARTITION p_month_Feb_day_1,\n SUBPARTITION p_month_Feb_day_2,\n SUBPARTITION p_month_Feb_day_3,\n SUBPARTITION p_month_Feb_day_4,\n SUBPARTITION p_month_Feb_day_5,\n SUBPARTITION p_month_Feb_day_6,\n SUBPARTITION p_month_Feb_day_7,\n SUBPARTITION p_month_Feb_day_8,\n SUBPARTITION p_month_Feb_day_9,\n SUBPARTITION p_month_Feb_day_10,\n SUBPARTITION p_month_Feb_day_11,\n SUBPARTITION p_month_Feb_day_12,\n SUBPARTITION p_month_Feb_day_13,\n SUBPARTITION p_month_Feb_day_14,\n SUBPARTITION p_month_Feb_day_15,\n SUBPARTITION p_month_Feb_day_16,\n SUBPARTITION p_month_Feb_day_17,\n SUBPARTITION p_month_Feb_day_18,\n SUBPARTITION p_month_Feb_day_19,\n SUBPARTITION p_month_Feb_day_20,\n SUBPARTITION p_month_Feb_day_21,\n SUBPARTITION p_month_Feb_day_22,\n SUBPARTITION p_month_Feb_day_23,\n SUBPARTITION p_month_Feb_day_24,\n SUBPARTITION p_month_Feb_day_25,\n SUBPARTITION p_month_Feb_day_26,\n SUBPARTITION p_month_Feb_day_27,\n SUBPARTITION p_month_Feb_day_28,\n SUBPARTITION p_month_Feb_day_29,\n SUBPARTITION p_month_Feb_day_30,\n SUBPARTITION p_month_Feb_day_31\n ),\n PARTITION p_month_Mar\n VALUES\n LESS THAN (2) (\n SUBPARTITION p_month_Mar_day_0,\n SUBPARTITION p_month_Mar_day_1,\n SUBPARTITION p_month_Mar_day_2,\n SUBPARTITION p_month_Mar_day_3,\n SUBPARTITION p_month_Mar_day_4,\n SUBPARTITION p_month_Mar_day_5,\n SUBPARTITION p_month_Mar_day_6,\n SUBPARTITION p_month_Mar_day_7,\n SUBPARTITION p_month_Mar_day_8,\n SUBPARTITION p_month_Mar_day_9,\n SUBPARTITION p_month_Mar_day_10,\n SUBPARTITION p_month_Mar_day_11,\n SUBPARTITION p_month_Mar_day_12,\n SUBPARTITION p_month_Mar_day_13,\n SUBPARTITION p_month_Mar_day_14,\n SUBPARTITION p_month_Mar_day_15,\n SUBPARTITION p_month_Mar_day_16,\n SUBPARTITION p_month_Mar_day_17,\n SUBPARTITION p_month_Mar_day_18,\n SUBPARTITION p_month_Mar_day_19,\n SUBPARTITION p_month_Mar_day_20,\n SUBPARTITION p_month_Mar_day_21,\n SUBPARTITION p_month_Mar_day_22,\n SUBPARTITION p_month_Mar_day_23,\n SUBPARTITION p_month_Mar_day_24,\n SUBPARTITION p_month_Mar_day_25,\n SUBPARTITION p_month_Mar_day_26,\n SUBPARTITION p_month_Mar_day_27,\n SUBPARTITION p_month_Mar_day_28,\n SUBPARTITION p_month_Mar_day_29,\n SUBPARTITION p_month_Mar_day_30,\n SUBPARTITION p_month_Mar_day_31\n ),\n PARTITION p_month_Apr\n VALUES\n LESS THAN (3) (\n SUBPARTITION p_month_Apr_day_0,\n SUBPARTITION p_month_Apr_day_1,\n SUBPARTITION p_month_Apr_day_2,\n SUBPARTITION p_month_Apr_day_3,\n SUBPARTITION p_month_Apr_day_4,\n SUBPARTITION p_month_Apr_day_5,\n SUBPARTITION p_month_Apr_day_6,\n SUBPARTITION p_month_Apr_day_7,\n SUBPARTITION p_month_Apr_day_8,\n SUBPARTITION p_month_Apr_day_9,\n SUBPARTITION p_month_Apr_day_10,\n SUBPARTITION p_month_Apr_day_11,\n SUBPARTITION p_month_Apr_day_12,\n SUBPARTITION p_month_Apr_day_13,\n SUBPARTITION p_month_Apr_day_14,\n SUBPARTITION p_month_Apr_day_15,\n SUBPARTITION p_month_Apr_day_16,\n SUBPARTITION p_month_Apr_day_17,\n SUBPARTITION p_month_Apr_day_18,\n SUBPARTITION p_month_Apr_day_19,\n SUBPARTITION p_month_Apr_day_20,\n SUBPARTITION p_month_Apr_day_21,\n SUBPARTITION p_month_Apr_day_22,\n SUBPARTITION p_month_Apr_day_23,\n SUBPARTITION p_month_Apr_day_24,\n SUBPARTITION p_month_Apr_day_25,\n SUBPARTITION p_month_Apr_day_26,\n SUBPARTITION p_month_Apr_day_27,\n SUBPARTITION p_month_Apr_day_28,\n SUBPARTITION p_month_Apr_day_29,\n SUBPARTITION p_month_Apr_day_30,\n SUBPARTITION p_month_Apr_day_31\n ),\n PARTITION p_month_Mai\n VALUES\n LESS THAN (4) (\n SUBPARTITION p_month_Mai_day_0,\n SUBPARTITION p_month_Mai_day_1,\n SUBPARTITION p_month_Mai_day_2,\n SUBPARTITION p_month_Mai_day_3,\n SUBPARTITION p_month_Mai_day_4,\n SUBPARTITION p_month_Mai_day_5,\n SUBPARTITION p_month_Mai_day_6,\n SUBPARTITION p_month_Mai_day_7,\n SUBPARTITION p_month_Mai_day_8,\n SUBPARTITION p_month_Mai_day_9,\n SUBPARTITION p_month_Mai_day_10,\n SUBPARTITION p_month_Mai_day_11,\n SUBPARTITION p_month_Mai_day_12,\n SUBPARTITION p_month_Mai_day_13,\n SUBPARTITION p_month_Mai_day_14,\n SUBPARTITION p_month_Mai_day_15,\n SUBPARTITION p_month_Mai_day_16,\n SUBPARTITION p_month_Mai_day_17,\n SUBPARTITION p_month_Mai_day_18,\n SUBPARTITION p_month_Mai_day_19,\n SUBPARTITION p_month_Mai_day_20,\n SUBPARTITION p_month_Mai_day_21,\n SUBPARTITION p_month_Mai_day_22,\n SUBPARTITION p_month_Mai_day_23,\n SUBPARTITION p_month_Mai_day_24,\n SUBPARTITION p_month_Mai_day_25,\n SUBPARTITION p_month_Mai_day_26,\n SUBPARTITION p_month_Mai_day_27,\n SUBPARTITION p_month_Mai_day_28,\n SUBPARTITION p_month_Mai_day_29,\n SUBPARTITION p_month_Mai_day_30,\n SUBPARTITION p_month_Mai_day_31\n ),\n PARTITION p_month_Jun\n VALUES\n LESS THAN (5) (\n SUBPARTITION p_month_Jun_day_0,\n SUBPARTITION p_month_Jun_day_1,\n SUBPARTITION p_month_Jun_day_2,\n SUBPARTITION p_month_Jun_day_3,\n SUBPARTITION p_month_Jun_day_4,\n SUBPARTITION p_month_Jun_day_5,\n SUBPARTITION p_month_Jun_day_6,\n SUBPARTITION p_month_Jun_day_7,\n SUBPARTITION p_month_Jun_day_8,\n SUBPARTITION p_month_Jun_day_9,\n SUBPARTITION p_month_Jun_day_10,\n SUBPARTITION p_month_Jun_day_11,\n SUBPARTITION p_month_Jun_day_12,\n SUBPARTITION p_month_Jun_day_13,\n SUBPARTITION p_month_Jun_day_14,\n SUBPARTITION p_month_Jun_day_15,\n SUBPARTITION p_month_Jun_day_16,\n SUBPARTITION p_month_Jun_day_17,\n SUBPARTITION p_month_Jun_day_18,\n SUBPARTITION p_month_Jun_day_19,\n SUBPARTITION p_month_Jun_day_20,\n SUBPARTITION p_month_Jun_day_21,\n SUBPARTITION p_month_Jun_day_22,\n SUBPARTITION p_month_Jun_day_23,\n SUBPARTITION p_month_Jun_day_24,\n SUBPARTITION p_month_Jun_day_25,\n SUBPARTITION p_month_Jun_day_26,\n SUBPARTITION p_month_Jun_day_27,\n SUBPARTITION p_month_Jun_day_28,\n SUBPARTITION p_month_Jun_day_29,\n SUBPARTITION p_month_Jun_day_30,\n SUBPARTITION p_month_Jun_day_31\n ),\n PARTITION p_month_Jul\n VALUES\n LESS THAN (6) (\n SUBPARTITION p_month_Jul_day_0,\n SUBPARTITION p_month_Jul_day_1,\n SUBPARTITION p_month_Jul_day_2,\n SUBPARTITION p_month_Jul_day_3,\n SUBPARTITION p_month_Jul_day_4,\n SUBPARTITION p_month_Jul_day_5,\n SUBPARTITION p_month_Jul_day_6,\n SUBPARTITION p_month_Jul_day_7,\n SUBPARTITION p_month_Jul_day_8,\n SUBPARTITION p_month_Jul_day_9,\n SUBPARTITION p_month_Jul_day_10,\n SUBPARTITION p_month_Jul_day_11,\n SUBPARTITION p_month_Jul_day_12,\n SUBPARTITION p_month_Jul_day_13,\n SUBPARTITION p_month_Jul_day_14,\n SUBPARTITION p_month_Jul_day_15,\n SUBPARTITION p_month_Jul_day_16,\n SUBPARTITION p_month_Jul_day_17,\n SUBPARTITION p_month_Jul_day_18,\n SUBPARTITION p_month_Jul_day_19,\n SUBPARTITION p_month_Jul_day_20,\n SUBPARTITION p_month_Jul_day_21,\n SUBPARTITION p_month_Jul_day_22,\n SUBPARTITION p_month_Jul_day_23,\n SUBPARTITION p_month_Jul_day_24,\n SUBPARTITION p_month_Jul_day_25,\n SUBPARTITION p_month_Jul_day_26,\n SUBPARTITION p_month_Jul_day_27,\n SUBPARTITION p_month_Jul_day_28,\n SUBPARTITION p_month_Jul_day_29,\n SUBPARTITION p_month_Jul_day_30,\n SUBPARTITION p_month_Jul_day_31\n ),\n PARTITION p_month_Aug\n VALUES\n LESS THAN (7) (\n SUBPARTITION p_month_Aug_day_0,\n SUBPARTITION p_month_Aug_day_1,\n SUBPARTITION p_month_Aug_day_2,\n SUBPARTITION p_month_Aug_day_3,\n SUBPARTITION p_month_Aug_day_4,\n SUBPARTITION p_month_Aug_day_5,\n SUBPARTITION p_month_Aug_day_6,\n SUBPARTITION p_month_Aug_day_7,\n SUBPARTITION p_month_Aug_day_8,\n SUBPARTITION p_month_Aug_day_9,\n SUBPARTITION p_month_Aug_day_10,\n SUBPARTITION p_month_Aug_day_11,\n SUBPARTITION p_month_Aug_day_12,\n SUBPARTITION p_month_Aug_day_13,\n SUBPARTITION p_month_Aug_day_14,\n SUBPARTITION p_month_Aug_day_15,\n SUBPARTITION p_month_Aug_day_16,\n SUBPARTITION p_month_Aug_day_17,\n SUBPARTITION p_month_Aug_day_18,\n SUBPARTITION p_month_Aug_day_19,\n SUBPARTITION p_month_Aug_day_20,\n SUBPARTITION p_month_Aug_day_21,\n SUBPARTITION p_month_Aug_day_22,\n SUBPARTITION p_month_Aug_day_23,\n SUBPARTITION p_month_Aug_day_24,\n SUBPARTITION p_month_Aug_day_25,\n SUBPARTITION p_month_Aug_day_26,\n SUBPARTITION p_month_Aug_day_27,\n SUBPARTITION p_month_Aug_day_28,\n SUBPARTITION p_month_Aug_day_29,\n SUBPARTITION p_month_Aug_day_30,\n SUBPARTITION p_month_Aug_day_31\n ),\n PARTITION p_month_Sep\n VALUES\n LESS THAN (8) (\n SUBPARTITION p_month_Sep_day_0,\n SUBPARTITION p_month_Sep_day_1,\n SUBPARTITION p_month_Sep_day_2,\n SUBPARTITION p_month_Sep_day_3,\n SUBPARTITION p_month_Sep_day_4,\n SUBPARTITION p_month_Sep_day_5,\n SUBPARTITION p_month_Sep_day_6,\n SUBPARTITION p_month_Sep_day_7,\n SUBPARTITION p_month_Sep_day_8,\n SUBPARTITION p_month_Sep_day_9,\n SUBPARTITION p_month_Sep_day_10,\n SUBPARTITION p_month_Sep_day_11,\n SUBPARTITION p_month_Sep_day_12,\n SUBPARTITION p_month_Sep_day_13,\n SUBPARTITION p_month_Sep_day_14,\n SUBPARTITION p_month_Sep_day_15,\n SUBPARTITION p_month_Sep_day_16,\n SUBPARTITION p_month_Sep_day_17,\n SUBPARTITION p_month_Sep_day_18,\n SUBPARTITION p_month_Sep_day_19,\n SUBPARTITION p_month_Sep_day_20,\n SUBPARTITION p_month_Sep_day_21,\n SUBPARTITION p_month_Sep_day_22,\n SUBPARTITION p_month_Sep_day_23,\n SUBPARTITION p_month_Sep_day_24,\n SUBPARTITION p_month_Sep_day_25,\n SUBPARTITION p_month_Sep_day_26,\n SUBPARTITION p_month_Sep_day_27,\n SUBPARTITION p_month_Sep_day_28,\n SUBPARTITION p_month_Sep_day_29,\n SUBPARTITION p_month_Sep_day_30,\n SUBPARTITION p_month_Sep_day_31\n ),\n PARTITION p_month_Oct\n VALUES\n LESS THAN (9) (\n SUBPARTITION p_month_Oct_day_0,\n SUBPARTITION p_month_Oct_day_1,\n SUBPARTITION p_month_Oct_day_2,\n SUBPARTITION p_month_Oct_day_3,\n SUBPARTITION p_month_Oct_day_4,\n SUBPARTITION p_month_Oct_day_5,\n SUBPARTITION p_month_Oct_day_6,\n SUBPARTITION p_month_Oct_day_7,\n SUBPARTITION p_month_Oct_day_8,\n SUBPARTITION p_month_Oct_day_9,\n SUBPARTITION p_month_Oct_day_10,\n SUBPARTITION p_month_Oct_day_11,\n SUBPARTITION p_month_Oct_day_12,\n SUBPARTITION p_month_Oct_day_13,\n SUBPARTITION p_month_Oct_day_14,\n SUBPARTITION p_month_Oct_day_15,\n SUBPARTITION p_month_Oct_day_16,\n SUBPARTITION p_month_Oct_day_17,\n SUBPARTITION p_month_Oct_day_18,\n SUBPARTITION p_month_Oct_day_19,\n SUBPARTITION p_month_Oct_day_20,\n SUBPARTITION p_month_Oct_day_21,\n SUBPARTITION p_month_Oct_day_22,\n SUBPARTITION p_month_Oct_day_23,\n SUBPARTITION p_month_Oct_day_24,\n SUBPARTITION p_month_Oct_day_25,\n SUBPARTITION p_month_Oct_day_26,\n SUBPARTITION p_month_Oct_day_27,\n SUBPARTITION p_month_Oct_day_28,\n SUBPARTITION p_month_Oct_day_29,\n SUBPARTITION p_month_Oct_day_30,\n SUBPARTITION p_month_Oct_day_31\n ),\n PARTITION p_month_Nov\n VALUES\n LESS THAN (10) (\n SUBPARTITION p_month_Nov_day_0,\n SUBPARTITION p_month_Nov_day_1,\n SUBPARTITION p_month_Nov_day_2,\n SUBPARTITION p_month_Nov_day_3,\n SUBPARTITION p_month_Nov_day_4,\n SUBPARTITION p_month_Nov_day_5,\n SUBPARTITION p_month_Nov_day_6,\n SUBPARTITION p_month_Nov_day_7,\n SUBPARTITION p_month_Nov_day_8,\n SUBPARTITION p_month_Nov_day_9,\n SUBPARTITION p_month_Nov_day_10,\n SUBPARTITION p_month_Nov_day_11,\n SUBPARTITION p_month_Nov_day_12,\n SUBPARTITION p_month_Nov_day_13,\n SUBPARTITION p_month_Nov_day_14,\n SUBPARTITION p_month_Nov_day_15,\n SUBPARTITION p_month_Nov_day_16,\n SUBPARTITION p_month_Nov_day_17,\n SUBPARTITION p_month_Nov_day_18,\n SUBPARTITION p_month_Nov_day_19,\n SUBPARTITION p_month_Nov_day_20,\n SUBPARTITION p_month_Nov_day_21,\n SUBPARTITION p_month_Nov_day_22,\n SUBPARTITION p_month_Nov_day_23,\n SUBPARTITION p_month_Nov_day_24,\n SUBPARTITION p_month_Nov_day_25,\n SUBPARTITION p_month_Nov_day_26,\n SUBPARTITION p_month_Nov_day_27,\n SUBPARTITION p_month_Nov_day_28,\n SUBPARTITION p_month_Nov_day_29,\n SUBPARTITION p_month_Nov_day_30,\n SUBPARTITION p_month_Nov_day_31\n ),\n PARTITION p_month_Dec\n VALUES\n LESS THAN (11) (\n SUBPARTITION p_month_Dec_day_0,\n SUBPARTITION p_month_Dec_day_1,\n SUBPARTITION p_month_Dec_day_2,\n SUBPARTITION p_month_Dec_day_3,\n SUBPARTITION p_month_Dec_day_4,\n SUBPARTITION p_month_Dec_day_5,\n SUBPARTITION p_month_Dec_day_6,\n SUBPARTITION p_month_Dec_day_7,\n SUBPARTITION p_month_Dec_day_8,\n SUBPARTITION p_month_Dec_day_9,\n SUBPARTITION p_month_Dec_day_10,\n SUBPARTITION p_month_Dec_day_11,\n SUBPARTITION p_month_Dec_day_12,\n SUBPARTITION p_month_Dec_day_13,\n SUBPARTITION p_month_Dec_day_14,\n SUBPARTITION p_month_Dec_day_15,\n SUBPARTITION p_month_Dec_day_16,\n SUBPARTITION p_month_Dec_day_17,\n SUBPARTITION p_month_Dec_day_18,\n SUBPARTITION p_month_Dec_day_19,\n SUBPARTITION p_month_Dec_day_20,\n SUBPARTITION p_month_Dec_day_21,\n SUBPARTITION p_month_Dec_day_22,\n SUBPARTITION p_month_Dec_day_23,\n SUBPARTITION p_month_Dec_day_24,\n SUBPARTITION p_month_Dec_day_25,\n SUBPARTITION p_month_Dec_day_26,\n SUBPARTITION p_month_Dec_day_27,\n SUBPARTITION p_month_Dec_day_28,\n SUBPARTITION p_month_Dec_day_29,\n SUBPARTITION p_month_Dec_day_30,\n SUBPARTITION p_month_Dec_day_31\n )\n)", "len": 18500, "last": 18500, @@ -24479,8 +24481,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -24493,12 +24495,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -44617,9 +44619,7 @@ "last": 2222 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable12.out b/tests/data/parser/parseCreateTable12.out index 73e9c4369..63b2408e8 100644 --- a/tests/data/parser/parseCreateTable12.out +++ b/tests/data/parser/parseCreateTable12.out @@ -2,6 +2,8 @@ "query": "CREATE OR REPLACE TABLE t1 (v1 INT)\n PARTITION BY KEY (v1)\n PARTITIONS 2;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE OR REPLACE TABLE t1 (v1 INT)\n PARTITION BY KEY (v1)\n PARTITIONS 2;", "len": 75, "last": 75, @@ -310,8 +312,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@33" @@ -322,12 +324,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -394,9 +396,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable13.out b/tests/data/parser/parseCreateTable13.out index 3f508856c..357ebfd55 100644 --- a/tests/data/parser/parseCreateTable13.out +++ b/tests/data/parser/parseCreateTable13.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE autos (\n auto_id INT UNSIGNED NOT NULL AUTO_INCREMENT KEY,\n make VARCHAR(128),\n year INTEGER,\n mileage INTEGER\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE autos (\n auto_id INT UNSIGNED NOT NULL AUTO_INCREMENT KEY,\n make VARCHAR(128),\n year INTEGER,\n mileage INTEGER\n);", "len": 138, "last": 138, @@ -464,8 +466,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@47" @@ -476,12 +478,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -618,9 +620,7 @@ "last": 39 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable14.out b/tests/data/parser/parseCreateTable14.out index 790f535bb..f42373d60 100644 --- a/tests/data/parser/parseCreateTable14.out +++ b/tests/data/parser/parseCreateTable14.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE autos (\n auto_id INT UNSIGNED NOT NULL KEY,\n make VARCHAR(128),\n year INTEGER,\n mileage INTEGER\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE autos (\n auto_id INT UNSIGNED NOT NULL KEY,\n make VARCHAR(128),\n year INTEGER,\n mileage INTEGER\n);", "len": 123, "last": 123, @@ -442,8 +444,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@45" @@ -454,12 +456,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -595,9 +597,7 @@ "last": 37 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable15.out b/tests/data/parser/parseCreateTable15.out index bc401d4f9..8425bc2cf 100644 --- a/tests/data/parser/parseCreateTable15.out +++ b/tests/data/parser/parseCreateTable15.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE autos (\n auto_id INT UNSIGNED ZEROFILL NOT NULL KEY,\n make VARCHAR(128),\n year INTEGER,\n mileage INTEGER\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE autos (\n auto_id INT UNSIGNED ZEROFILL NOT NULL KEY,\n make VARCHAR(128),\n year INTEGER,\n mileage INTEGER\n);", "len": 132, "last": 132, @@ -464,8 +466,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@47" @@ -476,12 +478,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -618,9 +620,7 @@ "last": 39 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable16.out b/tests/data/parser/parseCreateTable16.out index df694fd30..484b0878f 100644 --- a/tests/data/parser/parseCreateTable16.out +++ b/tests/data/parser/parseCreateTable16.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE test (\n user_id INT,\n INDEX `test` (user_id ASC)\n)", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE test (\n user_id INT,\n INDEX `test` (user_id ASC)\n)", "len": 65, "last": 65, @@ -286,8 +288,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -300,12 +302,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -395,9 +397,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable17.out b/tests/data/parser/parseCreateTable17.out index 73c590335..5f8aaf461 100644 --- a/tests/data/parser/parseCreateTable17.out +++ b/tests/data/parser/parseCreateTable17.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `autos8` (\n `auto_id` int(10) UNSIGNED NOT NULL UNIQUE KEY,\n `make` varchar(128) DEFAULT NULL,\n `year` int(11) DEFAULT NULL,\n `mileage` int(11) DEFAULT NULL,\n `city` point NOT NULL,\n SPATIAL INDEX `city_index` (`city`)\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `autos8` (\n `auto_id` int(10) UNSIGNED NOT NULL UNIQUE KEY,\n `make` varchar(128) DEFAULT NULL,\n `year` int(11) DEFAULT NULL,\n `mileage` int(11) DEFAULT NULL,\n `city` point NOT NULL,\n SPATIAL INDEX `city_index` (`city`)\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_general_ci;", "len": 323, "last": 323, @@ -1049,8 +1051,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@101" @@ -1061,12 +1063,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1321,9 +1323,7 @@ "last": 92 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable18.out b/tests/data/parser/parseCreateTable18.out index ba4639d59..71d49cd20 100644 --- a/tests/data/parser/parseCreateTable18.out +++ b/tests/data/parser/parseCreateTable18.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE test (\n id INT UNSIGNED NOT NULL AUTO_INCREMENT,\n data VARCHAR(64) DEFAULT NULL,\n ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n PRIMARY KEY (id)\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE test (\n id INT UNSIGNED NOT NULL AUTO_INCREMENT,\n data VARCHAR(64) DEFAULT NULL,\n ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n PRIMARY KEY (id)\n);", "len": 196, "last": 196, @@ -618,8 +620,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@61" @@ -630,12 +632,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -821,9 +823,7 @@ "last": 53 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable2.out b/tests/data/parser/parseCreateTable2.out index 6b571a1f0..4883b6d02 100644 --- a/tests/data/parser/parseCreateTable2.out +++ b/tests/data/parser/parseCreateTable2.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `payment` (\n `payment_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,\n `customer_id` smallint(5) unsigned NOT NULL,\n `staff_id` tinyint(3) unsigned NOT NULL,\n `rental_id` int(11) DEFAULT NULL,\n `amount` decimal(5,2) NOT NULL,\n `payment_date` datetime NOT NULL,\n `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n PRIMARY KEY (`payment_id`),\n KEY `idx_fk_staff_id` (`staff_id`),\n KEY `idx_fk_customer_id` (`customer_id`),\n KEY `fk_payment_rental` (`rental_id`),\n CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,\n CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,\n CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE\n) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `payment` (\n `payment_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,\n `customer_id` smallint(5) unsigned NOT NULL,\n `staff_id` tinyint(3) unsigned NOT NULL,\n `rental_id` int(11) DEFAULT NULL,\n `amount` decimal(5,2) NOT NULL,\n `payment_date` datetime NOT NULL,\n `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\n PRIMARY KEY (`payment_id`),\n KEY `idx_fk_staff_id` (`staff_id`),\n KEY `idx_fk_customer_id` (`customer_id`),\n KEY `fk_payment_rental` (`rental_id`),\n CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,\n CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,\n CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE\n) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8", "len": 940, "last": 940, @@ -2345,8 +2347,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -2359,12 +2361,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -2896,9 +2898,7 @@ "last": 211 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable3.out b/tests/data/parser/parseCreateTable3.out index 427cbfdd1..af704d406 100644 --- a/tests/data/parser/parseCreateTable3.out +++ b/tests/data/parser/parseCreateTable3.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE table1 (\n a INT NOT NULL,\n b VARCHAR(32),\n c INT AS (a mod 10) VIRTUAL,\n d VARCHAR(5) AS (left(b,5)) PERSISTENT\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE table1 (\n a INT NOT NULL,\n b VARCHAR(32),\n c INT AS (a mod 10) VIRTUAL,\n d VARCHAR(5) AS (left(b,5)) PERSISTENT\n);", "len": 139, "last": 139, @@ -706,8 +708,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@69" @@ -718,12 +720,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -892,9 +894,7 @@ "last": 61 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable4.out b/tests/data/parser/parseCreateTable4.out index 288db0a65..566728f98 100644 --- a/tests/data/parser/parseCreateTable4.out +++ b/tests/data/parser/parseCreateTable4.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE ts(id INT, purchased DATE)\nPARTITION BY /* comment */ RANGE(YEAR(purchased))\nPARTITIONS 3\nSUBPARTITION BY HASH(TO_DAYS(purchased))\nSUBPARTITIONS 2(\nPARTITION p0\nVALUES LESS THAN(1990)(\n SUBPARTITION s0,\n SUBPARTITION s1\n),\nPARTITION p1\nVALUES LESS THAN(2000)(\n SUBPARTITION s2,\n SUBPARTITION s3\n),\nPARTITION p2\nVALUES LESS THAN MAXVALUE(\n SUBPARTITION s4,\n SUBPARTITION s5\n)\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE ts(id INT, purchased DATE)\nPARTITION BY /* comment */ RANGE(YEAR(purchased))\nPARTITIONS 3\nSUBPARTITION BY HASH(TO_DAYS(purchased))\nSUBPARTITIONS 2(\nPARTITION p0\nVALUES LESS THAN(1990)(\n SUBPARTITION s0,\n SUBPARTITION s1\n),\nPARTITION p1\nVALUES LESS THAN(2000)(\n SUBPARTITION s2,\n SUBPARTITION s3\n),\nPARTITION p2\nVALUES LESS THAN MAXVALUE(\n SUBPARTITION s4,\n SUBPARTITION s5\n)\n);", "len": 408, "last": 408, @@ -1335,8 +1337,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@127" @@ -1347,12 +1349,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1911,9 +1913,7 @@ "last": 117 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable5.out b/tests/data/parser/parseCreateTable5.out index bf39bd907..d68b0ce4e 100644 --- a/tests/data/parser/parseCreateTable5.out +++ b/tests/data/parser/parseCreateTable5.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE new_table (`INT` VARCHAR(50) DEFAULT NULL);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE new_table (`INT` VARCHAR(50) DEFAULT NULL);", "len": 56, "last": 56, @@ -235,8 +237,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@27" @@ -247,12 +249,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -336,9 +338,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable6.out b/tests/data/parser/parseCreateTable6.out index a1b7fcb50..1be8a8391 100644 --- a/tests/data/parser/parseCreateTable6.out +++ b/tests/data/parser/parseCreateTable6.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE new_table (ACTION VARCHAR(50) DEFAULT NULL);\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE new_table (ACTION VARCHAR(50) DEFAULT NULL);\n", "len": 58, "last": 58, @@ -244,8 +246,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@26" @@ -256,12 +258,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -345,9 +347,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable7.out b/tests/data/parser/parseCreateTable7.out index aac1cfba5..4beda1605 100644 --- a/tests/data/parser/parseCreateTable7.out +++ b/tests/data/parser/parseCreateTable7.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `ts` (\n `id` int(11) DEFAULT NULL,\n `purchased` date DEFAULT NULL\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4\nPARTITION BY RANGE (YEAR(purchased))\nSUBPARTITION BY HASH (TO_DAYS(purchased))\n(\nPARTITION p0 VALUES LESS THAN (1990) (\nSUBPARTITION s0 ENGINE=InnoDB,\nSUBPARTITION s1 ENGINE=InnoDB\n),\nPARTITION p1 VALUES LESS THAN (2000) (\nSUBPARTITION s2 ENGINE=InnoDB,\nSUBPARTITION s3 ENGINE=InnoDB\n),\nPARTITION p2 VALUES LESS THAN MAXVALUE (\nSUBPARTITION s4 ENGINE=InnoDB,\nSUBPARTITION s5 ENGINE=InnoDB\n)\n);\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `ts` (\n `id` int(11) DEFAULT NULL,\n `purchased` date DEFAULT NULL\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4\nPARTITION BY RANGE (YEAR(purchased))\nSUBPARTITION BY HASH (TO_DAYS(purchased))\n(\nPARTITION p0 VALUES LESS THAN (1990) (\nSUBPARTITION s0 ENGINE=InnoDB,\nSUBPARTITION s1 ENGINE=InnoDB\n),\nPARTITION p1 VALUES LESS THAN (2000) (\nSUBPARTITION s2 ENGINE=InnoDB,\nSUBPARTITION s3 ENGINE=InnoDB\n),\nPARTITION p2 VALUES LESS THAN MAXVALUE (\nSUBPARTITION s4 ENGINE=InnoDB,\nSUBPARTITION s5 ENGINE=InnoDB\n)\n);\n", "len": 518, "last": 518, @@ -1830,8 +1832,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@171" @@ -1842,12 +1844,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -2495,9 +2497,7 @@ "last": 161 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable8.out b/tests/data/parser/parseCreateTable8.out index e4b589e29..477ef6eb0 100644 --- a/tests/data/parser/parseCreateTable8.out +++ b/tests/data/parser/parseCreateTable8.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `test1` (\n `amultipoint` multipoint DEFAULT NULL,\n `amultipolygon` multipolygon DEFAULT NULL\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `test1` (\n `amultipoint` multipoint DEFAULT NULL,\n `amultipolygon` multipolygon DEFAULT NULL\n) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4", "len": 145, "last": 145, @@ -396,8 +398,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -410,12 +412,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -547,9 +549,7 @@ "last": 34 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTable9.out b/tests/data/parser/parseCreateTable9.out index a39aadb59..03759e612 100644 --- a/tests/data/parser/parseCreateTable9.out +++ b/tests/data/parser/parseCreateTable9.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `trips` (\n `id` bigint(20) UNSIGNED NOT NULL COMMENT 'Unique trip Id',\n `trip_code` int(11) UNSIGNED NOT NULL COMMENT 'Trip code',\n `trip_category` int(11) UNSIGNED NOT NULL COMMENT 'Trip category',\n `trip_date` date NOT NULL COMMENT 'The trip date'\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'The trips' PARTITION BY LIST(trip_category) SUBPARTITION BY HASH(DAY(trip_date)) SUBPARTITIONS 31 (\n PARTITION p1\n VALUES\n IN(1),\n PARTITION p2\n VALUES\n IN(2),\n PARTITION p3\n VALUES\n IN(3),\n PARTITION p4\n VALUES\n IN(4),\n PARTITION p5\n VALUES\n IN(5),\n PARTITION p6\n VALUES\n IN(6),\n PARTITION p7\n VALUES\n IN(7),\n PARTITION p8\n VALUES\n IN(8),\n PARTITION p9\n VALUES\n IN(9),\n PARTITION p10\n VALUES\n IN(10),\n PARTITION p11\n VALUES\n IN(11),\n PARTITION p12\n VALUES\n IN(12),\n PARTITION p13\n VALUES\n IN(13),\n PARTITION p14\n VALUES\n IN(14),\n PARTITION p15\n VALUES\n IN(15),\n PARTITION p16\n VALUES\n IN(16),\n PARTITION p17\n VALUES\n IN(17),\n PARTITION p18\n VALUES\n IN(18),\n PARTITION p19\n VALUES\n IN(19),\n PARTITION p20\n VALUES\n IN(20),\n PARTITION p21\n VALUES\n IN(21),\n PARTITION p22\n VALUES\n IN(22),\n PARTITION p23\n VALUES\n IN(23),\n PARTITION p24\n VALUES\n IN(24),\n PARTITION p25\n VALUES\n IN(25),\n PARTITION p26\n VALUES\n IN(26),\n PARTITION p27\n VALUES\n IN(27),\n PARTITION p28\n VALUES\n IN(28),\n PARTITION p29\n VALUES\n IN(29),\n PARTITION p30\n VALUES\n IN(30),\n PARTITION p31\n VALUES\n IN(31)\n);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `trips` (\n `id` bigint(20) UNSIGNED NOT NULL COMMENT 'Unique trip Id',\n `trip_code` int(11) UNSIGNED NOT NULL COMMENT 'Trip code',\n `trip_category` int(11) UNSIGNED NOT NULL COMMENT 'Trip category',\n `trip_date` date NOT NULL COMMENT 'The trip date'\n) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'The trips' PARTITION BY LIST(trip_category) SUBPARTITION BY HASH(DAY(trip_date)) SUBPARTITIONS 31 (\n PARTITION p1\n VALUES\n IN(1),\n PARTITION p2\n VALUES\n IN(2),\n PARTITION p3\n VALUES\n IN(3),\n PARTITION p4\n VALUES\n IN(4),\n PARTITION p5\n VALUES\n IN(5),\n PARTITION p6\n VALUES\n IN(6),\n PARTITION p7\n VALUES\n IN(7),\n PARTITION p8\n VALUES\n IN(8),\n PARTITION p9\n VALUES\n IN(9),\n PARTITION p10\n VALUES\n IN(10),\n PARTITION p11\n VALUES\n IN(11),\n PARTITION p12\n VALUES\n IN(12),\n PARTITION p13\n VALUES\n IN(13),\n PARTITION p14\n VALUES\n IN(14),\n PARTITION p15\n VALUES\n IN(15),\n PARTITION p16\n VALUES\n IN(16),\n PARTITION p17\n VALUES\n IN(17),\n PARTITION p18\n VALUES\n IN(18),\n PARTITION p19\n VALUES\n IN(19),\n PARTITION p20\n VALUES\n IN(20),\n PARTITION p21\n VALUES\n IN(21),\n PARTITION p22\n VALUES\n IN(22),\n PARTITION p23\n VALUES\n IN(23),\n PARTITION p24\n VALUES\n IN(24),\n PARTITION p25\n VALUES\n IN(25),\n PARTITION p26\n VALUES\n IN(26),\n PARTITION p27\n VALUES\n IN(27),\n PARTITION p28\n VALUES\n IN(28),\n PARTITION p29\n VALUES\n IN(29),\n PARTITION p30\n VALUES\n IN(30),\n PARTITION p31\n VALUES\n IN(31)\n);", "len": 1957, "last": 1957, @@ -5396,8 +5398,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@497" @@ -5408,12 +5410,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -7441,9 +7443,7 @@ "last": 486 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableAsSelect.out b/tests/data/parser/parseCreateTableAsSelect.out index f1b7ee489..be15e17fc 100644 --- a/tests/data/parser/parseCreateTableAsSelect.out +++ b/tests/data/parser/parseCreateTableAsSelect.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE new_tbl AS SELECT * FROM orig_tbl\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE new_tbl AS SELECT * FROM orig_tbl\n", "len": 47, "last": 47, @@ -196,8 +198,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -301,9 +303,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableEnforcedCheck.out b/tests/data/parser/parseCreateTableEnforcedCheck.out index d8d33be1d..862b27915 100644 --- a/tests/data/parser/parseCreateTableEnforcedCheck.out +++ b/tests/data/parser/parseCreateTableEnforcedCheck.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE IF NOT EXISTS employees_check (FirstName varchar(30) CHECK (FirstName REGEXP '^T' AND FirstName REGEXP 'r$') ENFORCED);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE IF NOT EXISTS employees_check (FirstName varchar(30) CHECK (FirstName REGEXP '^T' AND FirstName REGEXP 'r$') ENFORCED);", "len": 132, "last": 132, @@ -433,8 +435,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@45" @@ -445,12 +447,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -536,9 +538,7 @@ "last": 36 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableErr1.out b/tests/data/parser/parseCreateTableErr1.out index 9c017b4a6..323c8a230 100644 --- a/tests/data/parser/parseCreateTableErr1.out +++ b/tests/data/parser/parseCreateTableErr1.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE IF NOT EXISTS users (\n `id` UNKNOWN\n) ENGINE=InnoDB;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE IF NOT EXISTS users (\n `id` UNKNOWN\n) ENGINE=InnoDB;", "len": 68, "last": 68, @@ -244,8 +246,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@27" @@ -256,12 +258,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -335,9 +337,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableErr2.out b/tests/data/parser/parseCreateTableErr2.out index ab76eb32f..1e8b7b912 100644 --- a/tests/data/parser/parseCreateTableErr2.out +++ b/tests/data/parser/parseCreateTableErr2.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE", "len": 12, "last": 12, @@ -49,8 +51,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -63,12 +65,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -103,9 +105,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableErr3.out b/tests/data/parser/parseCreateTableErr3.out index 1884887cd..b06ded16e 100644 --- a/tests/data/parser/parseCreateTableErr3.out +++ b/tests/data/parser/parseCreateTableErr3.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `table_copy` LIKE ;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `table_copy` LIKE ;", "len": 32, "last": 32, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@14" @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableErr4.out b/tests/data/parser/parseCreateTableErr4.out index 30ad1854f..a00c7f649 100644 --- a/tests/data/parser/parseCreateTableErr4.out +++ b/tests/data/parser/parseCreateTableErr4.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE new_table (INT VARCHAR(50) DEFAULT NULL);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE new_table (INT VARCHAR(50) DEFAULT NULL);", "len": 54, "last": 54, @@ -233,8 +235,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@26" @@ -245,12 +247,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -294,9 +296,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableErr5.out b/tests/data/parser/parseCreateTableErr5.out index 061717ce5..c45015df2 100644 --- a/tests/data/parser/parseCreateTableErr5.out +++ b/tests/data/parser/parseCreateTableErr5.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE new_table (666 VARCHAR(50) DEFAULT NULL);\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE new_table (666 VARCHAR(50) DEFAULT NULL);\n", "len": 55, "last": 55, @@ -244,8 +246,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@26" @@ -256,12 +258,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -305,9 +307,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableLike.out b/tests/data/parser/parseCreateTableLike.out index 94b5d7a02..98695360f 100644 --- a/tests/data/parser/parseCreateTableLike.out +++ b/tests/data/parser/parseCreateTableLike.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `table_copy` LIKE `old_table`;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `table_copy` LIKE `old_table`;", "len": 43, "last": 43, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -197,9 +199,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableNotEnforcedCheck.out b/tests/data/parser/parseCreateTableNotEnforcedCheck.out index c936ac57c..460a94d44 100644 --- a/tests/data/parser/parseCreateTableNotEnforcedCheck.out +++ b/tests/data/parser/parseCreateTableNotEnforcedCheck.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE IF NOT EXISTS employees_check (FirstName varchar(30) CHECK (FirstName REGEXP '^T' AND FirstName REGEXP 'r$') NOT ENFORCED);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE IF NOT EXISTS employees_check (FirstName varchar(30) CHECK (FirstName REGEXP '^T' AND FirstName REGEXP 'r$') NOT ENFORCED);", "len": 136, "last": 136, @@ -455,8 +457,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@47" @@ -467,12 +469,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -559,9 +561,7 @@ "last": 38 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableSelect.out b/tests/data/parser/parseCreateTableSelect.out index b0e7d8c90..29b3d159e 100644 --- a/tests/data/parser/parseCreateTableSelect.out +++ b/tests/data/parser/parseCreateTableSelect.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE new_tbl SELECT * FROM orig_tbl\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE new_tbl SELECT * FROM orig_tbl\n", "len": 44, "last": 44, @@ -174,8 +176,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -279,9 +281,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableSpatial.out b/tests/data/parser/parseCreateTableSpatial.out index 35c775b1b..244ac7db1 100644 --- a/tests/data/parser/parseCreateTableSpatial.out +++ b/tests/data/parser/parseCreateTableSpatial.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `xss`.`gis` ( `x` POINT NOT NULL ) ENGINE = InnoDB;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `xss`.`gis` ( `x` POINT NOT NULL ) ENGINE = InnoDB;", "len": 64, "last": 64, @@ -288,8 +290,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -300,12 +302,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -380,9 +382,7 @@ "last": 23 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableTimestampWithPrecision.out b/tests/data/parser/parseCreateTableTimestampWithPrecision.out index 6fd5bb2ca..7f6971d4a 100644 --- a/tests/data/parser/parseCreateTableTimestampWithPrecision.out +++ b/tests/data/parser/parseCreateTableTimestampWithPrecision.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `aa` (\n `id` int(11) NOT NULL,\n `rTime` timestamp(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000' ON UPDATE CURRENT_TIMESTAMP(3),\n PRIMARY KEY (`id`)\n) ENGINE=InnoDB DEFAULT CHARSET=latin1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `aa` (\n `id` int(11) NOT NULL,\n `rTime` timestamp(3) NOT NULL DEFAULT '0000-00-00 00:00:00.000' ON UPDATE CURRENT_TIMESTAMP(3),\n PRIMARY KEY (`id`)\n) ENGINE=InnoDB DEFAULT CHARSET=latin1;", "len": 203, "last": 203, @@ -633,8 +635,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@64" @@ -645,12 +647,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -811,9 +813,7 @@ "last": 54 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTableWithInvisibleKey.out b/tests/data/parser/parseCreateTableWithInvisibleKey.out index 1e3e816c9..af57c0b95 100644 --- a/tests/data/parser/parseCreateTableWithInvisibleKey.out +++ b/tests/data/parser/parseCreateTableWithInvisibleKey.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE `animes_comments` (\n `anime_comment_id` bigint unsigned NOT NULL AUTO_INCREMENT,\n `anime_id` bigint unsigned NOT NULL,\n `user_id` bigint unsigned NOT NULL,\n `comment_text` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL,\n `comment_at` datetime DEFAULT NULL,\n PRIMARY KEY (`anime_comment_id`),\n KEY `animes_comments_animes_fk` (`anime_id`) invisible,\n KEY `animes_comments_users_fk` (`user_id`),\n KEY `comment_at_idx` (`comment_at`) ,\n CONSTRAINT `animes_comments_animes_fk` FOREIGN KEY (`anime_id`) REFERENCES `animes` (`anime_id`) ON DELETE CASCADE ON UPDATE RESTRICT,\n CONSTRAINT `animes_comments_users_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE RESTRICT)", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE `animes_comments` (\n `anime_comment_id` bigint unsigned NOT NULL AUTO_INCREMENT,\n `anime_id` bigint unsigned NOT NULL,\n `user_id` bigint unsigned NOT NULL,\n `comment_text` varchar(500) COLLATE utf8mb4_general_ci DEFAULT NULL,\n `comment_at` datetime DEFAULT NULL,\n PRIMARY KEY (`anime_comment_id`),\n KEY `animes_comments_animes_fk` (`anime_id`) invisible,\n KEY `animes_comments_users_fk` (`user_id`),\n KEY `comment_at_idx` (`comment_at`) ,\n CONSTRAINT `animes_comments_animes_fk` FOREIGN KEY (`anime_id`) REFERENCES `animes` (`anime_id`) ON DELETE CASCADE ON UPDATE RESTRICT,\n CONSTRAINT `animes_comments_users_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE RESTRICT)", "len": 730, "last": 730, @@ -1696,8 +1698,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -1710,12 +1712,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -2123,9 +2125,7 @@ "last": 152 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateTrigger.out b/tests/data/parser/parseCreateTrigger.out index 188ac6702..67d2ae6b8 100644 --- a/tests/data/parser/parseCreateTrigger.out +++ b/tests/data/parser/parseCreateTrigger.out @@ -2,6 +2,8 @@ "query": "CREATE TRIGGER ins_sum BEFORE INSERT ON account\nFOR EACH ROW BEGIN SET @sum = @sum + NEW.amount END", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TRIGGER ins_sum BEFORE INSERT ON account\nFOR EACH ROW BEGIN SET @sum = @sum + NEW.amount END", "len": 99, "last": 99, @@ -385,8 +387,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -399,12 +401,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -512,9 +514,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateUser1.out b/tests/data/parser/parseCreateUser1.out index fd58c0cb6..226ce2482 100644 --- a/tests/data/parser/parseCreateUser1.out +++ b/tests/data/parser/parseCreateUser1.out @@ -2,6 +2,8 @@ "query": "CREATE USER test", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE USER test", "len": 16, "last": 16, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,12 +89,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -133,9 +135,7 @@ "last": 5 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateUser2.out b/tests/data/parser/parseCreateUser2.out index 4ba8a96f0..819620bb2 100644 --- a/tests/data/parser/parseCreateUser2.out +++ b/tests/data/parser/parseCreateUser2.out @@ -2,6 +2,8 @@ "query": "CREATE USER 'bob'@'localhost' \n IDENTIFIED VIA mysql_native_password USING PASSWORD('vp8LAf4#wu2V&Wi*iJWC#3KPotsHzx3u') \n OR unix_socket;\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE USER 'bob'@'localhost' \n IDENTIFIED VIA mysql_native_password USING PASSWORD('vp8LAf4#wu2V&Wi*iJWC#3KPotsHzx3u') \n OR unix_socket;\n\n", "len": 141, "last": 141, @@ -290,8 +292,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -302,12 +304,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -397,9 +399,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateView.out b/tests/data/parser/parseCreateView.out index 6fc16efaf..eb3f1b89f 100644 --- a/tests/data/parser/parseCreateView.out +++ b/tests/data/parser/parseCreateView.out @@ -2,6 +2,8 @@ "query": "CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `sakila`.`actor_info` AS select `a`.`actor_id` AS `actor_id`,`a`.`first_name` AS `first_name`,`a`.`last_name` AS `last_name`,group_concat(distinct concat(`c`.`name`,': ',(select group_concat(`f`.`title` order by `f`.`title` ASC separator ', ') from ((`sakila`.`film` `f` join `sakila`.`film_category` `fc` on((`f`.`film_id` = `fc`.`film_id`))) join `sakila`.`film_actor` `fa` on((`f`.`film_id` = `fa`.`film_id`))) where ((`fc`.`category_id` = `c`.`category_id`) and (`fa`.`actor_id` = `a`.`actor_id`)))) order by `c`.`name` ASC separator '; ') AS `film_info` from (((`sakila`.`actor` `a` left join `sakila`.`film_actor` `fa` on((`a`.`actor_id` = `fa`.`actor_id`))) left join `sakila`.`film_category` `fc` on((`fa`.`film_id` = `fc`.`film_id`))) left join `sakila`.`category` `c` on((`fc`.`category_id` = `c`.`category_id`))) group by `a`.`actor_id`,`a`.`first_name`,`a`.`last_name`", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY INVOKER VIEW `sakila`.`actor_info` AS select `a`.`actor_id` AS `actor_id`,`a`.`first_name` AS `first_name`,`a`.`last_name` AS `last_name`,group_concat(distinct concat(`c`.`name`,': ',(select group_concat(`f`.`title` order by `f`.`title` ASC separator ', ') from ((`sakila`.`film` `f` join `sakila`.`film_category` `fc` on((`f`.`film_id` = `fc`.`film_id`))) join `sakila`.`film_actor` `fa` on((`f`.`film_id` = `fa`.`film_id`))) where ((`fc`.`category_id` = `c`.`category_id`) and (`fa`.`actor_id` = `a`.`actor_id`)))) order by `c`.`name` ASC separator '; ') AS `film_info` from (((`sakila`.`actor` `a` left join `sakila`.`film_actor` `fa` on((`a`.`actor_id` = `fa`.`actor_id`))) left join `sakila`.`film_category` `fc` on((`fa`.`film_id` = `fc`.`film_id`))) left join `sakila`.`category` `c` on((`fc`.`category_id` = `c`.`category_id`))) group by `a`.`actor_id`,`a`.`first_name`,`a`.`last_name`", "len": 960, "last": 960, @@ -3157,8 +3159,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -3171,12 +3173,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -3362,9 +3364,7 @@ "last": 285 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateView2.out b/tests/data/parser/parseCreateView2.out index feac83c2a..cfa38a3d4 100644 --- a/tests/data/parser/parseCreateView2.out +++ b/tests/data/parser/parseCreateView2.out @@ -2,6 +2,8 @@ "query": "CREATE VIEW myView (vid, vfirstname) AS\nSELECT id, first_name FROM employee WHERE id = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE VIEW myView (vid, vfirstname) AS\nSELECT id, first_name FROM employee WHERE id = 1;", "len": 89, "last": 89, @@ -398,8 +400,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@41" @@ -410,12 +412,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -524,9 +526,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateView3.out b/tests/data/parser/parseCreateView3.out index 0f314522b..85ef3a03e 100644 --- a/tests/data/parser/parseCreateView3.out +++ b/tests/data/parser/parseCreateView3.out @@ -2,6 +2,8 @@ "query": "CREATE VIEW GoodStudent AS\n SELECT `one space`, `two spaces`\n FROM `Une table espace`\n WHERE `one space` > 3.0\n WITH CHECK OPTION\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE VIEW GoodStudent AS\n SELECT `one space`, `two spaces`\n FROM `Une table espace`\n WHERE `one space` > 3.0\n WITH CHECK OPTION\n", "len": 148, "last": 148, @@ -387,8 +389,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -401,12 +403,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -530,9 +532,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateView4.out b/tests/data/parser/parseCreateView4.out index 8a0546aae..0e220ff3c 100644 --- a/tests/data/parser/parseCreateView4.out +++ b/tests/data/parser/parseCreateView4.out @@ -2,6 +2,8 @@ "query": "CREATE VIEW v (mycol) AS SELECT 'abc';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE VIEW v (mycol) AS SELECT 'abc';\n", "len": 39, "last": 39, @@ -211,8 +213,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@23" @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -290,9 +292,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateView5.out b/tests/data/parser/parseCreateView5.out index b79d39bd8..d1c44d23a 100644 --- a/tests/data/parser/parseCreateView5.out +++ b/tests/data/parser/parseCreateView5.out @@ -2,6 +2,8 @@ "query": "CREATE VIEW `t3` as SELECT `t1` IS NOT NULL AS `is_not_null` FROM `test3`;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE VIEW `t3` as SELECT `t1` IS NOT NULL AS `is_not_null` FROM `test3`;\n", "len": 75, "last": 75, @@ -295,8 +297,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -307,12 +309,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -398,9 +400,7 @@ "last": 23 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateViewAsWithAs.out b/tests/data/parser/parseCreateViewAsWithAs.out index 2818c9454..5f6d0320a 100644 --- a/tests/data/parser/parseCreateViewAsWithAs.out +++ b/tests/data/parser/parseCreateViewAsWithAs.out @@ -2,6 +2,8 @@ "query": "-- create first view\nCREATE VIEW withclause AS\n\nWITH cte AS (\n SELECT p.name, p.shape\n FROM gis_all as p\n)\n\nSELECT cte.*\nFROM cte\nCROSS JOIN gis_all;\n-- create second view\nCREATE VIEW withclause2 AS\n\nWITH cte AS (\n SELECT p.name, p.shape\n FROM gis_all as p\n), cte2 AS (\n SELECT p.name as n2, p.shape as sh2\n FROM gis_all as p\n)\n\nSELECT cte.*,cte2.*\nFROM cte,cte2\nCROSS JOIN gis_all;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- create first view\nCREATE VIEW withclause AS\n\nWITH cte AS (\n SELECT p.name, p.shape\n FROM gis_all as p\n)\n\nSELECT cte.*\nFROM cte\nCROSS JOIN gis_all;\n-- create second view\nCREATE VIEW withclause2 AS\n\nWITH cte AS (\n SELECT p.name, p.shape\n FROM gis_all as p\n), cte2 AS (\n SELECT p.name as n2, p.shape as sh2\n FROM gis_all as p\n)\n\nSELECT cte.*,cte2.*\nFROM cte,cte2\nCROSS JOIN gis_all;", "len": 388, "last": 388, @@ -1663,8 +1665,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@60" @@ -1675,12 +1677,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1708,6 +1710,8 @@ "columns": [], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 20, @@ -1833,14 +1837,14 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 111, @@ -2268,6 +2272,8 @@ "columns": [], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 20, @@ -2393,9 +2399,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } }, "cte2": { @@ -2404,6 +2408,8 @@ "columns": [], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 28, @@ -2553,14 +2559,14 @@ "last": 27 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 21, @@ -2716,9 +2722,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -2748,9 +2752,7 @@ "last": 109 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -2780,9 +2782,7 @@ "last": 148 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateViewMultiple.out b/tests/data/parser/parseCreateViewMultiple.out index a814452c1..d88c63e8e 100644 --- a/tests/data/parser/parseCreateViewMultiple.out +++ b/tests/data/parser/parseCreateViewMultiple.out @@ -2,6 +2,8 @@ "query": "CREATE TABLE T1 (COL1 CHAR(10))\n\nCREATE VIEW V1 AS SELECT COL1\n FROM T1 WHERE COL1 LIKE 'A%'\n\nCREATE VIEW V2 AS SELECT COL1\n FROM V1 WHERE COL1 LIKE '%Z'\n WITH LOCAL CHECK OPTION\n\nCREATE VIEW V3 AS SELECT COL1\n FROM V2 WHERE COL1 LIKE 'AB%'\n\nCREATE VIEW V4 AS SELECT COL1\n FROM V3 WHERE COL1 LIKE '%YZ'\n WITH CASCADED CHECK OPTION\n\nCREATE VIEW V5 AS SELECT COL1\n FROM V4 WHERE COL1 LIKE 'ABC%'\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE TABLE T1 (COL1 CHAR(10))\n\nCREATE VIEW V1 AS SELECT COL1\n FROM T1 WHERE COL1 LIKE 'A%'\n\nCREATE VIEW V2 AS SELECT COL1\n FROM V1 WHERE COL1 LIKE '%Z'\n WITH LOCAL CHECK OPTION\n\nCREATE VIEW V3 AS SELECT COL1\n FROM V2 WHERE COL1 LIKE 'AB%'\n\nCREATE VIEW V4 AS SELECT COL1\n FROM V3 WHERE COL1 LIKE '%YZ'\n WITH CASCADED CHECK OPTION\n\nCREATE VIEW V5 AS SELECT COL1\n FROM V4 WHERE COL1 LIKE 'ABC%'\n", "len": 464, "last": 464, @@ -1685,8 +1687,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -1699,12 +1701,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1772,9 +1774,7 @@ "last": 151 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateViewWithQuotes.out b/tests/data/parser/parseCreateViewWithQuotes.out index 2d99b7ab0..5760f4a27 100644 --- a/tests/data/parser/parseCreateViewWithQuotes.out +++ b/tests/data/parser/parseCreateViewWithQuotes.out @@ -2,6 +2,8 @@ "query": "CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost`\nSQL SECURITY DEFINER VIEW `test_view` AS\nselect `email_content`.`content_id` AS `content_id`,\n`email_content`.`brand_id` AS `brand_id` from `email_content`;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost`\nSQL SECURITY DEFINER VIEW `test_view` AS\nselect `email_content`.`content_id` AS `content_id`,\n`email_content`.`brand_id` AS `brand_id` from `email_content`;", "len": 211, "last": 211, @@ -495,8 +497,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@49" @@ -507,12 +509,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -635,9 +637,7 @@ "last": 42 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateViewWithUnion.out b/tests/data/parser/parseCreateViewWithUnion.out index db10be098..e130a2dc9 100644 --- a/tests/data/parser/parseCreateViewWithUnion.out +++ b/tests/data/parser/parseCreateViewWithUnion.out @@ -2,6 +2,8 @@ "query": "CREATE VIEW `employees_view` AS\nSELECT *\nFROM\n `employees`\nWHERE\n `employees`.`gender` = 'M'\nUNION\nSELECT *\nFROM\n `employees`\nWHERE\n `employees`.`gender` = 'F';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE VIEW `employees_view` AS\nSELECT *\nFROM\n `employees`\nWHERE\n `employees`.`gender` = 'M'\nUNION\nSELECT *\nFROM\n `employees`\nWHERE\n `employees`.`gender` = 'F';", "len": 173, "last": 173, @@ -530,8 +532,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@53" @@ -542,12 +544,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -702,9 +704,7 @@ "last": 45 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateViewWithWrongSyntax.out b/tests/data/parser/parseCreateViewWithWrongSyntax.out index d197a06c8..27a0a61c5 100644 --- a/tests/data/parser/parseCreateViewWithWrongSyntax.out +++ b/tests/data/parser/parseCreateViewWithWrongSyntax.out @@ -2,6 +2,8 @@ "query": "CREATE VIEW abc AS SELECT a, b, FROM a", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE VIEW abc AS SELECT a, b, FROM a", "len": 38, "last": 38, @@ -229,8 +231,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -243,12 +245,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -344,9 +346,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseCreateViewWithoutQuotes.out b/tests/data/parser/parseCreateViewWithoutQuotes.out index 9a209f2d3..e7d49855a 100644 --- a/tests/data/parser/parseCreateViewWithoutQuotes.out +++ b/tests/data/parser/parseCreateViewWithoutQuotes.out @@ -2,6 +2,8 @@ "query": "CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost\nSQL SECURITY DEFINER VIEW `test_view` AS\nselect `email_content`.`content_id` AS `content_id`,\n`email_content`.`brand_id` AS `brand_id` from `email_content`;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE ALGORITHM=UNDEFINED DEFINER=root@localhost\nSQL SECURITY DEFINER VIEW `test_view` AS\nselect `email_content`.`content_id` AS `content_id`,\n`email_content`.`brand_id` AS `brand_id` from `email_content`;", "len": 207, "last": 207, @@ -508,8 +510,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@51" @@ -520,12 +522,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -648,9 +650,7 @@ "last": 43 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete.out b/tests/data/parser/parseDelete.out index 5ac246f2a..a7e219d6d 100644 --- a/tests/data/parser/parseDelete.out +++ b/tests/data/parser/parseDelete.out @@ -2,6 +2,8 @@ "query": "DELETE LOW_PRIORITY\n/* */\nFROM\n `test`.users\nWHERE\n `id`<3 AND (username=\"Dan\" or username=\"Paul\")\nORDER BY\n id\n;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE LOW_PRIORITY\n/* */\nFROM\n `test`.users\nWHERE\n `id`<3 AND (username=\"Dan\" or username=\"Paul\")\nORDER BY\n id\n;", "len": 122, "last": 122, @@ -437,8 +439,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@47" @@ -449,12 +451,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -544,9 +546,7 @@ "last": 35 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete10.out b/tests/data/parser/parseDelete10.out index 555792811..cf81c3c29 100644 --- a/tests/data/parser/parseDelete10.out +++ b/tests/data/parser/parseDelete10.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK table1, table2.* FROM table1 as t1, table2 as t2 WHERE 1=1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK table1, table2.* FROM table1 as t1, table2 as t2 WHERE 1=1", "len": 71, "last": 71, @@ -363,8 +365,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -377,12 +379,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -456,9 +458,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete11.out b/tests/data/parser/parseDelete11.out index c4777e828..57c474706 100644 --- a/tests/data/parser/parseDelete11.out +++ b/tests/data/parser/parseDelete11.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1, table2.* USING table1 AS `t1`, table2 AS `t2` WHERE 1=1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1, table2.* USING table1 AS `t1`, table2 AS `t2` WHERE 1=1", "len": 81, "last": 81, @@ -387,8 +389,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -401,12 +403,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -480,9 +482,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete12.out b/tests/data/parser/parseDelete12.out index 9d8e92ddf..957ee6e00 100644 --- a/tests/data/parser/parseDelete12.out +++ b/tests/data/parser/parseDelete12.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1 WHERE 1=1 LIMIT 0, 25", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1 WHERE 1=1 LIMIT 0, 25", "len": 46, "last": 46, @@ -242,8 +244,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -256,12 +258,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -308,9 +310,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete13.out b/tests/data/parser/parseDelete13.out index b1f86caf8..10a509539 100644 --- a/tests/data/parser/parseDelete13.out +++ b/tests/data/parser/parseDelete13.out @@ -2,6 +2,8 @@ "query": "DELETE FROM emp x WHERE x.salary = 20", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE FROM emp x WHERE x.salary = 20", "len": 37, "last": 37, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -272,9 +274,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete2.out b/tests/data/parser/parseDelete2.out index a858dc5f0..57d969503 100644 --- a/tests/data/parser/parseDelete2.out +++ b/tests/data/parser/parseDelete2.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1", "len": 21, "last": 21, @@ -95,8 +97,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -109,12 +111,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -150,9 +152,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete3.out b/tests/data/parser/parseDelete3.out index f13c7bd25..4da16f415 100644 --- a/tests/data/parser/parseDelete3.out +++ b/tests/data/parser/parseDelete3.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1 WHERE 1=1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1 WHERE 1=1", "len": 31, "last": 31, @@ -165,8 +167,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -179,12 +181,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -227,9 +229,7 @@ "last": 12 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete4.out b/tests/data/parser/parseDelete4.out index e4e9ec77d..8e1bcfd84 100644 --- a/tests/data/parser/parseDelete4.out +++ b/tests/data/parser/parseDelete4.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1 WHERE 1=1 ORDER BY id", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1 WHERE 1=1 ORDER BY id", "len": 43, "last": 43, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -286,9 +288,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete5.out b/tests/data/parser/parseDelete5.out index 4db7e7c6f..f599781f0 100644 --- a/tests/data/parser/parseDelete5.out +++ b/tests/data/parser/parseDelete5.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1 WHERE 1=1 ORDER BY id LIMIT 0,25", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1 WHERE 1=1 ORDER BY id LIMIT 0,25", "len": 54, "last": 54, @@ -275,8 +277,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -356,9 +358,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete6.out b/tests/data/parser/parseDelete6.out index e0458fad8..8b72a6c40 100644 --- a/tests/data/parser/parseDelete6.out +++ b/tests/data/parser/parseDelete6.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1 ORDER BY id", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1 ORDER BY id", "len": 33, "last": 33, @@ -139,8 +141,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -153,12 +155,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -209,9 +211,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete7.out b/tests/data/parser/parseDelete7.out index 9c3d84463..47639d825 100644 --- a/tests/data/parser/parseDelete7.out +++ b/tests/data/parser/parseDelete7.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1 ORDER BY id LIMIT 0,25", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1 ORDER BY id LIMIT 0,25", "len": 44, "last": 44, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -283,9 +285,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete8.out b/tests/data/parser/parseDelete8.out index d981574ad..df19e5804 100644 --- a/tests/data/parser/parseDelete8.out +++ b/tests/data/parser/parseDelete8.out @@ -2,6 +2,8 @@ "query": "DELETE IGNORE FROM t1 LIMIT 0, 25", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE IGNORE FROM t1 LIMIT 0, 25", "len": 33, "last": 33, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -190,12 +192,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -235,9 +237,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelete9.out b/tests/data/parser/parseDelete9.out index 65f26fb5f..8af79004b 100644 --- a/tests/data/parser/parseDelete9.out +++ b/tests/data/parser/parseDelete9.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK table1, table2.* FROM table1 as t1, table2 as t2", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK table1, table2.* FROM table1 as t1, table2 as t2", "len": 61, "last": 61, @@ -295,8 +297,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -309,12 +311,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -381,9 +383,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr1.out b/tests/data/parser/parseDeleteErr1.out index 7309a66ab..bda516cbc 100644 --- a/tests/data/parser/parseDeleteErr1.out +++ b/tests/data/parser/parseDeleteErr1.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK USING table1, table2.*", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK USING table1, table2.*", "len": 35, "last": 35, @@ -152,8 +154,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -196,9 +198,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr10.out b/tests/data/parser/parseDeleteErr10.out index 9dca08605..cc9508989 100644 --- a/tests/data/parser/parseDeleteErr10.out +++ b/tests/data/parser/parseDeleteErr10.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1, table2 USING t1 as t,t2 as tt ASC a =1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1, table2 USING t1 as t,t2 as tt ASC a =1;", "len": 65, "last": 65, @@ -376,8 +378,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@39" @@ -388,12 +390,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -460,9 +462,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr11.out b/tests/data/parser/parseDeleteErr11.out index 3238c69b8..884d2f411 100644 --- a/tests/data/parser/parseDeleteErr11.out +++ b/tests/data/parser/parseDeleteErr11.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1 WHERE a = 1 ASC", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1 WHERE a = 1 ASC", "len": 40, "last": 40, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -273,9 +275,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr12.out b/tests/data/parser/parseDeleteErr12.out index 3d572159f..7098aee8a 100644 --- a/tests/data/parser/parseDeleteErr12.out +++ b/tests/data/parser/parseDeleteErr12.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1, table2 USING t1 as t,t2 as tt as ttt WHEE a =1;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1, table2 USING t1 as t,t2 as tt as ttt WHEE a =1;\n", "len": 74, "last": 74, @@ -431,8 +433,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@43" @@ -443,12 +445,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -515,9 +517,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr2.out b/tests/data/parser/parseDeleteErr2.out index baa89c9a0..32053b4b7 100644 --- a/tests/data/parser/parseDeleteErr2.out +++ b/tests/data/parser/parseDeleteErr2.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK table1, table2.* USING table1 AS `t1`, table2 AS `t2` WHERE 1=1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK table1, table2.* USING table1 AS `t1`, table2 AS `t2` WHERE 1=1", "len": 76, "last": 76, @@ -365,8 +367,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -379,12 +381,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -430,9 +432,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr3.out b/tests/data/parser/parseDeleteErr3.out index 82c27b1b0..e3430ca34 100644 --- a/tests/data/parser/parseDeleteErr3.out +++ b/tests/data/parser/parseDeleteErr3.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK table1, table2.* table1 AS `t1` table2 AS `t2` WHERE 1=1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK table1, table2.* table1 AS `t1` table2 AS `t2` WHERE 1=1", "len": 69, "last": 69, @@ -332,8 +334,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -346,12 +348,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -397,9 +399,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr4.out b/tests/data/parser/parseDeleteErr4.out index 56bda0845..c96f2d98a 100644 --- a/tests/data/parser/parseDeleteErr4.out +++ b/tests/data/parser/parseDeleteErr4.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1, table2.* table1 AS `t1` USING table2 AS `t2` WHERE 1=1 ORDER BY id ASC", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1, table2.* table1 AS `t1` USING table2 AS `t2` WHERE 1=1 ORDER BY id ASC", "len": 96, "last": 96, @@ -442,8 +444,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -456,12 +458,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -525,9 +527,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr5.out b/tests/data/parser/parseDeleteErr5.out index b48c930db..7fe712c24 100644 --- a/tests/data/parser/parseDeleteErr5.out +++ b/tests/data/parser/parseDeleteErr5.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1 WHERE 1=1 ORDER BY id ASC WHERE 1=1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1 WHERE 1=1 ORDER BY id ASC WHERE 1=1", "len": 60, "last": 60, @@ -297,8 +299,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -311,12 +313,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -374,9 +376,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr6.out b/tests/data/parser/parseDeleteErr6.out index de8e980b4..10ae64b2a 100644 --- a/tests/data/parser/parseDeleteErr6.out +++ b/tests/data/parser/parseDeleteErr6.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1, table2.* table1 AS `t1` USING table2 AS `t2` WHERE 1=1 LIMIT 0, 25", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1, table2.* table1 AS `t1` USING table2 AS `t2` WHERE 1=1 LIMIT 0, 25", "len": 92, "last": 92, @@ -453,8 +455,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -467,12 +469,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -536,9 +538,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr7.out b/tests/data/parser/parseDeleteErr7.out index f0f7d4a0e..60d6ac5fc 100644 --- a/tests/data/parser/parseDeleteErr7.out +++ b/tests/data/parser/parseDeleteErr7.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1 WHERE a = 1 ORDER BY id ASC WHERE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1 WHERE a = 1 ORDER BY id ASC WHERE", "len": 58, "last": 58, @@ -275,8 +277,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -354,9 +356,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr8.out b/tests/data/parser/parseDeleteErr8.out index c0112dcb3..3028146a0 100644 --- a/tests/data/parser/parseDeleteErr8.out +++ b/tests/data/parser/parseDeleteErr8.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1 ASC", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1 ASC", "len": 28, "last": 28, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -172,9 +174,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteErr9.out b/tests/data/parser/parseDeleteErr9.out index bb28e0ee5..0bcde7022 100644 --- a/tests/data/parser/parseDeleteErr9.out +++ b/tests/data/parser/parseDeleteErr9.out @@ -2,6 +2,8 @@ "query": "DELETE QUICK FROM table1, table2 USING t1 as t,t2 as tt WHEE a =1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE QUICK FROM table1, table2 USING t1 as t,t2 as tt WHEE a =1;", "len": 66, "last": 66, @@ -376,8 +378,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@39" @@ -388,12 +390,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -460,9 +462,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDeleteJoin.out b/tests/data/parser/parseDeleteJoin.out index 1c23b5a44..499c4878d 100644 --- a/tests/data/parser/parseDeleteJoin.out +++ b/tests/data/parser/parseDeleteJoin.out @@ -2,6 +2,8 @@ "query": "DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.id=t2.id AND t2.id=t3.id", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.id=t2.id AND t2.id=t3.id", "len": 83, "last": 83, @@ -438,8 +440,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -452,12 +454,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -572,9 +574,7 @@ "last": 37 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDelimiter.out b/tests/data/parser/parseDelimiter.out index 84c0fa8c3..7f44f10e5 100644 --- a/tests/data/parser/parseDelimiter.out +++ b/tests/data/parser/parseDelimiter.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM foo;\nDELIMITER $$\nSELECT * FROM bar$$\nDELIMITER ;\nSELECT * FROM baz;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM foo;\nDELIMITER $$\nSELECT * FROM bar$$\nDELIMITER ;\nSELECT * FROM baz;", "len": 82, "last": 82, @@ -396,8 +398,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@14" @@ -408,12 +410,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -557,9 +559,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDrop.out b/tests/data/parser/parseDrop.out index 272bdad1e..0f63d4802 100644 --- a/tests/data/parser/parseDrop.out +++ b/tests/data/parser/parseDrop.out @@ -2,6 +2,8 @@ "query": "DROP USER IF EXISTS 'testtest'@'%';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DROP USER IF EXISTS 'testtest'@'%';", "len": 35, "last": 35, @@ -108,8 +110,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -156,9 +158,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseDrop2.out b/tests/data/parser/parseDrop2.out index d20aab40c..2a6089507 100644 --- a/tests/data/parser/parseDrop2.out +++ b/tests/data/parser/parseDrop2.out @@ -2,6 +2,8 @@ "query": "DROP USER 'testtest'@'%';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DROP USER 'testtest'@'%';", "len": 25, "last": 25, @@ -86,8 +88,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@11" @@ -98,12 +100,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -133,9 +135,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain.out b/tests/data/parser/parseExplain.out index 2fa5ae787..0b59bfa3b 100644 --- a/tests/data/parser/parseExplain.out +++ b/tests/data/parser/parseExplain.out @@ -2,6 +2,8 @@ "query": "EXPLAIN SELECT * FROM test;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN SELECT * FROM test;", "len": 27, "last": 27, @@ -132,8 +134,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@16" @@ -144,12 +146,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -158,6 +160,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 9, @@ -240,9 +244,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "EXPLAIN", "connectionId": null, @@ -257,9 +259,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain1.out b/tests/data/parser/parseExplain1.out index 497b6bbb2..03e6650af 100644 --- a/tests/data/parser/parseExplain1.out +++ b/tests/data/parser/parseExplain1.out @@ -2,6 +2,8 @@ "query": "ANALYZE SELECT * FROM orders", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYZE SELECT * FROM orders", "len": 28, "last": 28, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -147,6 +149,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -226,9 +230,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "ANALYZE", "connectionId": null, @@ -243,9 +245,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain10.out b/tests/data/parser/parseExplain10.out index 1bc4e99d5..095734fdf 100644 --- a/tests/data/parser/parseExplain10.out +++ b/tests/data/parser/parseExplain10.out @@ -2,6 +2,8 @@ "query": "DESC REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESC REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');", "len": 64, "last": 64, @@ -246,8 +248,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@28" @@ -258,12 +260,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -272,6 +274,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 19, @@ -383,9 +387,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "DESC", "connectionId": null, @@ -400,9 +402,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain11.out b/tests/data/parser/parseExplain11.out index 6c733e2ff..39593a851 100644 --- a/tests/data/parser/parseExplain11.out +++ b/tests/data/parser/parseExplain11.out @@ -2,6 +2,8 @@ "query": "ANALYSE REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYSE REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');\n", "len": 68, "last": 68, @@ -257,8 +259,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@28" @@ -269,19 +271,17 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, "statements": [], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain12.out b/tests/data/parser/parseExplain12.out index ca627b084..3dccb2ccc 100644 --- a/tests/data/parser/parseExplain12.out +++ b/tests/data/parser/parseExplain12.out @@ -2,6 +2,8 @@ "query": "EXPLAIN FORMAT=json REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN FORMAT=json REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');", "len": 79, "last": 79, @@ -290,8 +292,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@32" @@ -302,12 +304,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -316,6 +318,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 19, @@ -427,9 +431,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "EXPLAIN", "connectionId": null, @@ -451,9 +453,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain13.out b/tests/data/parser/parseExplain13.out index b3a67549c..6b0f1a2a9 100644 --- a/tests/data/parser/parseExplain13.out +++ b/tests/data/parser/parseExplain13.out @@ -2,6 +2,8 @@ "query": "DESCRIBE FORMAT=json REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESCRIBE FORMAT=json REPLACE INTO test VALUES (1, 'Old', '2014-08-20 18:47:00');", "len": 80, "last": 80, @@ -290,8 +292,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@32" @@ -302,12 +304,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -316,6 +318,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 19, @@ -427,9 +431,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "DESCRIBE", "connectionId": null, @@ -451,9 +453,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain14.out b/tests/data/parser/parseExplain14.out index 123f1147b..ad330fa79 100644 --- a/tests/data/parser/parseExplain14.out +++ b/tests/data/parser/parseExplain14.out @@ -2,6 +2,8 @@ "query": "DESC TABLE `fo` ORDER BY `fo`.`uuid` ASC;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESC TABLE `fo` ORDER BY `fo`.`uuid` ASC;", "len": 41, "last": 41, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -202,6 +204,19 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Exceptions\\ParserException", + "token": { + "@type": "@6" + }, + "message": "Unrecognized statement type.", + "code": 0, + "file": "/src/Parser.php", + "line": 639 + } + ], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 13, @@ -249,20 +264,7 @@ ] }, "statements": [], - "brackets": 0, - "strict": false, - "errors": [ - { - "@type": "PhpMyAdmin\\SqlParser\\Exceptions\\ParserException", - "token": { - "@type": "@6" - }, - "message": "Unrecognized statement type.", - "code": 0, - "file": "/src/Parser.php", - "line": 620 - } - ] + "brackets": 0 }, "statementAlias": "DESC", "connectionId": null, @@ -277,9 +279,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain2.out b/tests/data/parser/parseExplain2.out index 3b473498d..5aa48deb9 100644 --- a/tests/data/parser/parseExplain2.out +++ b/tests/data/parser/parseExplain2.out @@ -2,6 +2,8 @@ "query": "DESC tablename", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESC tablename", "len": 14, "last": 14, @@ -51,8 +53,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -65,12 +67,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -88,9 +90,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain3.out b/tests/data/parser/parseExplain3.out index bc3e424fd..ea53c9096 100644 --- a/tests/data/parser/parseExplain3.out +++ b/tests/data/parser/parseExplain3.out @@ -2,6 +2,8 @@ "query": "EXPLAIN ANALYZE SELECT first_name, last_name, SUM(amount) AS total FROM staff INNER JOIN payment ON staff.staff_id = payment.staff_id AND payment_date LIKE '2005-08%' GROUP BY first_name, last_name;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN ANALYZE SELECT first_name, last_name, SUM(amount) AS total FROM staff INNER JOIN payment ON staff.staff_id = payment.staff_id AND payment_date LIKE '2005-08%' GROUP BY first_name, last_name;", "len": 198, "last": 198, @@ -640,8 +642,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@63" @@ -652,12 +654,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -666,6 +668,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 53, @@ -972,9 +976,7 @@ "last": 50 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "EXPLAIN ANALYZE", "connectionId": null, @@ -989,9 +991,7 @@ "last": 56 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain4.out b/tests/data/parser/parseExplain4.out index 4b02aab7d..9d41c8cb9 100644 --- a/tests/data/parser/parseExplain4.out +++ b/tests/data/parser/parseExplain4.out @@ -2,6 +2,8 @@ "query": "EXPLAIN FORMAT=TREE SELECT * FROM db", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN FORMAT=TREE SELECT * FROM db", "len": 36, "last": 36, @@ -163,8 +165,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -177,12 +179,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -191,6 +193,8 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -270,9 +274,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "statementAlias": "EXPLAIN", "connectionId": null, @@ -294,9 +296,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain5.out b/tests/data/parser/parseExplain5.out index 3fc536ec9..7cc1b5e8a 100644 --- a/tests/data/parser/parseExplain5.out +++ b/tests/data/parser/parseExplain5.out @@ -2,6 +2,8 @@ "query": "DESC phpmyadmin.pma__users;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESC phpmyadmin.pma__users;", "len": 27, "last": 27, @@ -88,8 +90,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -100,12 +102,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -123,9 +125,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain6.out b/tests/data/parser/parseExplain6.out index 471932aa0..2795663f4 100644 --- a/tests/data/parser/parseExplain6.out +++ b/tests/data/parser/parseExplain6.out @@ -2,6 +2,8 @@ "query": "DESCRIBE Shop 'N%';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESCRIBE Shop 'N%';\n", "len": 20, "last": 20, @@ -99,8 +101,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -111,12 +113,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -134,9 +136,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain7.out b/tests/data/parser/parseExplain7.out index 74276240f..0a66a054b 100644 --- a/tests/data/parser/parseExplain7.out +++ b/tests/data/parser/parseExplain7.out @@ -2,6 +2,8 @@ "query": "DESCRIBE Shop 'Name';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESCRIBE Shop 'Name';", "len": 21, "last": 21, @@ -88,8 +90,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -100,12 +102,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -123,9 +125,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain8.out b/tests/data/parser/parseExplain8.out index cdaec43f9..ec8e2f050 100644 --- a/tests/data/parser/parseExplain8.out +++ b/tests/data/parser/parseExplain8.out @@ -2,6 +2,8 @@ "query": "DESCRIBE Shop N__e;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESCRIBE Shop N__e;", "len": 19, "last": 19, @@ -86,8 +88,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@11" @@ -98,12 +100,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -121,9 +123,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplain9.out b/tests/data/parser/parseExplain9.out index 9d1d95fc1..77350d8c4 100644 --- a/tests/data/parser/parseExplain9.out +++ b/tests/data/parser/parseExplain9.out @@ -2,6 +2,8 @@ "query": "DESCRIBE tablename 581", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "DESCRIBE tablename 581", "len": 22, "last": 22, @@ -75,8 +77,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -89,12 +91,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -112,9 +114,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplainErr.out b/tests/data/parser/parseExplainErr.out index 33f80ed44..12895f5f5 100644 --- a/tests/data/parser/parseExplainErr.out +++ b/tests/data/parser/parseExplainErr.out @@ -2,6 +2,8 @@ "query": "EXPLAIN FOR SELECT *", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN FOR SELECT *", "len": 20, "last": 20, @@ -95,8 +97,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -109,12 +111,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -170,9 +172,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplainErr1.out b/tests/data/parser/parseExplainErr1.out index 370b0cbe0..6cb11760d 100644 --- a/tests/data/parser/parseExplainErr1.out +++ b/tests/data/parser/parseExplainErr1.out @@ -2,6 +2,8 @@ "query": "ANALYZE SELECT FROM", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "ANALYZE SELECT FROM", "len": 19, "last": 19, @@ -71,8 +73,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -85,12 +87,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -99,6 +101,29 @@ "@type": "PhpMyAdmin\\SqlParser\\Statements\\ExplainStatement", "bodyParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [ + { + "@type": "PhpMyAdmin\\SqlParser\\Exceptions\\ParserException", + "token": { + "@type": "@8" + }, + "message": "An expression was expected.", + "code": 0, + "file": "/src/Parser.php", + "line": 639 + }, + { + "@type": "PhpMyAdmin\\SqlParser\\Exceptions\\ParserException", + "token": { + "@type": "@9" + }, + "message": "An expression was expected.", + "code": 0, + "file": "/src/Parser.php", + "line": 639 + } + ], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 4, @@ -144,30 +169,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [ - { - "@type": "PhpMyAdmin\\SqlParser\\Exceptions\\ParserException", - "token": { - "@type": "@8" - }, - "message": "An expression was expected.", - "code": 0, - "file": "/src/Parser.php", - "line": 620 - }, - { - "@type": "PhpMyAdmin\\SqlParser\\Exceptions\\ParserException", - "token": { - "@type": "@9" - }, - "message": "An expression was expected.", - "code": 0, - "file": "/src/Parser.php", - "line": 620 - } - ] + "brackets": 0 }, "statementAlias": "ANALYZE", "connectionId": null, @@ -182,9 +184,7 @@ "last": 2 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplainErr2.out b/tests/data/parser/parseExplainErr2.out index e30299b13..3d120b466 100644 --- a/tests/data/parser/parseExplainErr2.out +++ b/tests/data/parser/parseExplainErr2.out @@ -2,6 +2,8 @@ "query": "EXPLAIN ANALYZE FROM TABLE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN ANALYZE FROM TABLE", "len": 26, "last": 26, @@ -93,8 +95,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -107,12 +109,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -133,9 +135,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseExplainErr3.out b/tests/data/parser/parseExplainErr3.out index e19fba533..547269fff 100644 --- a/tests/data/parser/parseExplainErr3.out +++ b/tests/data/parser/parseExplainErr3.out @@ -2,6 +2,8 @@ "query": "EXPLAIN ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "EXPLAIN ", "len": 8, "last": 8, @@ -38,8 +40,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -52,12 +54,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -75,9 +77,7 @@ "last": 1 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsert.out b/tests/data/parser/parseInsert.out index cadf6f4a6..67d7a3649 100644 --- a/tests/data/parser/parseInsert.out +++ b/tests/data/parser/parseInsert.out @@ -2,6 +2,8 @@ "query": "INSERT LOW_PRIORITY\nINTO\n users(`id`, `username`, `password`)\nVALUES\n (1, \"Dan\", \"5d41402abc4b2a76b9719d911017c592\"),\n (2, \"Paul\", \"7d793037a0760186574b0282f2f435e7\");", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT LOW_PRIORITY\nINTO\n users(`id`, `username`, `password`)\nVALUES\n (1, \"Dan\", \"5d41402abc4b2a76b9719d911017c592\"),\n (2, \"Paul\", \"7d793037a0760186574b0282f2f435e7\");", "len": 176, "last": 176, @@ -468,8 +470,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@49" @@ -480,12 +482,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -557,9 +559,7 @@ "last": 38 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertErr.out b/tests/data/parser/parseInsertErr.out index 4bbe19fce..e2369dcb2 100644 --- a/tests/data/parser/parseInsertErr.out +++ b/tests/data/parser/parseInsertErr.out @@ -2,6 +2,8 @@ "query": "INSERT SELECT\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT SELECT\n", "len": 14, "last": 14, @@ -60,8 +62,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -74,12 +76,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -124,9 +126,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertErr2.out b/tests/data/parser/parseInsertErr2.out index c02e7f629..5ee4e61b2 100644 --- a/tests/data/parser/parseInsertErr2.out +++ b/tests/data/parser/parseInsertErr2.out @@ -2,6 +2,8 @@ "query": "INSERT INTO x \"string\"\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO x \"string\"\n\n", "len": 24, "last": 24, @@ -106,8 +108,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -164,9 +166,7 @@ "last": 5 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertFunction.out b/tests/data/parser/parseInsertFunction.out index c70f247b0..b32ce07f2 100644 --- a/tests/data/parser/parseInsertFunction.out +++ b/tests/data/parser/parseInsertFunction.out @@ -2,6 +2,8 @@ "query": "INSERT INTO labels(`label`)\nVALUES (concat('A', ' ', 'label'));", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO labels(`label`)\nVALUES (concat('A', ' ', 'label'));", "len": 63, "last": 63, @@ -290,8 +292,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@32" @@ -302,12 +304,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -358,9 +360,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertIntoErr.out b/tests/data/parser/parseInsertIntoErr.out index 5c2b2d9a0..91576fa61 100644 --- a/tests/data/parser/parseInsertIntoErr.out +++ b/tests/data/parser/parseInsertIntoErr.out @@ -2,6 +2,8 @@ "query": "INSERT INTO x INSERT\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO x INSERT\n\n", "len": 22, "last": 22, @@ -104,8 +106,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -118,12 +120,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertIntoSet.out b/tests/data/parser/parseInsertIntoSet.out index 0efa0a2c6..1f4164d4e 100644 --- a/tests/data/parser/parseInsertIntoSet.out +++ b/tests/data/parser/parseInsertIntoSet.out @@ -2,6 +2,8 @@ "query": "INSERT INTO aa SET = INET6_ATON('::ffff:8.8.8.8')", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO aa SET = INET6_ATON('::ffff:8.8.8.8')", "len": 50, "last": 50, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -190,12 +192,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -240,9 +242,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertOnDuplicateKey.out b/tests/data/parser/parseInsertOnDuplicateKey.out index 23845f5cc..c50bcd15d 100644 --- a/tests/data/parser/parseInsertOnDuplicateKey.out +++ b/tests/data/parser/parseInsertOnDuplicateKey.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `champs` (`id`,`val`) VALUES (412,'Thresh')\nON DUPLICATE KEY UPDATE `id`=412,`val`='Thresh'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `champs` (`id`,`val`) VALUES (412,'Thresh')\nON DUPLICATE KEY UPDATE `id`=412,`val`='Thresh'", "len": 103, "last": 103, @@ -409,8 +411,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -423,12 +425,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -493,9 +495,7 @@ "last": 34 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertOnDuplicateKeyErr.out b/tests/data/parser/parseInsertOnDuplicateKeyErr.out index 7374db103..c44a18842 100644 --- a/tests/data/parser/parseInsertOnDuplicateKeyErr.out +++ b/tests/data/parser/parseInsertOnDuplicateKeyErr.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `champs` (`id`,`val`) VALUES (412,'Thresh')\nON DUPLICATE KEY `id`=412,`val`='Thresh'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `champs` (`id`,`val`) VALUES (412,'Thresh')\nON DUPLICATE KEY `id`=412,`val`='Thresh'", "len": 96, "last": 96, @@ -387,8 +389,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -401,12 +403,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -460,9 +462,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertSelect.out b/tests/data/parser/parseInsertSelect.out index e29aaeb21..af65d831a 100644 --- a/tests/data/parser/parseInsertSelect.out +++ b/tests/data/parser/parseInsertSelect.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `a` (`value`) SELECT `b`.`value` FROM `b`", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `a` (`value`) SELECT `b`.`value` FROM `b`", "len": 53, "last": 53, @@ -229,8 +231,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -243,12 +245,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -334,9 +336,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertSelectOnDuplicateKey.out b/tests/data/parser/parseInsertSelectOnDuplicateKey.out index 33df77704..4143bd227 100644 --- a/tests/data/parser/parseInsertSelectOnDuplicateKey.out +++ b/tests/data/parser/parseInsertSelectOnDuplicateKey.out @@ -2,6 +2,8 @@ "query": "INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO tbl SELECT * FROM bar ON DUPLICATE KEY UPDATE baz = 1", "len": 65, "last": 65, @@ -319,8 +321,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -333,12 +335,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -428,9 +430,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertSet.out b/tests/data/parser/parseInsertSet.out index 3ca3cc5f7..7f639358f 100644 --- a/tests/data/parser/parseInsertSet.out +++ b/tests/data/parser/parseInsertSet.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `a` (`value`) SET `value` = '123'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `a` (`value`) SET `value` = '123'", "len": 45, "last": 45, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -275,9 +277,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseInsertSetOnDuplicateKey.out b/tests/data/parser/parseInsertSetOnDuplicateKey.out index f93b48ac7..36d2a1e6d 100644 --- a/tests/data/parser/parseInsertSetOnDuplicateKey.out +++ b/tests/data/parser/parseInsertSetOnDuplicateKey.out @@ -2,6 +2,8 @@ "query": "INSERT INTO `a` (`value`) SET `value` = '123' ON DUPLICATE KEY UPDATE `value` = '1234'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO `a` (`value`) SET `value` = '123' ON DUPLICATE KEY UPDATE `value` = '1234'", "len": 86, "last": 86, @@ -363,8 +365,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -377,12 +379,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -435,9 +437,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLimitErr1.out b/tests/data/parser/parseLimitErr1.out index e7d10ee2a..ae4729209 100644 --- a/tests/data/parser/parseLimitErr1.out +++ b/tests/data/parser/parseLimitErr1.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM test LIMIT 1 OFFSET OFFSET 2;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM test LIMIT 1 OFFSET OFFSET 2;", "len": 43, "last": 43, @@ -222,8 +224,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@25" @@ -234,12 +236,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -295,9 +297,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLimitErr2.out b/tests/data/parser/parseLimitErr2.out index 0192f9d13..e44cfccc0 100644 --- a/tests/data/parser/parseLimitErr2.out +++ b/tests/data/parser/parseLimitErr2.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM test LIMIT 1 OFFSET", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM test LIMIT 1 OFFSET", "len": 33, "last": 33, @@ -165,8 +167,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -179,12 +181,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -240,9 +242,7 @@ "last": 12 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad1.out b/tests/data/parser/parseLoad1.out index d7bd9169d..b78d96d19 100644 --- a/tests/data/parser/parseLoad1.out +++ b/tests/data/parser/parseLoad1.out @@ -2,6 +2,8 @@ "query": "LOAD DATA CONCURRENT INFILE 'employee1.txt' INTO TABLE employee;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA CONCURRENT INFILE 'employee1.txt' INTO TABLE employee;", "len": 64, "last": 64, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -241,9 +243,7 @@ "last": 12 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad2.out b/tests/data/parser/parseLoad2.out index 9039adda7..cfa99f86c 100644 --- a/tests/data/parser/parseLoad2.out +++ b/tests/data/parser/parseLoad2.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' INTO TABLE test FIELDS TERMINATED BY ',' IGNORE 1 LINES;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' INTO TABLE test FIELDS TERMINATED BY ',' IGNORE 1 LINES;", "len": 89, "last": 89, @@ -288,8 +290,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -300,12 +302,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -379,9 +381,7 @@ "last": 23 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad3.out b/tests/data/parser/parseLoad3.out index a57998f2f..eee5e82cc 100644 --- a/tests/data/parser/parseLoad3.out +++ b/tests/data/parser/parseLoad3.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE 'employee3.txt' INTO TABLE employee FIELDS TERMINATED BY ',' ENCLOSED BY '\"';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE 'employee3.txt' INTO TABLE employee FIELDS TERMINATED BY ',' ENCLOSED BY '\"';", "len": 94, "last": 94, @@ -264,8 +266,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@28" @@ -276,12 +278,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -361,9 +363,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad4.out b/tests/data/parser/parseLoad4.out index de4f1817a..e9baf6735 100644 --- a/tests/data/parser/parseLoad4.out +++ b/tests/data/parser/parseLoad4.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nCHARACTER SET 'utf8'\nCOLUMNS TERMINATED BY ','\nLINES TERMINATED BY ';'\nIGNORE 1 LINES\n(col1, col2)\nSET @a = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nCHARACTER SET 'utf8'\nCOLUMNS TERMINATED BY ','\nLINES TERMINATED BY ';'\nIGNORE 1 LINES\n(col1, col2)\nSET @a = 1;", "len": 166, "last": 166, @@ -589,8 +591,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@60" @@ -601,12 +603,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -725,9 +727,7 @@ "last": 49 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad5.out b/tests/data/parser/parseLoad5.out index 8cce16ae2..731307e82 100644 --- a/tests/data/parser/parseLoad5.out +++ b/tests/data/parser/parseLoad5.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' REPLACE INTO TABLE test COLUMNS TERMINATED BY ',' IGNORE 1 ROWS;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' REPLACE INTO TABLE test COLUMNS TERMINATED BY ',' IGNORE 1 ROWS;", "len": 98, "last": 98, @@ -310,8 +312,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@33" @@ -322,12 +324,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -401,9 +403,7 @@ "last": 25 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad6.out b/tests/data/parser/parseLoad6.out index 3e8e16d46..b4124931c 100644 --- a/tests/data/parser/parseLoad6.out +++ b/tests/data/parser/parseLoad6.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nPARTITION (p0, p1, p2)\nCHARACTER SET 'utf8'\nCOLUMNS TERMINATED BY ','\nLINES TERMINATED BY ';'\nIGNORE 1 LINES\n(col1, col2)\nSET @a = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nPARTITION (p0, p1, p2)\nCHARACTER SET 'utf8'\nCOLUMNS TERMINATED BY ','\nLINES TERMINATED BY ';'\nIGNORE 1 LINES\n(col1, col2)\nSET @a = 1;", "len": 189, "last": 189, @@ -721,8 +723,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@72" @@ -733,12 +735,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -869,9 +871,7 @@ "last": 61 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoad7.out b/tests/data/parser/parseLoad7.out index 6b976f8cb..a790638fd 100644 --- a/tests/data/parser/parseLoad7.out +++ b/tests/data/parser/parseLoad7.out @@ -2,6 +2,8 @@ "query": "SELECT a\ninto outfile '/tmp/temp.data'\nfields terminated by ',' enclosed by '\"' ESCAPED BY '$'\nFROM sometable", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT a\ninto outfile '/tmp/temp.data'\nfields terminated by ',' enclosed by '\"' ESCAPED BY '$'\nFROM sometable", "len": 109, "last": 109, @@ -317,8 +319,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -331,12 +333,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -446,9 +448,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoadErr1.out b/tests/data/parser/parseLoadErr1.out index 2573e918e..a8d63ec10 100644 --- a/tests/data/parser/parseLoadErr1.out +++ b/tests/data/parser/parseLoadErr1.out @@ -2,6 +2,8 @@ "query": "LOAD DATA CONCURRENT FROM 'employee1.txt' INTO TABLE employee;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA CONCURRENT FROM 'employee1.txt' INTO TABLE employee;", "len": 62, "last": 62, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -222,9 +224,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoadErr2.out b/tests/data/parser/parseLoadErr2.out index 3cef5d9d9..a4a09477b 100644 --- a/tests/data/parser/parseLoadErr2.out +++ b/tests/data/parser/parseLoadErr2.out @@ -2,6 +2,8 @@ "query": "LOAD DATA CONCURRENT ABC 'employee1.txt' INTO TABLE employee;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA CONCURRENT ABC 'employee1.txt' INTO TABLE employee;", "len": 61, "last": 61, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -222,9 +224,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoadErr3.out b/tests/data/parser/parseLoadErr3.out index 4c45d46f2..f6fb4762d 100644 --- a/tests/data/parser/parseLoadErr3.out +++ b/tests/data/parser/parseLoadErr3.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nDATA @a = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nDATA @a = 1;", "len": 68, "last": 68, @@ -270,8 +272,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -282,12 +284,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -333,9 +335,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoadErr4.out b/tests/data/parser/parseLoadErr4.out index e89699170..edc0911ee 100644 --- a/tests/data/parser/parseLoadErr4.out +++ b/tests/data/parser/parseLoadErr4.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO test\nDATA @a = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO test\nDATA @a = 1;", "len": 62, "last": 62, @@ -248,8 +250,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -260,12 +262,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -302,9 +304,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoadErr5.out b/tests/data/parser/parseLoadErr5.out index 0f90d7c2b..b49fcf801 100644 --- a/tests/data/parser/parseLoadErr5.out +++ b/tests/data/parser/parseLoadErr5.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\n@a = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\n@a = 1;", "len": 63, "last": 63, @@ -248,8 +250,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -260,12 +262,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -311,9 +313,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLoadErr6.out b/tests/data/parser/parseLoadErr6.out index 4c45d46f2..f6fb4762d 100644 --- a/tests/data/parser/parseLoadErr6.out +++ b/tests/data/parser/parseLoadErr6.out @@ -2,6 +2,8 @@ "query": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nDATA @a = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOAD DATA INFILE '/tmp/test.txt' IGNORE\nINTO TABLE test\nDATA @a = 1;", "len": 68, "last": 68, @@ -270,8 +272,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -282,12 +284,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -333,9 +335,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLock1.out b/tests/data/parser/parseLock1.out index f6467941f..f47140d02 100644 --- a/tests/data/parser/parseLock1.out +++ b/tests/data/parser/parseLock1.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS `t1` READ LOCAL;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS `t1` READ LOCAL;", "len": 43, "last": 43, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -222,9 +224,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLock2.out b/tests/data/parser/parseLock2.out index 6f9f3a6cf..241b76f30 100644 --- a/tests/data/parser/parseLock2.out +++ b/tests/data/parser/parseLock2.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS `t1` READ;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS `t1` READ;", "len": 32, "last": 32, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -200,9 +202,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLock3.out b/tests/data/parser/parseLock3.out index cdd180162..c58f70759 100644 --- a/tests/data/parser/parseLock3.out +++ b/tests/data/parser/parseLock3.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS `t1` LOW_PRIORITY WRITE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS `t1` LOW_PRIORITY WRITE;", "len": 46, "last": 46, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@20" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -222,9 +224,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLock4.out b/tests/data/parser/parseLock4.out index da4edff8a..da68df61c 100644 --- a/tests/data/parser/parseLock4.out +++ b/tests/data/parser/parseLock4.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS `t1` WRITE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS `t1` WRITE;", "len": 33, "last": 33, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -200,9 +202,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLock5.out b/tests/data/parser/parseLock5.out index c4a2af1ad..0c7fb12cb 100644 --- a/tests/data/parser/parseLock5.out +++ b/tests/data/parser/parseLock5.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS `t1` READ LOCAL, table2 AS `t2` WRITE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS `t1` READ LOCAL, table2 AS `t2` WRITE;", "len": 60, "last": 60, @@ -277,8 +279,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@30" @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -337,9 +339,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLock6.out b/tests/data/parser/parseLock6.out index 1e8b47897..5de30c781 100644 --- a/tests/data/parser/parseLock6.out +++ b/tests/data/parser/parseLock6.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 READ LOCAL, table2 AS `t2` WRITE;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 READ LOCAL, table2 AS `t2` WRITE;", "len": 52, "last": 52, @@ -233,8 +235,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@26" @@ -245,12 +247,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -293,9 +295,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr1.out b/tests/data/parser/parseLockErr1.out index 1735c6711..753a1779f 100644 --- a/tests/data/parser/parseLockErr1.out +++ b/tests/data/parser/parseLockErr1.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1", "len": 18, "last": 18, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,12 +89,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -121,9 +123,7 @@ "last": 5 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr10.out b/tests/data/parser/parseLockErr10.out index fa12f4fe5..4462585eb 100644 --- a/tests/data/parser/parseLockErr10.out +++ b/tests/data/parser/parseLockErr10.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS table1 LOW_PRIORITY WRITE abc", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS table1 LOW_PRIORITY WRITE abc", "len": 51, "last": 51, @@ -183,8 +185,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -197,12 +199,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -231,9 +233,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr2.out b/tests/data/parser/parseLockErr2.out index 6ecf53c68..625d4f64d 100644 --- a/tests/data/parser/parseLockErr2.out +++ b/tests/data/parser/parseLockErr2.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS `t1` LOCAL", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS `t1` LOCAL", "len": 32, "last": 32, @@ -141,8 +143,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -155,12 +157,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -189,9 +191,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr3.out b/tests/data/parser/parseLockErr3.out index 4deee6d91..e5419ed7e 100644 --- a/tests/data/parser/parseLockErr3.out +++ b/tests/data/parser/parseLockErr3.out @@ -2,6 +2,8 @@ "query": "-- TABLES misspelled\nLOCK TABLE table1 AS t1 READ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- TABLES misspelled\nLOCK TABLE table1 AS t1 READ", "len": 49, "last": 49, @@ -163,8 +165,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -177,12 +179,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -196,9 +198,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr4.out b/tests/data/parser/parseLockErr4.out index cc2678b96..563bd9915 100644 --- a/tests/data/parser/parseLockErr4.out +++ b/tests/data/parser/parseLockErr4.out @@ -2,6 +2,8 @@ "query": "-- missing TABLES keyword\nLOCK table1 READ LOCAL", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- missing TABLES keyword\nLOCK table1 READ LOCAL", "len": 48, "last": 48, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -152,9 +154,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr5.out b/tests/data/parser/parseLockErr5.out index 0b1ed4372..2313592e7 100644 --- a/tests/data/parser/parseLockErr5.out +++ b/tests/data/parser/parseLockErr5.out @@ -2,6 +2,8 @@ "query": "-- extraneous comma\nLOCK TABLES table1 READ LOCAL,", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- extraneous comma\nLOCK TABLES table1 READ LOCAL,", "len": 50, "last": 50, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -168,12 +170,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -202,9 +204,7 @@ "last": 12 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr6.out b/tests/data/parser/parseLockErr6.out index 7c37117c1..bb965d089 100644 --- a/tests/data/parser/parseLockErr6.out +++ b/tests/data/parser/parseLockErr6.out @@ -2,6 +2,8 @@ "query": "-- missing lock type\nLOCK TABLES table1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- missing lock type\nLOCK TABLES table1", "len": 39, "last": 39, @@ -97,8 +99,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -111,12 +113,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -145,9 +147,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr7.out b/tests/data/parser/parseLockErr7.out index 46b6fcd2c..54c20b9d0 100644 --- a/tests/data/parser/parseLockErr7.out +++ b/tests/data/parser/parseLockErr7.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS table1 non_keyword", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS table1 non_keyword", "len": 40, "last": 40, @@ -139,8 +141,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -153,12 +155,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -187,9 +189,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr8.out b/tests/data/parser/parseLockErr8.out index 76218dde3..53b6b10c6 100644 --- a/tests/data/parser/parseLockErr8.out +++ b/tests/data/parser/parseLockErr8.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS table1 READ AUTO_INCREMENT", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS table1 READ AUTO_INCREMENT", "len": 48, "last": 48, @@ -161,8 +163,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -175,12 +177,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -209,9 +211,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseLockErr9.out b/tests/data/parser/parseLockErr9.out index 2b2989021..d66100428 100644 --- a/tests/data/parser/parseLockErr9.out +++ b/tests/data/parser/parseLockErr9.out @@ -2,6 +2,8 @@ "query": "LOCK TABLES table1 AS table1 LOW_PRIORITY READ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "LOCK TABLES table1 AS table1 LOW_PRIORITY READ", "len": 46, "last": 46, @@ -161,8 +163,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -175,12 +177,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -209,9 +211,7 @@ "last": 13 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurge.out b/tests/data/parser/parsePurge.out index 34ac67667..be7cc1ca2 100644 --- a/tests/data/parser/parsePurge.out +++ b/tests/data/parser/parsePurge.out @@ -2,6 +2,8 @@ "query": "PURGE BINARY LOGS TO 'mysql-bin.010';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE BINARY LOGS TO 'mysql-bin.010';", "len": 37, "last": 37, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -171,9 +173,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurge2.out b/tests/data/parser/parsePurge2.out index 640d9cbb5..3400ae3d6 100644 --- a/tests/data/parser/parsePurge2.out +++ b/tests/data/parser/parsePurge2.out @@ -2,6 +2,8 @@ "query": "PURGE BINARY LOGS BEFORE '2008-04-02 22:46:26';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE BINARY LOGS BEFORE '2008-04-02 22:46:26';", "len": 47, "last": 47, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -171,9 +173,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurge3.out b/tests/data/parser/parsePurge3.out index 861753200..53ae9aa4a 100644 --- a/tests/data/parser/parsePurge3.out +++ b/tests/data/parser/parsePurge3.out @@ -2,6 +2,8 @@ "query": "PURGE MASTER LOGS BEFORE '2008-04-02 22:46:26';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE MASTER LOGS BEFORE '2008-04-02 22:46:26';", "len": 47, "last": 47, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -171,9 +173,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurge4.out b/tests/data/parser/parsePurge4.out index 5e5888a4d..233d41a8d 100644 --- a/tests/data/parser/parsePurge4.out +++ b/tests/data/parser/parsePurge4.out @@ -2,6 +2,8 @@ "query": "PURGE MASTER LOGS TO 'mysql-bin.010';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE MASTER LOGS TO 'mysql-bin.010';", "len": 37, "last": 37, @@ -130,8 +132,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@15" @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -171,9 +173,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurgeErr.out b/tests/data/parser/parsePurgeErr.out index f9ccfeec1..8b8118773 100644 --- a/tests/data/parser/parsePurgeErr.out +++ b/tests/data/parser/parsePurgeErr.out @@ -2,6 +2,8 @@ "query": "PURGE LOGS TO 'mysql-bin.010';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE LOGS TO 'mysql-bin.010';", "len": 30, "last": 30, @@ -108,8 +110,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -140,9 +142,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurgeErr2.out b/tests/data/parser/parsePurgeErr2.out index 0b95ebd01..664161bba 100644 --- a/tests/data/parser/parsePurgeErr2.out +++ b/tests/data/parser/parsePurgeErr2.out @@ -2,6 +2,8 @@ "query": "PURGE BINARY LOGS INTO;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE BINARY LOGS INTO;", "len": 23, "last": 23, @@ -106,8 +108,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@12" @@ -118,12 +120,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -138,9 +140,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsePurgeErr3.out b/tests/data/parser/parsePurgeErr3.out index 91ecad641..5563918d9 100644 --- a/tests/data/parser/parsePurgeErr3.out +++ b/tests/data/parser/parsePurgeErr3.out @@ -2,6 +2,8 @@ "query": "PURGE BINARY LOGS TO 'mysql.bin' INTO;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "PURGE BINARY LOGS TO 'mysql.bin' INTO;", "len": 38, "last": 38, @@ -152,8 +154,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@17" @@ -164,12 +166,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -193,9 +195,7 @@ "last": 11 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRename.out b/tests/data/parser/parseRename.out index de3130e90..0ea7038ee 100644 --- a/tests/data/parser/parseRename.out +++ b/tests/data/parser/parseRename.out @@ -2,6 +2,8 @@ "query": "RENAME TABLE foo TO bar", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME TABLE foo TO bar", "len": 23, "last": 23, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -173,9 +175,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRename2.out b/tests/data/parser/parseRename2.out index 65c33ca16..d3b39b881 100644 --- a/tests/data/parser/parseRename2.out +++ b/tests/data/parser/parseRename2.out @@ -2,6 +2,8 @@ "query": "RENAME TABLE foo TO bar, baz TO qux;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME TABLE foo TO bar, baz TO qux;", "len": 36, "last": 36, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@23" @@ -221,12 +223,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -286,9 +288,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRenameErr1.out b/tests/data/parser/parseRenameErr1.out index 1df5d4bbc..1be57eaab 100644 --- a/tests/data/parser/parseRenameErr1.out +++ b/tests/data/parser/parseRenameErr1.out @@ -2,6 +2,8 @@ "query": "RENAME TABLE a TO TO", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME TABLE a TO TO", "len": 20, "last": 20, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -164,9 +166,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRenameErr2.out b/tests/data/parser/parseRenameErr2.out index ac4f166dd..cbcbe0e39 100644 --- a/tests/data/parser/parseRenameErr2.out +++ b/tests/data/parser/parseRenameErr2.out @@ -2,6 +2,8 @@ "query": "RENAME TABLE TABLE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME TABLE TABLE", "len": 18, "last": 18, @@ -71,8 +73,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -85,12 +87,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -103,9 +105,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRenameErr3.out b/tests/data/parser/parseRenameErr3.out index 22deaa1e6..d93db1cd9 100644 --- a/tests/data/parser/parseRenameErr3.out +++ b/tests/data/parser/parseRenameErr3.out @@ -2,6 +2,8 @@ "query": "RENAME TABLE a FROM", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME TABLE a FROM", "len": 19, "last": 19, @@ -95,8 +97,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -109,12 +111,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -143,9 +145,7 @@ "from": [] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRenameErr4.out b/tests/data/parser/parseRenameErr4.out index c0ada1e7e..27eef2790 100644 --- a/tests/data/parser/parseRenameErr4.out +++ b/tests/data/parser/parseRenameErr4.out @@ -2,6 +2,8 @@ "query": "RENAME TABLE foo TO bar TO", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME TABLE foo TO bar TO", "len": 26, "last": 26, @@ -139,8 +141,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -153,12 +155,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -195,9 +197,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRenameErr5.out b/tests/data/parser/parseRenameErr5.out index a2debb5e9..7f0b8e429 100644 --- a/tests/data/parser/parseRenameErr5.out +++ b/tests/data/parser/parseRenameErr5.out @@ -2,6 +2,8 @@ "query": "RENAME\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RENAME\n", "len": 7, "last": 7, @@ -38,8 +40,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -52,12 +54,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -70,9 +72,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplace.out b/tests/data/parser/parseReplace.out index a4ab3347e..adcfece43 100644 --- a/tests/data/parser/parseReplace.out +++ b/tests/data/parser/parseReplace.out @@ -2,6 +2,8 @@ "query": "REPLACE LOW_PRIORITY\nINTO users(id, username)\nVALUES (1, 'Foo'), (2, 'Bar')", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE LOW_PRIORITY\nINTO users(id, username)\nVALUES (1, 'Foo'), (2, 'Bar')", "len": 75, "last": 75, @@ -354,8 +356,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -368,12 +370,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -438,9 +440,7 @@ "last": 29 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplace2.out b/tests/data/parser/parseReplace2.out index 2d083a100..b479a669b 100644 --- a/tests/data/parser/parseReplace2.out +++ b/tests/data/parser/parseReplace2.out @@ -2,6 +2,8 @@ "query": "REPLACE LOW_PRIORITY\nINTO users\nSET id = 1,\n username = 'Bar';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE LOW_PRIORITY\nINTO users\nSET id = 1,\n username = 'Bar';", "len": 65, "last": 65, @@ -279,8 +281,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -291,12 +293,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -346,9 +348,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceErr.out b/tests/data/parser/parseReplaceErr.out index c1734fc94..46b941187 100644 --- a/tests/data/parser/parseReplaceErr.out +++ b/tests/data/parser/parseReplaceErr.out @@ -2,6 +2,8 @@ "query": "REPLACE LOW_PRIORITY\nINTO users(id, username)\n(1, 'Foo'), (2, 'Bar')", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE LOW_PRIORITY\nINTO users(id, username)\n(1, 'Foo'), (2, 'Bar')", "len": 68, "last": 68, @@ -332,8 +334,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -346,12 +348,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -393,9 +395,7 @@ "last": 13 } ], - "brackets": 2, - "strict": false, - "errors": [] + "brackets": 2 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceErr2.out b/tests/data/parser/parseReplaceErr2.out index 6848a0afb..413e9ebdd 100644 --- a/tests/data/parser/parseReplaceErr2.out +++ b/tests/data/parser/parseReplaceErr2.out @@ -2,6 +2,8 @@ "query": "REPLACE SELECT\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE SELECT\n", "len": 15, "last": 15, @@ -60,8 +62,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -74,12 +76,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -122,9 +124,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceErr3.out b/tests/data/parser/parseReplaceErr3.out index d5d8047e6..c60a9ab49 100644 --- a/tests/data/parser/parseReplaceErr3.out +++ b/tests/data/parser/parseReplaceErr3.out @@ -2,6 +2,8 @@ "query": "REPLACE INTO x \"string\"\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE INTO x \"string\"\n\n", "len": 25, "last": 25, @@ -106,8 +108,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -162,9 +164,7 @@ "last": 5 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceIntoErr.out b/tests/data/parser/parseReplaceIntoErr.out index 2a8eb6f74..b117996c3 100644 --- a/tests/data/parser/parseReplaceIntoErr.out +++ b/tests/data/parser/parseReplaceIntoErr.out @@ -2,6 +2,8 @@ "query": "REPLACE INTO x INSERT\n\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE INTO x INSERT\n\n", "len": 23, "last": 23, @@ -104,8 +106,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -118,12 +120,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -175,9 +177,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceSelect.out b/tests/data/parser/parseReplaceSelect.out index 455a82755..d0d516dc7 100644 --- a/tests/data/parser/parseReplaceSelect.out +++ b/tests/data/parser/parseReplaceSelect.out @@ -2,6 +2,8 @@ "query": "REPLACE INTO `a` (`value`) SELECT value from `b`", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE INTO `a` (`value`) SELECT value from `b`", "len": 49, "last": 49, @@ -207,8 +209,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -221,12 +223,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -310,9 +312,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceSet.out b/tests/data/parser/parseReplaceSet.out index 5c9ab06cf..e52e7654e 100644 --- a/tests/data/parser/parseReplaceSet.out +++ b/tests/data/parser/parseReplaceSet.out @@ -2,6 +2,8 @@ "query": "REPLACE INTO `a` (`value`) SET value = '123'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE INTO `a` (`value`) SET value = '123'", "len": 44, "last": 44, @@ -209,8 +211,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -223,12 +225,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -273,9 +275,7 @@ "last": 16 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseReplaceValues.out b/tests/data/parser/parseReplaceValues.out index 0653493e8..39eea591e 100644 --- a/tests/data/parser/parseReplaceValues.out +++ b/tests/data/parser/parseReplaceValues.out @@ -2,6 +2,8 @@ "query": "REPLACE INTO `a` (`value`) VALUES ('123'), ('123')", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "REPLACE INTO `a` (`value`) VALUES ('123'), ('123')", "len": 50, "last": 50, @@ -242,8 +244,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -256,12 +258,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -319,9 +321,7 @@ "last": 19 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseRestore.out b/tests/data/parser/parseRestore.out index 51efec5b0..8d8492811 100644 --- a/tests/data/parser/parseRestore.out +++ b/tests/data/parser/parseRestore.out @@ -2,6 +2,8 @@ "query": "RESTORE TABLE my_table FROM \"/path/to/backup/directory\"", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "RESTORE TABLE my_table FROM \"/path/to/backup/directory\"", "len": 55, "last": 55, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -173,9 +175,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect.out b/tests/data/parser/parseSelect.out index 63acda424..430004876 100644 --- a/tests/data/parser/parseSelect.out +++ b/tests/data/parser/parseSelect.out @@ -2,6 +2,8 @@ "query": "SELECT ALL MAX_STATEMENT_TIME = 10\n 1 + 2 AS result,\n @idx,\n id,\n test.`users`.username AS `name`\nFROM\n `test`.users, posts\n PARTITION (p1, p2)\nWHERE\n id > 0\nORDER BY\n username DESC,\n id\nLIMIT 3 OFFSET 2;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT ALL MAX_STATEMENT_TIME = 10\n 1 + 2 AS result,\n @idx,\n id,\n test.`users`.username AS `name`\nFROM\n `test`.users, posts\n PARTITION (p1, p2)\nWHERE\n id > 0\nORDER BY\n username DESC,\n id\nLIMIT 3 OFFSET 2;", "len": 231, "last": 231, @@ -906,8 +908,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@88" @@ -918,12 +920,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1075,9 +1077,7 @@ "last": 78 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect10.out b/tests/data/parser/parseSelect10.out index dcca3913a..7da9c699d 100644 --- a/tests/data/parser/parseSelect10.out +++ b/tests/data/parser/parseSelect10.out @@ -2,6 +2,8 @@ "query": "SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT my_column FROM my_table WHERE BINARY(my_column) != BINARY(UPPER(my_column))\n", "len": 83, "last": 83, @@ -295,8 +297,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -309,12 +311,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -376,9 +378,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect11.out b/tests/data/parser/parseSelect11.out index dd2b32cf9..14b5e630d 100644 --- a/tests/data/parser/parseSelect11.out +++ b/tests/data/parser/parseSelect11.out @@ -2,6 +2,8 @@ "query": "SELECT 1 AND NOT 1\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1 AND NOT 1\n", "len": 19, "last": 19, @@ -128,8 +130,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -142,12 +144,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -188,9 +190,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect12.out b/tests/data/parser/parseSelect12.out index 745bc9d4f..4b77610fb 100644 --- a/tests/data/parser/parseSelect12.out +++ b/tests/data/parser/parseSelect12.out @@ -2,6 +2,8 @@ "query": "SELECT NOT 1 AS test", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT NOT 1 AS test", "len": 20, "last": 20, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -179,9 +181,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect13.out b/tests/data/parser/parseSelect13.out index 2a4c463e1..ad86257a5 100644 --- a/tests/data/parser/parseSelect13.out +++ b/tests/data/parser/parseSelect13.out @@ -2,6 +2,8 @@ "query": "SELECT post.*, post.username AS postusername, post.ipaddress AS ip, IF(post.visible = 2, 1, 0) AS isdeleted, user.*, userfield.*, usertextfield.*, icon.title as icontitle, icon.iconpath, avatar.avatarpath, NOT ISNULL(customavatar.userid) AS hascustomavatar, customavatar.dateline AS avatardateline,customavatar.width AS avwidth,customavatar.height AS avheight, spamlog.postid AS spamlog_postid, deletionlog.userid AS del_userid, deletionlog.username AS del_username, deletionlog.reason AS del_reason, editlog.userid AS edit_userid, editlog.username AS edit_username, editlog.dateline AS edit_dateline, editlog.reason AS edit_reason, editlog.hashistory, postparsed.pagetext_html, postparsed.hasimages, sigparsed.signatureparsed, sigparsed.hasimages AS sighasimages, sigpic.userid AS sigpic, sigpic.dateline AS sigpicdateline, sigpic.width AS sigpicwidth, sigpic.height AS sigpicheight, IF(displaygroupid=0, user.usergroupid, displaygroupid) AS displaygroupid, infractiongroupid , post_icon_list.icon_id_list, post_icon_list.is_auto AS icon_is_auto, approvedlog.modid AS approvedmodid, approvedlog.dateline AS approveddateline, approvedlog.status AS approvedstatus, approvedlog.info AS approvedinfo, movedlog.modid AS movedmodid, movedlog.dateline AS moveddateline, movedlog.status AS movedstatus, movedlog.info AS movedinfo, ( SELECT useragent FROM session WHERE userid=post.userid AND lastactivity > 1644859580 ORDER BY lastactivity DESC LIMIT 1 ) AS useragent, IF ( user.userid IS NOT NULL, (SELECT COUNT(usernoteid) FROM usernote AS usernote WHERE usernote.userid=user.userid AND usernote.priority>=0), 0 ) AS usernotecount , deletionlog.dateline AS del_dateline, scheduled_approval.defer_time AS vbpmal_approval_defer_time, additional_user_data.last_year_message_count, additional_user_data.last_year_reputation, additional_user_data.last_year_groan_count, paid_post_activation.activation_id AS paid_post_activation_id, alm_Model_UserData.credits FROM post AS post LEFT JOIN user AS user ON(user.userid = post.userid) LEFT JOIN userfield AS userfield ON(userfield.userid = user.userid) LEFT JOIN usertextfield AS usertextfield ON(usertextfield.userid = user.userid) LEFT JOIN icon AS icon ON(icon.iconid = post.iconid) LEFT JOIN avatar AS avatar ON(avatar.avatarid = user.avatarid) LEFT JOIN customavatar AS customavatar ON(customavatar.userid = user.userid) LEFT JOIN spamlog AS spamlog ON(spamlog.postid = post.postid) LEFT JOIN deletionlog AS deletionlog ON(post.postid = deletionlog.primaryid AND deletionlog.type = 'post') LEFT JOIN editlog AS editlog ON(editlog.postid = post.postid) LEFT JOIN postparsed AS postparsed ON(postparsed.postid = post.postid AND postparsed.styleid = 23 AND postparsed.languageid = 5) LEFT JOIN sigparsed AS sigparsed ON(sigparsed.userid = user.userid AND sigparsed.styleid = 23 AND sigparsed.languageid = 5) LEFT JOIN sigpic AS sigpic ON(sigpic.userid = post.userid) LEFT JOIN vbppim_post_icon_list AS post_icon_list ON post_icon_list.post_id=post.postid LEFT JOIN vbpmal_log AS approvedlog ON (approvedlog.itemid=post.postid AND approvedlog.action='postapprove') LEFT JOIN vbpmal_log AS movedlog ON (movedlog.itemid=post.postid AND movedlog.action='postmove') LEFT JOIN vbpmal_scheduled_post_approval AS scheduled_approval ON scheduled_approval.post_id = post.postid LEFT JOIN vbpsmt_additional_user_data AS additional_user_data ON additional_user_data.userid=post.userid LEFT JOIN market_pp_post_activation_mapping AS paid_post_activation ON paid_post_activation.post_id = post.postid LEFT JOIN alm_Model_UserData AS alm_Model_UserData ON alm_Model_UserData.user_id=user.userid WHERE post.postid IN (0,3254399,3254508,3254743,3254817,3254969,3255328,3255582,3257603,3257873,3258126,3258150,3258254,3258272,3258311,3260767,3260770,3260776,3261180,3261263,3261317,3261318) ORDER BY post.dateline", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT post.*, post.username AS postusername, post.ipaddress AS ip, IF(post.visible = 2, 1, 0) AS isdeleted, user.*, userfield.*, usertextfield.*, icon.title as icontitle, icon.iconpath, avatar.avatarpath, NOT ISNULL(customavatar.userid) AS hascustomavatar, customavatar.dateline AS avatardateline,customavatar.width AS avwidth,customavatar.height AS avheight, spamlog.postid AS spamlog_postid, deletionlog.userid AS del_userid, deletionlog.username AS del_username, deletionlog.reason AS del_reason, editlog.userid AS edit_userid, editlog.username AS edit_username, editlog.dateline AS edit_dateline, editlog.reason AS edit_reason, editlog.hashistory, postparsed.pagetext_html, postparsed.hasimages, sigparsed.signatureparsed, sigparsed.hasimages AS sighasimages, sigpic.userid AS sigpic, sigpic.dateline AS sigpicdateline, sigpic.width AS sigpicwidth, sigpic.height AS sigpicheight, IF(displaygroupid=0, user.usergroupid, displaygroupid) AS displaygroupid, infractiongroupid , post_icon_list.icon_id_list, post_icon_list.is_auto AS icon_is_auto, approvedlog.modid AS approvedmodid, approvedlog.dateline AS approveddateline, approvedlog.status AS approvedstatus, approvedlog.info AS approvedinfo, movedlog.modid AS movedmodid, movedlog.dateline AS moveddateline, movedlog.status AS movedstatus, movedlog.info AS movedinfo, ( SELECT useragent FROM session WHERE userid=post.userid AND lastactivity > 1644859580 ORDER BY lastactivity DESC LIMIT 1 ) AS useragent, IF ( user.userid IS NOT NULL, (SELECT COUNT(usernoteid) FROM usernote AS usernote WHERE usernote.userid=user.userid AND usernote.priority>=0), 0 ) AS usernotecount , deletionlog.dateline AS del_dateline, scheduled_approval.defer_time AS vbpmal_approval_defer_time, additional_user_data.last_year_message_count, additional_user_data.last_year_reputation, additional_user_data.last_year_groan_count, paid_post_activation.activation_id AS paid_post_activation_id, alm_Model_UserData.credits FROM post AS post LEFT JOIN user AS user ON(user.userid = post.userid) LEFT JOIN userfield AS userfield ON(userfield.userid = user.userid) LEFT JOIN usertextfield AS usertextfield ON(usertextfield.userid = user.userid) LEFT JOIN icon AS icon ON(icon.iconid = post.iconid) LEFT JOIN avatar AS avatar ON(avatar.avatarid = user.avatarid) LEFT JOIN customavatar AS customavatar ON(customavatar.userid = user.userid) LEFT JOIN spamlog AS spamlog ON(spamlog.postid = post.postid) LEFT JOIN deletionlog AS deletionlog ON(post.postid = deletionlog.primaryid AND deletionlog.type = 'post') LEFT JOIN editlog AS editlog ON(editlog.postid = post.postid) LEFT JOIN postparsed AS postparsed ON(postparsed.postid = post.postid AND postparsed.styleid = 23 AND postparsed.languageid = 5) LEFT JOIN sigparsed AS sigparsed ON(sigparsed.userid = user.userid AND sigparsed.styleid = 23 AND sigparsed.languageid = 5) LEFT JOIN sigpic AS sigpic ON(sigpic.userid = post.userid) LEFT JOIN vbppim_post_icon_list AS post_icon_list ON post_icon_list.post_id=post.postid LEFT JOIN vbpmal_log AS approvedlog ON (approvedlog.itemid=post.postid AND approvedlog.action='postapprove') LEFT JOIN vbpmal_log AS movedlog ON (movedlog.itemid=post.postid AND movedlog.action='postmove') LEFT JOIN vbpmal_scheduled_post_approval AS scheduled_approval ON scheduled_approval.post_id = post.postid LEFT JOIN vbpsmt_additional_user_data AS additional_user_data ON additional_user_data.userid=post.userid LEFT JOIN market_pp_post_activation_mapping AS paid_post_activation ON paid_post_activation.post_id = post.postid LEFT JOIN alm_Model_UserData AS alm_Model_UserData ON alm_Model_UserData.user_id=user.userid WHERE post.postid IN (0,3254399,3254508,3254743,3254817,3254969,3255328,3255582,3257603,3257873,3258126,3258150,3258254,3258272,3258311,3260767,3260770,3260776,3261180,3261263,3261317,3261318) ORDER BY post.dateline", "len": 3834, "last": 3834, @@ -11398,8 +11400,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -11412,12 +11414,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -12633,9 +12635,7 @@ "last": 1033 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect14.out b/tests/data/parser/parseSelect14.out index 8d773527b..427689626 100644 --- a/tests/data/parser/parseSelect14.out +++ b/tests/data/parser/parseSelect14.out @@ -2,6 +2,8 @@ "query": "SELECT tbl.id, NOT tbl.id FROM tbl", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT tbl.id, NOT tbl.id FROM tbl", "len": 34, "last": 34, @@ -196,8 +198,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -277,9 +279,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect15.out b/tests/data/parser/parseSelect15.out index 4f19cb7f4..40f2c4da2 100644 --- a/tests/data/parser/parseSelect15.out +++ b/tests/data/parser/parseSelect15.out @@ -2,6 +2,8 @@ "query": "SELECT `````` FROM ``````;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT `````` FROM ``````;", "len": 26, "last": 26, @@ -108,8 +110,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -177,9 +179,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect16.out b/tests/data/parser/parseSelect16.out index bd5d6e0f7..f2e30925a 100644 --- a/tests/data/parser/parseSelect16.out +++ b/tests/data/parser/parseSelect16.out @@ -2,6 +2,8 @@ "query": "SELECT\np.aa,\np.bb,\nCASE\nWHEN p.cc = 'Y' and dd = 'Found' then '99.99999'\nWHEN p.cc = '' and dd = 'Found' then '00.00000'\n ELSE '99.99999' END as RR,\nCASE\nWHEN dd = 'Found' then 'Y'\n ELSE 'N' END as RRI,\nCASE\n\tWHEN (SELECT MAX(cd) from LSA act group by act.an having p.acn = act.an) > '2021-01-28' THEN '06/30/2020'\n WHEN p.co < '2021-01-28' THEN '12/31/2019'\n ELSE '06/30/2020' END as DAOD\nFROM `LTKP` p\nleft join `LQA` qa\non qa.pi = p.ID\nleft join LSA act\non p.acn = act.an\nwhere p.a =1 and p.mr = 1 and p.sc<> '23' and qa.qt = 'TEXT' and p.tl = \"TEXT\" and qa.a = 1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT\np.aa,\np.bb,\nCASE\nWHEN p.cc = 'Y' and dd = 'Found' then '99.99999'\nWHEN p.cc = '' and dd = 'Found' then '00.00000'\n ELSE '99.99999' END as RR,\nCASE\nWHEN dd = 'Found' then 'Y'\n ELSE 'N' END as RRI,\nCASE\n\tWHEN (SELECT MAX(cd) from LSA act group by act.an having p.acn = act.an) > '2021-01-28' THEN '06/30/2020'\n WHEN p.co < '2021-01-28' THEN '12/31/2019'\n ELSE '06/30/2020' END as DAOD\nFROM `LTKP` p\nleft join `LQA` qa\non qa.pi = p.ID\nleft join LSA act\non p.acn = act.an\nwhere p.a =1 and p.mr = 1 and p.sc<> '23' and qa.qt = 'TEXT' and p.tl = \"TEXT\" and qa.a = 1", "len": 579, "last": 579, @@ -2908,8 +2910,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -2922,12 +2924,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -3341,9 +3343,7 @@ "last": 261 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect2.out b/tests/data/parser/parseSelect2.out index 47b648daa..2a24adf33 100644 --- a/tests/data/parser/parseSelect2.out +++ b/tests/data/parser/parseSelect2.out @@ -2,6 +2,8 @@ "query": "SELECT (SELECT 'foo') bar, (SELECT 'baz') AS qux, a as b FROM tabl;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT (SELECT 'foo') bar, (SELECT 'baz') AS qux, a as b FROM tabl;", "len": 67, "last": 67, @@ -376,8 +378,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@39" @@ -388,12 +390,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -465,9 +467,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect3.out b/tests/data/parser/parseSelect3.out index c84a55bb5..c1fa552c7 100644 --- a/tests/data/parser/parseSelect3.out +++ b/tests/data/parser/parseSelect3.out @@ -2,6 +2,8 @@ "query": "SELECT left_tbl.*\nFROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\nWHERE right_tbl.id IS NULL;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT left_tbl.*\nFROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\nWHERE right_tbl.id IS NULL;", "len": 109, "last": 109, @@ -418,8 +420,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@42" @@ -430,12 +432,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -525,9 +527,7 @@ "last": 34 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect4.out b/tests/data/parser/parseSelect4.out index cf799a2d0..e1a135779 100644 --- a/tests/data/parser/parseSelect4.out +++ b/tests/data/parser/parseSelect4.out @@ -2,6 +2,8 @@ "query": "SELECT *\n FROM test\n WHERE RIGHT(name, 2) = 'AB';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT *\n FROM test\n WHERE RIGHT(name, 2) = 'AB';\n", "len": 54, "last": 54, @@ -279,8 +281,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@30" @@ -291,12 +293,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -358,9 +360,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect5.out b/tests/data/parser/parseSelect5.out index b91dc40a0..e4aa314c4 100644 --- a/tests/data/parser/parseSelect5.out +++ b/tests/data/parser/parseSelect5.out @@ -2,6 +2,8 @@ "query": "SELECT c1, c2, c3\n /* Subquery in FROM list */\n FROM (SELECT C1, c2, c3 FROM test2) t1\n WHERE RIGHT(name, 2) = 'AB';\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT c1, c2, c3\n /* Subquery in FROM list */\n FROM (SELECT C1, c2, c3 FROM test2) t1\n WHERE RIGHT(name, 2) = 'AB';\n", "len": 123, "last": 123, @@ -545,8 +547,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@55" @@ -557,12 +559,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -644,9 +646,7 @@ "last": 44 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect6.out b/tests/data/parser/parseSelect6.out index 26d3c337c..6b325afca 100644 --- a/tests/data/parser/parseSelect6.out +++ b/tests/data/parser/parseSelect6.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n", "len": 100, "last": 100, @@ -592,8 +594,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -606,12 +608,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -723,9 +725,7 @@ "last": 51 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect7.out b/tests/data/parser/parseSelect7.out index 08d0457e8..b35f45978 100644 --- a/tests/data/parser/parseSelect7.out +++ b/tests/data/parser/parseSelect7.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)", "len": 119, "last": 119, @@ -603,8 +605,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -617,12 +619,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -734,9 +736,7 @@ "last": 52 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect8.out b/tests/data/parser/parseSelect8.out index a37a87064..3745ad391 100644 --- a/tests/data/parser/parseSelect8.out +++ b/tests/data/parser/parseSelect8.out @@ -2,6 +2,8 @@ "query": "select * FROM (select Pop FROM MyTable) p join tadaa t where p.x=t.y", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select * FROM (select Pop FROM MyTable) p join tadaa t where p.x=t.y", "len": 68, "last": 68, @@ -383,8 +385,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -397,12 +399,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -483,9 +485,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelect9.out b/tests/data/parser/parseSelect9.out index 38a181207..c1c03d94b 100644 --- a/tests/data/parser/parseSelect9.out +++ b/tests/data/parser/parseSelect9.out @@ -2,6 +2,8 @@ "query": "SELECT casein_pipe, email_cp, name_first_cp, name_last_cp, purpose_pipe\nFROM (tbl_comp_person INNER JOIN `tbl_pipelist` ON tbl_comp_person.IDp = tbl_pipelist.IDp)\nWHERE casein_pipe > '2016-03-01' AND `campaign_id_pipe` = 24569 AND `weeksonlist_pipe` = 1\nORDER BY `tbl_pipelist`.`casein_pipe` ASC", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT casein_pipe, email_cp, name_first_cp, name_last_cp, purpose_pipe\nFROM (tbl_comp_person INNER JOIN `tbl_pipelist` ON tbl_comp_person.IDp = tbl_pipelist.IDp)\nWHERE casein_pipe > '2016-03-01' AND `campaign_id_pipe` = 24569 AND `weeksonlist_pipe` = 1\nORDER BY `tbl_pipelist`.`casein_pipe` ASC", "len": 296, "last": 296, @@ -785,8 +787,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -799,12 +801,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -949,9 +951,7 @@ "last": 68 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectAggregateWithPartitionAndAlias.out b/tests/data/parser/parseSelectAggregateWithPartitionAndAlias.out index 2f9568f23..69bc2ec40 100644 --- a/tests/data/parser/parseSelectAggregateWithPartitionAndAlias.out +++ b/tests/data/parser/parseSelectAggregateWithPartitionAndAlias.out @@ -2,6 +2,8 @@ "query": "SELECT *, COUNT(*) OVER(PARTITION BY `REGION`) AS \"count(REGION)\" FROM `world_borders`\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT *, COUNT(*) OVER(PARTITION BY `REGION`) AS \"count(REGION)\" FROM `world_borders`\n", "len": 87, "last": 87, @@ -299,8 +301,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -313,12 +315,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -380,9 +382,7 @@ "last": 24 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCase1.out b/tests/data/parser/parseSelectCase1.out index 778ec50f3..b2eaf36ea 100644 --- a/tests/data/parser/parseSelectCase1.out +++ b/tests/data/parser/parseSelectCase1.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end FROM a;", "len": 132, "last": 132, @@ -565,8 +567,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@57" @@ -577,12 +579,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -684,9 +686,7 @@ "last": 47 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCase2.out b/tests/data/parser/parseSelectCase2.out index 60cc7679f..43c8924fd 100644 --- a/tests/data/parser/parseSelectCase2.out +++ b/tests/data/parser/parseSelectCase2.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" else \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" else \"Other\" end FROM a;", "len": 138, "last": 138, @@ -589,8 +591,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@60" @@ -601,12 +603,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -697,9 +699,7 @@ "last": 49 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCase3.out b/tests/data/parser/parseSelectCase3.out index 86434bf74..a878ea7f8 100644 --- a/tests/data/parser/parseSelectCase3.out +++ b/tests/data/parser/parseSelectCase3.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" when 2=1 then \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" when 2=1 then \"Other\" end FROM a;", "len": 147, "last": 147, @@ -655,8 +657,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@66" @@ -667,12 +669,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -772,9 +774,7 @@ "last": 55 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCase4.out b/tests/data/parser/parseSelectCase4.out index 314df5458..856265dde 100644 --- a/tests/data/parser/parseSelectCase4.out +++ b/tests/data/parser/parseSelectCase4.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end FROM a;", "len": 145, "last": 145, @@ -633,8 +635,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@64" @@ -645,12 +647,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -763,9 +765,7 @@ "last": 53 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCase5.out b/tests/data/parser/parseSelectCase5.out index a93e7d9cd..844b99b5b 100644 --- a/tests/data/parser/parseSelectCase5.out +++ b/tests/data/parser/parseSelectCase5.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ntest=case 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ntest=case 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end FROM a;", "len": 150, "last": 150, @@ -655,8 +657,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@66" @@ -667,12 +669,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -734,9 +736,7 @@ "last": 55 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAlias1.out b/tests/data/parser/parseSelectCaseAlias1.out index 1616bf8a0..58f58e468 100644 --- a/tests/data/parser/parseSelectCaseAlias1.out +++ b/tests/data/parser/parseSelectCaseAlias1.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" when 2=1 then \"Other\" end /* */ AS /* */ foo FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" when 2=1 then \"Other\" end /* */ AS /* */ foo FROM a;", "len": 166, "last": 166, @@ -743,8 +745,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@74" @@ -755,12 +757,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -860,9 +862,7 @@ "last": 63 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAlias2.out b/tests/data/parser/parseSelectCaseAlias2.out index 4c033f9d8..4c1d8e080 100644 --- a/tests/data/parser/parseSelectCaseAlias2.out +++ b/tests/data/parser/parseSelectCaseAlias2.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" when 2=1 then \"Other\" end /* */ foo FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase /* */ when 1=1 then \"Some\" when 2=1 then \"Other\" end /* */ foo FROM a;", "len": 157, "last": 157, @@ -699,8 +701,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@70" @@ -711,12 +713,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -816,9 +818,7 @@ "last": 59 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAlias3.out b/tests/data/parser/parseSelectCaseAlias3.out index c45fb37df..8a12568d6 100644 --- a/tests/data/parser/parseSelectCaseAlias3.out +++ b/tests/data/parser/parseSelectCaseAlias3.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ntest=case 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end /* */ AS /* */ foo FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ntest=case 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end /* */ AS /* */ foo FROM a;", "len": 169, "last": 169, @@ -743,8 +745,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@74" @@ -755,12 +757,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -822,9 +824,7 @@ "last": 63 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAlias4.out b/tests/data/parser/parseSelectCaseAlias4.out index 2a42ff60e..f49d83209 100644 --- a/tests/data/parser/parseSelectCaseAlias4.out +++ b/tests/data/parser/parseSelectCaseAlias4.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ntest=case 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end /* */ foo FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ntest=case 1 /* */ when 1 then \"Some\" when 2 then \"Other\" end /* */ foo FROM a;", "len": 160, "last": 160, @@ -699,8 +701,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@70" @@ -711,12 +713,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -778,9 +780,7 @@ "last": 59 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAlias5.out b/tests/data/parser/parseSelectCaseAlias5.out index 3f956421f..5d2cd042d 100644 --- a/tests/data/parser/parseSelectCaseAlias5.out +++ b/tests/data/parser/parseSelectCaseAlias5.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS \"string value\" FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS \"string value\" FROM a;", "len": 150, "last": 150, @@ -609,8 +611,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@61" @@ -621,12 +623,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -728,9 +730,7 @@ "last": 51 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAlias6.out b/tests/data/parser/parseSelectCaseAlias6.out index fa02f8db9..69d24c652 100644 --- a/tests/data/parser/parseSelectCaseAlias6.out +++ b/tests/data/parser/parseSelectCaseAlias6.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS `symbol_value` FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS `symbol_value` FROM a;", "len": 150, "last": 150, @@ -611,8 +613,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@62" @@ -623,12 +625,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -730,9 +732,7 @@ "last": 51 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAliasErr1.out b/tests/data/parser/parseSelectCaseAliasErr1.out index e967ddd80..7a11f9065 100644 --- a/tests/data/parser/parseSelectCaseAliasErr1.out +++ b/tests/data/parser/parseSelectCaseAliasErr1.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS AS foo FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS AS foo FROM a;", "len": 142, "last": 142, @@ -631,8 +633,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@63" @@ -643,12 +645,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -750,9 +752,7 @@ "last": 53 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAliasErr2.out b/tests/data/parser/parseSelectCaseAliasErr2.out index 8daf45911..5d66665b0 100644 --- a/tests/data/parser/parseSelectCaseAliasErr2.out +++ b/tests/data/parser/parseSelectCaseAliasErr2.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS FROM a;", "len": 135, "last": 135, @@ -587,8 +589,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@59" @@ -599,12 +601,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -706,9 +708,7 @@ "last": 49 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAliasErr3.out b/tests/data/parser/parseSelectCaseAliasErr3.out index f40a5c451..b0b3367d7 100644 --- a/tests/data/parser/parseSelectCaseAliasErr3.out +++ b/tests/data/parser/parseSelectCaseAliasErr3.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS foo bar FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" else \"Other\" end AS foo bar FROM a;", "len": 143, "last": 143, @@ -631,8 +633,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@63" @@ -643,12 +645,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -750,9 +752,7 @@ "last": 53 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseAliasErr4.out b/tests/data/parser/parseSelectCaseAliasErr4.out index e014e3d87..4f3138bbf 100644 --- a/tests/data/parser/parseSelectCaseAliasErr4.out +++ b/tests/data/parser/parseSelectCaseAliasErr4.out @@ -2,6 +2,8 @@ "query": "SELECT CASE WHEN 2 IS NULL THEN \"this is true\" ELSE \"this is false\" END AS ;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT CASE WHEN 2 IS NULL THEN \"this is true\" ELSE \"this is false\" END AS ;", "len": 76, "last": 76, @@ -297,8 +299,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -309,12 +311,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -384,9 +386,7 @@ "last": 23 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseErr1.out b/tests/data/parser/parseSelectCaseErr1.out index c4a2b3e26..dee8070d2 100644 --- a/tests/data/parser/parseSelectCaseErr1.out +++ b/tests/data/parser/parseSelectCaseErr1.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name, case 1 then 1 then \"Some\" else \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name, case 1 then 1 then \"Some\" else \"Other\" end FROM a;", "len": 132, "last": 132, @@ -565,8 +567,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@57" @@ -577,12 +579,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -653,9 +655,7 @@ "last": 47 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseErr2.out b/tests/data/parser/parseSelectCaseErr2.out index c9202306a..139b9babd 100644 --- a/tests/data/parser/parseSelectCaseErr2.out +++ b/tests/data/parser/parseSelectCaseErr2.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase then 1=1 then \"Some\" else \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase then 1=1 then \"Some\" else \"Other\" end FROM a;", "len": 132, "last": 132, @@ -565,8 +567,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@57" @@ -577,12 +579,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -644,9 +646,7 @@ "last": 47 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseErr3.out b/tests/data/parser/parseSelectCaseErr3.out index 5fb110e0f..bb671a67e 100644 --- a/tests/data/parser/parseSelectCaseErr3.out +++ b/tests/data/parser/parseSelectCaseErr3.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase when 1=1 when \"Some\" else \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase when 1=1 when \"Some\" else \"Other\" end FROM a;", "len": 132, "last": 132, @@ -565,8 +567,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@57" @@ -577,12 +579,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -653,9 +655,7 @@ "last": 47 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseErr4.out b/tests/data/parser/parseSelectCaseErr4.out index 3eae62216..b543f8a7b 100644 --- a/tests/data/parser/parseSelectCaseErr4.out +++ b/tests/data/parser/parseSelectCaseErr4.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 then 1 when \"Some\" else \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 then 1 when \"Some\" else \"Other\" end FROM a;", "len": 132, "last": 132, @@ -565,8 +567,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@57" @@ -577,12 +579,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -653,9 +655,7 @@ "last": 47 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectCaseErr5.out b/tests/data/parser/parseSelectCaseErr5.out index 056950c29..bec6726d8 100644 --- a/tests/data/parser/parseSelectCaseErr5.out +++ b/tests/data/parser/parseSelectCaseErr5.out @@ -2,6 +2,8 @@ "query": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" when 2 when \"Other\" end FROM a;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select (SELECT name FROM mysql.help_category WHERE help_category_id = 1) as name,\ncase 1 when 1 then \"Some\" when 2 when \"Other\" end FROM a;", "len": 139, "last": 139, @@ -609,8 +611,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@61" @@ -621,12 +623,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -729,9 +731,7 @@ "last": 51 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectEndOptions1.out b/tests/data/parser/parseSelectEndOptions1.out index 73be5b215..9c96270a8 100644 --- a/tests/data/parser/parseSelectEndOptions1.out +++ b/tests/data/parser/parseSelectEndOptions1.out @@ -2,6 +2,8 @@ "query": "SELECT pid, name2 FROM tablename WHERE pid = 20 /* FOR UPDATE end_option */ FOR UPDATE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT pid, name2 FROM tablename WHERE pid = 20 /* FOR UPDATE end_option */ FOR UPDATE", "len": 86, "last": 86, @@ -266,8 +268,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -280,12 +282,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -361,9 +363,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectEndOptions2.out b/tests/data/parser/parseSelectEndOptions2.out index 176bd8916..5a2a67722 100644 --- a/tests/data/parser/parseSelectEndOptions2.out +++ b/tests/data/parser/parseSelectEndOptions2.out @@ -2,6 +2,8 @@ "query": "SELECT pid, name2 FROM tablename WHERE pid = 20\n/* LOCK IN SHARE MODE end_option */ LOCK IN SHARE MODE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT pid, name2 FROM tablename WHERE pid = 20\n/* LOCK IN SHARE MODE end_option */ LOCK IN SHARE MODE", "len": 102, "last": 102, @@ -266,8 +268,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -280,12 +282,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -361,9 +363,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectEndOptionsErr.out b/tests/data/parser/parseSelectEndOptionsErr.out index ff8abba57..125d83054 100644 --- a/tests/data/parser/parseSelectEndOptionsErr.out +++ b/tests/data/parser/parseSelectEndOptionsErr.out @@ -2,6 +2,8 @@ "query": "SELECT pid, name2 FROM tablename WHERE pid = 20\n/* USE both end_option, gives error */\nFOR UPDATE LOCK IN SHARE MODE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT pid, name2 FROM tablename WHERE pid = 20\n/* USE both end_option, gives error */\nFOR UPDATE LOCK IN SHARE MODE", "len": 116, "last": 116, @@ -288,8 +290,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -302,12 +304,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -384,9 +386,7 @@ "last": 23 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectErr1.out b/tests/data/parser/parseSelectErr1.out index 3e26d335d..0ac6b1b2c 100644 --- a/tests/data/parser/parseSelectErr1.out +++ b/tests/data/parser/parseSelectErr1.out @@ -2,6 +2,8 @@ "query": "SELECT ALL DISTINCT MAX_STATEMENT_TIME = 10\n 1 + 2 AS result,\n @idx,\n id,\n test.`users`.username AS\nFROM\n `test`.users\n PARTITION (p1, p2)\nWHERE\n id > 0\nORDER BY\n username DESC,\n id\nLIMIT 2, 3;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT ALL DISTINCT MAX_STATEMENT_TIME = 10\n 1 + 2 AS result,\n @idx,\n id,\n test.`users`.username AS\nFROM\n `test`.users\n PARTITION (p1, p2)\nWHERE\n id > 0\nORDER BY\n username DESC,\n id\nLIMIT 2, 3;", "len": 220, "last": 220, @@ -862,8 +864,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@84" @@ -874,12 +876,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1022,9 +1024,7 @@ "last": 74 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectErr2.out b/tests/data/parser/parseSelectErr2.out index ef08a9611..7d309e313 100644 --- a/tests/data/parser/parseSelectErr2.out +++ b/tests/data/parser/parseSelectErr2.out @@ -2,6 +2,8 @@ "query": "select * from foobar where foo = @\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select * from foobar where foo = @\n", "len": 35, "last": 35, @@ -187,8 +189,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -201,12 +203,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -268,9 +270,7 @@ "last": 14 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [ diff --git a/tests/data/parser/parseSelectExists.out b/tests/data/parser/parseSelectExists.out index 9a474209e..26a64993e 100644 --- a/tests/data/parser/parseSelectExists.out +++ b/tests/data/parser/parseSelectExists.out @@ -2,6 +2,8 @@ "query": "SELECT EXISTS(SELECT 1)\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT EXISTS(SELECT 1)\n", "len": 24, "last": 24, @@ -119,8 +121,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -133,12 +135,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -179,9 +181,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectGroupBy.out b/tests/data/parser/parseSelectGroupBy.out index 54ba8d130..96be1a9e6 100644 --- a/tests/data/parser/parseSelectGroupBy.out +++ b/tests/data/parser/parseSelectGroupBy.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM movie GROUP BY title;\nSELECT * FROM movie GROUP BY 1;\nSELECT * FROM movie GROUP BY year, title;\nSELECT * FROM movie GROUP BY year WITH ROLLUP;\nSELECT * FROM movie GROUP BY year, title WITH ROLLUP;\nSELECT * FROM movie GROUP BY year, title WITH ROLLUP ORDER BY year ASC LIMIT 0, 2;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM movie GROUP BY title;\nSELECT * FROM movie GROUP BY 1;\nSELECT * FROM movie GROUP BY year, title;\nSELECT * FROM movie GROUP BY year WITH ROLLUP;\nSELECT * FROM movie GROUP BY year, title WITH ROLLUP;\nSELECT * FROM movie GROUP BY year, title WITH ROLLUP ORDER BY year ASC LIMIT 0, 2;\n", "len": 294, "last": 294, @@ -1190,8 +1192,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -1202,12 +1204,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1655,9 +1657,7 @@ "last": 103 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectGroupByErr.out b/tests/data/parser/parseSelectGroupByErr.out index 4c66febd8..61ed67d52 100644 --- a/tests/data/parser/parseSelectGroupByErr.out +++ b/tests/data/parser/parseSelectGroupByErr.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM movie GROUP BY title WITH ROLLUP, year WITH ROLLUP;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM movie GROUP BY title WITH ROLLUP, year WITH ROLLUP;\n", "len": 66, "last": 66, @@ -242,8 +244,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@25" @@ -254,12 +256,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -331,9 +333,7 @@ "last": 17 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectGroupByWithComments.out b/tests/data/parser/parseSelectGroupByWithComments.out index ea0880960..0712c7912 100644 --- a/tests/data/parser/parseSelectGroupByWithComments.out +++ b/tests/data/parser/parseSelectGroupByWithComments.out @@ -2,6 +2,8 @@ "query": "SELECT id, title FROM movie GROUP BY movie.id, /* removed_field, */ title;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT id, title FROM movie GROUP BY movie.id, /* removed_field, */ title;\n", "len": 75, "last": 75, @@ -277,8 +279,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@29" @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -385,9 +387,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIndexHint1.out b/tests/data/parser/parseSelectIndexHint1.out index 8ff99df90..8bded44b4 100644 --- a/tests/data/parser/parseSelectIndexHint1.out +++ b/tests/data/parser/parseSelectIndexHint1.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM address FORCE INDEX (idx_fk_city_id) IGNORE KEY FOR GROUP BY (a, b,c) WHERE city_id<0;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM address FORCE INDEX (idx_fk_city_id) IGNORE KEY FOR GROUP BY (a, b,c) WHERE city_id<0;", "len": 101, "last": 101, @@ -453,8 +455,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@46" @@ -465,12 +467,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -569,9 +571,7 @@ ] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIndexHint2.out b/tests/data/parser/parseSelectIndexHint2.out index a8eccfacb..e69a971c9 100644 --- a/tests/data/parser/parseSelectIndexHint2.out +++ b/tests/data/parser/parseSelectIndexHint2.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM address USE INDEX (idx_fk_city_id) FORCE KEY FOR GROUP BY (a, b,c) WHERE city_id<0", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM address USE INDEX (idx_fk_city_id) FORCE KEY FOR GROUP BY (a, b,c) WHERE city_id<0", "len": 97, "last": 97, @@ -440,8 +442,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -454,12 +456,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -558,9 +560,7 @@ ] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIndexHintErr1.out b/tests/data/parser/parseSelectIndexHintErr1.out index 3b78e6dd2..37506750d 100644 --- a/tests/data/parser/parseSelectIndexHintErr1.out +++ b/tests/data/parser/parseSelectIndexHintErr1.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM address FORCE INT (idx_fk_city_id);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM address FORCE INT (idx_fk_city_id);", "len": 49, "last": 49, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -287,9 +289,7 @@ ] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIndexHintErr2.out b/tests/data/parser/parseSelectIndexHintErr2.out index 030022b28..3dac10b30 100644 --- a/tests/data/parser/parseSelectIndexHintErr2.out +++ b/tests/data/parser/parseSelectIndexHintErr2.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM address FORCE abc (idx_fk_city_id);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM address FORCE abc (idx_fk_city_id);", "len": 49, "last": 49, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -268,9 +270,7 @@ "index_hints": [] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIndexHintErr3.out b/tests/data/parser/parseSelectIndexHintErr3.out index 95324a21b..6e4511a38 100644 --- a/tests/data/parser/parseSelectIndexHintErr3.out +++ b/tests/data/parser/parseSelectIndexHintErr3.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM address FORCE INDEX FOR abc (idx_fk_city_id);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM address FORCE INDEX FOR abc (idx_fk_city_id);", "len": 59, "last": 59, @@ -242,8 +244,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@26" @@ -254,12 +256,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -312,9 +314,7 @@ "index_hints": [] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIndexHintErr4.out b/tests/data/parser/parseSelectIndexHintErr4.out index 5a2ef8e79..11aefcb03 100644 --- a/tests/data/parser/parseSelectIndexHintErr4.out +++ b/tests/data/parser/parseSelectIndexHintErr4.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM address FORCE INDEX FOR INT (idx_fk_city_id);", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM address FORCE INDEX FOR INT (idx_fk_city_id);", "len": 59, "last": 59, @@ -242,8 +244,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@26" @@ -254,12 +256,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -331,9 +333,7 @@ ] } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIntoOptions1.out b/tests/data/parser/parseSelectIntoOptions1.out index 0ed4172b5..5a21c6966 100644 --- a/tests/data/parser/parseSelectIntoOptions1.out +++ b/tests/data/parser/parseSelectIntoOptions1.out @@ -2,6 +2,8 @@ "query": "SELECT a,b,a+b INTO OUTFILE '/tmp/result.txt'\n FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'\n LINES TERMINATED BY '\\n'\n FROM test_table;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT a,b,a+b INTO OUTFILE '/tmp/result.txt'\n FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'\n LINES TERMINATED BY '\\n'\n FROM test_table;", "len": 152, "last": 152, @@ -442,8 +444,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@45" @@ -454,12 +456,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -594,9 +596,7 @@ "last": 36 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIntoOptions2.out b/tests/data/parser/parseSelectIntoOptions2.out index f180baa33..ff5f926d1 100644 --- a/tests/data/parser/parseSelectIntoOptions2.out +++ b/tests/data/parser/parseSelectIntoOptions2.out @@ -2,6 +2,8 @@ "query": "SELECT a,b,a+b INTO OUTFILE '/tmp/result.txt'\n COLUMNS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'\n LINES TERMINATED BY '\\n'\n FROM test_table;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT a,b,a+b INTO OUTFILE '/tmp/result.txt'\n COLUMNS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'\n LINES TERMINATED BY '\\n'\n FROM test_table;", "len": 153, "last": 153, @@ -442,8 +444,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@45" @@ -454,12 +456,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -594,9 +596,7 @@ "last": 36 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectIntoOptions3.out b/tests/data/parser/parseSelectIntoOptions3.out index c2ff58ce4..848072df2 100644 --- a/tests/data/parser/parseSelectIntoOptions3.out +++ b/tests/data/parser/parseSelectIntoOptions3.out @@ -2,6 +2,8 @@ "query": "SELECT a,b,a+b INTO OUTFILE '/tmp/result.txt'\n COLUMNS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'\n FROM test_table;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT a,b,a+b INTO OUTFILE '/tmp/result.txt'\n COLUMNS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'\n FROM test_table;", "len": 124, "last": 124, @@ -376,8 +378,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@39" @@ -388,12 +390,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -509,9 +511,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinCross.out b/tests/data/parser/parseSelectJoinCross.out index 0fa5684f2..0beec8cfd 100644 --- a/tests/data/parser/parseSelectJoinCross.out +++ b/tests/data/parser/parseSelectJoinCross.out @@ -2,6 +2,8 @@ "query": "SELECT table112.id,table112.bval1,table112.bval2,\ntable111.id,table111.aval1\nFROM table112\nCROSS JOIN table111", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT table112.id,table112.bval1,table112.bval2,\ntable111.id,table111.aval1\nFROM table112\nCROSS JOIN table111", "len": 110, "last": 110, @@ -350,8 +352,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -364,12 +366,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -478,9 +480,7 @@ "last": 29 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinMultiple.out b/tests/data/parser/parseSelectJoinMultiple.out index 2214146ef..9b3f3d651 100644 --- a/tests/data/parser/parseSelectJoinMultiple.out +++ b/tests/data/parser/parseSelectJoinMultiple.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM Orders NATURAL JOIN Items_Orders NATURAL JOIN Items\nWHERE customer= 'username'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM Orders NATURAL JOIN Items_Orders NATURAL JOIN Items\nWHERE customer= 'username'", "len": 92, "last": 92, @@ -264,8 +266,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -278,12 +280,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -378,9 +380,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinMultiple2.out b/tests/data/parser/parseSelectJoinMultiple2.out index ef6793587..eff9380b2 100644 --- a/tests/data/parser/parseSelectJoinMultiple2.out +++ b/tests/data/parser/parseSelectJoinMultiple2.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM orders\nNATURAL JOIN Items_Orders LEFT JOIN items on orders.item_id = items.id\nWHERE customer= 'username'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM orders\nNATURAL JOIN Items_Orders LEFT JOIN items on orders.item_id = items.id\nWHERE customer= 'username'", "len": 118, "last": 118, @@ -396,8 +398,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -410,12 +412,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -522,9 +524,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinNatural.out b/tests/data/parser/parseSelectJoinNatural.out index 0c01905d9..0a7efc6b1 100644 --- a/tests/data/parser/parseSelectJoinNatural.out +++ b/tests/data/parser/parseSelectJoinNatural.out @@ -2,6 +2,8 @@ "query": "SELECT id,aval1,cval1\nFROM table111\nNATURAL JOIN table113", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT id,aval1,cval1\nFROM table111\nNATURAL JOIN table113", "len": 57, "last": 57, @@ -185,8 +187,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -199,12 +201,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -293,9 +295,7 @@ "last": 14 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinNaturalLeft.out b/tests/data/parser/parseSelectJoinNaturalLeft.out index 013440e21..aa0bb119a 100644 --- a/tests/data/parser/parseSelectJoinNaturalLeft.out +++ b/tests/data/parser/parseSelectJoinNaturalLeft.out @@ -2,6 +2,8 @@ "query": "SELECT C.First_Name, C.Last_Name, O.title\nFROM Employee as C\nNATURAL LEFT JOIN JOb as O;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT C.First_Name, C.Last_Name, O.title\nFROM Employee as C\nNATURAL LEFT JOIN JOb as O;", "len": 88, "last": 88, @@ -374,8 +376,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@38" @@ -386,12 +388,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -480,9 +482,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinNaturalLeftOuter.out b/tests/data/parser/parseSelectJoinNaturalLeftOuter.out index 32ef596f8..f79a86975 100644 --- a/tests/data/parser/parseSelectJoinNaturalLeftOuter.out +++ b/tests/data/parser/parseSelectJoinNaturalLeftOuter.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM actor NATURAL LEFT OUTER JOIN film_actor;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM actor NATURAL LEFT OUTER JOIN film_actor;", "len": 55, "last": 55, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -240,9 +242,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinNaturalRight.out b/tests/data/parser/parseSelectJoinNaturalRight.out index 0774f688e..12e682ed4 100644 --- a/tests/data/parser/parseSelectJoinNaturalRight.out +++ b/tests/data/parser/parseSelectJoinNaturalRight.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM actor NATURAL RIGHT JOIN film_actor;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM actor NATURAL RIGHT JOIN film_actor;\n", "len": 51, "last": 51, @@ -165,8 +167,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -177,12 +179,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -251,9 +253,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinNaturalRightOuter.out b/tests/data/parser/parseSelectJoinNaturalRightOuter.out index 8bbdc24b3..9a27bc192 100644 --- a/tests/data/parser/parseSelectJoinNaturalRightOuter.out +++ b/tests/data/parser/parseSelectJoinNaturalRightOuter.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM actor NATURAL RIGHT OUTER JOIN film_actor;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM actor NATURAL RIGHT OUTER JOIN film_actor;", "len": 56, "last": 56, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,12 +168,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -240,9 +242,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectJoinStraight.out b/tests/data/parser/parseSelectJoinStraight.out index f4e23cee4..b9d614160 100644 --- a/tests/data/parser/parseSelectJoinStraight.out +++ b/tests/data/parser/parseSelectJoinStraight.out @@ -2,6 +2,8 @@ "query": "SELECT id,aval1,cval1\nFROM table111\nSTRAIGHT_JOIN table113 on table111.a = table113.b", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT id,aval1,cval1\nFROM table111\nSTRAIGHT_JOIN table113 on table111.a = table113.b", "len": 85, "last": 85, @@ -317,8 +319,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -331,12 +333,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -437,9 +439,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectNested.out b/tests/data/parser/parseSelectNested.out index cf5105ce4..62110edc3 100644 --- a/tests/data/parser/parseSelectNested.out +++ b/tests/data/parser/parseSelectNested.out @@ -2,6 +2,8 @@ "query": "SELECT (SELECT 'foo') as Bar, (SELECT 'baz') as fOo;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT (SELECT 'foo') as Bar, (SELECT 'baz') as fOo;", "len": 52, "last": 52, @@ -277,8 +279,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@30" @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -345,9 +347,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectOrderByComment.out b/tests/data/parser/parseSelectOrderByComment.out index fd0ff914e..7400b44e5 100644 --- a/tests/data/parser/parseSelectOrderByComment.out +++ b/tests/data/parser/parseSelectOrderByComment.out @@ -2,6 +2,8 @@ "query": "SELECT `one space` -- this is the SELECT\n FROM `Une table espace` -- this is the FROM\n ORDER BY `one space` ASC -- this is the order by", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT `one space` -- this is the SELECT\n FROM `Une table espace` -- this is the FROM\n ORDER BY `one space` ASC -- this is the order by", "len": 143, "last": 144, @@ -229,8 +231,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -243,12 +245,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -315,9 +317,7 @@ "last": 18 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectOrderByIsNull.out b/tests/data/parser/parseSelectOrderByIsNull.out index ae2dd61c1..8e465eced 100644 --- a/tests/data/parser/parseSelectOrderByIsNull.out +++ b/tests/data/parser/parseSelectOrderByIsNull.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM some_table ORDER BY some_col IS NULL;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM some_table ORDER BY some_col IS NULL;", "len": 51, "last": 51, @@ -198,8 +200,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@22" @@ -210,12 +212,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -282,9 +284,7 @@ "last": 14 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectOverAlias_mariadb_100600.out b/tests/data/parser/parseSelectOverAlias_mariadb_100600.out index 8522d15b1..2b0f06c21 100644 --- a/tests/data/parser/parseSelectOverAlias_mariadb_100600.out +++ b/tests/data/parser/parseSelectOverAlias_mariadb_100600.out @@ -2,6 +2,8 @@ "query": "select `products`.`pid` AS `pid`, `products`.`pname` as `name`, rank() over( partition by `products`.`pvalue` order by `products`.`pid` desc) AS `myrank` from `products` \n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "select `products`.`pid` AS `pid`, `products`.`pname` as `name`, rank() over( partition by `products`.`pvalue` order by `products`.`pid` desc) AS `myrank` from `products` \n", "len": 171, "last": 171, @@ -572,8 +574,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -586,12 +588,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -663,9 +665,7 @@ "last": 49 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectUnion.out b/tests/data/parser/parseSelectUnion.out index e81dd8c7c..cb0814237 100644 --- a/tests/data/parser/parseSelectUnion.out +++ b/tests/data/parser/parseSelectUnion.out @@ -2,6 +2,8 @@ "query": "(SELECT a FROM t WHERE a=1) UNION (SELECT a FROM t WHERE a=2)\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "(SELECT a FROM t WHERE a=1) UNION (SELECT a FROM t WHERE a=2)\n", "len": 62, "last": 62, @@ -396,8 +398,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -410,12 +412,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -535,9 +537,7 @@ "last": 33 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectUnion2.out b/tests/data/parser/parseSelectUnion2.out index 541a45faf..6305bb530 100644 --- a/tests/data/parser/parseSelectUnion2.out +++ b/tests/data/parser/parseSelectUnion2.out @@ -2,6 +2,8 @@ "query": "(SELECT DISTINCT `User`, `Host` FROM `mysql`.`user` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`db` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`tables_priv` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`columns_priv` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`procs_priv` ) ORDER BY `User` ASC, `Host` ASC", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "(SELECT DISTINCT `User`, `Host` FROM `mysql`.`user` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`db` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`tables_priv` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`columns_priv` ) UNION (SELECT DISTINCT `User`, `Host` FROM `mysql`.`procs_priv` ) ORDER BY `User` ASC, `Host` ASC", "len": 344, "last": 344, @@ -1208,8 +1210,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -1222,12 +1224,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1565,9 +1567,7 @@ "last": 107 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectWhere.out b/tests/data/parser/parseSelectWhere.out index 18663de1f..350b8c52f 100644 --- a/tests/data/parser/parseSelectWhere.out +++ b/tests/data/parser/parseSelectWhere.out @@ -2,6 +2,8 @@ "query": "SELECT * FROM film WHERE film_id = 10 OR film_id >= 20;\nSELECT * FROM film WHERE (film_id < 10) || (film_id > 20);\nSELECT * FROM film WHERE `film_id` != 10 AND `film_id` <= 20;\nSELECT * FROM film WHERE `film`.`film_id` <> 10 && `film`.`film_id` <= 20;\nSELECT * FROM film WHERE film.film_id < 20 XOR film.rating = 'PG-13';\nSELECT * FROM film WHERE /* film_id = */ film_id = 10;\nSELECT * FROM film WHERE NOT film_id > 10;\nSELECT * FROM film WHERE ! (film_id > 10);\nSELECT * FROM film WHERE description IS NULL;\nSELECT * FROM film WHERE description IS NOT NULL;\nSELECT * FROM film WHERE film_id BETWEEN 10 AND 20;\nSELECT * FROM film WHERE film_id NOT BETWEEN 10 AND 20;\nSELECT * FROM film WHERE film_id IN (3,5,7);\nSELECT * FROM film WHERE rating = UPPER('pg');\nSELECT * FROM film WHERE rating SOUNDS LIKE 'PG';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT * FROM film WHERE film_id = 10 OR film_id >= 20;\nSELECT * FROM film WHERE (film_id < 10) || (film_id > 20);\nSELECT * FROM film WHERE `film_id` != 10 AND `film_id` <= 20;\nSELECT * FROM film WHERE `film`.`film_id` <> 10 && `film`.`film_id` <= 20;\nSELECT * FROM film WHERE film.film_id < 20 XOR film.rating = 'PG-13';\nSELECT * FROM film WHERE /* film_id = */ film_id = 10;\nSELECT * FROM film WHERE NOT film_id > 10;\nSELECT * FROM film WHERE ! (film_id > 10);\nSELECT * FROM film WHERE description IS NULL;\nSELECT * FROM film WHERE description IS NOT NULL;\nSELECT * FROM film WHERE film_id BETWEEN 10 AND 20;\nSELECT * FROM film WHERE film_id NOT BETWEEN 10 AND 20;\nSELECT * FROM film WHERE film_id IN (3,5,7);\nSELECT * FROM film WHERE rating = UPPER('pg');\nSELECT * FROM film WHERE rating SOUNDS LIKE 'PG';", "len": 808, "last": 808, @@ -3715,8 +3717,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@31" @@ -3727,12 +3729,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -4642,9 +4644,7 @@ "last": 333 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectWhereCollate.out b/tests/data/parser/parseSelectWhereCollate.out index 5845189de..e2db38e97 100644 --- a/tests/data/parser/parseSelectWhereCollate.out +++ b/tests/data/parser/parseSelectWhereCollate.out @@ -2,6 +2,8 @@ "query": "SELECT 1 FROM my_table WHERE first_col = 'foo' AND second_col COLLATE utf8_bin = 'bar';", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT 1 FROM my_table WHERE first_col = 'foo' AND second_col COLLATE utf8_bin = 'bar';", "len": 96, "last": 96, @@ -334,8 +336,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@36" @@ -346,12 +348,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -429,9 +431,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectWithParenthesis.out b/tests/data/parser/parseSelectWithParenthesis.out index 60cbb87d1..ba3a1c6f5 100644 --- a/tests/data/parser/parseSelectWithParenthesis.out +++ b/tests/data/parser/parseSelectWithParenthesis.out @@ -2,6 +2,8 @@ "query": "(SELECT first_name FROM `actor` LIMIT 1, 2)", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "(SELECT first_name FROM `actor` LIMIT 1, 2)", "len": 43, "last": 43, @@ -200,8 +202,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -214,12 +216,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -275,9 +277,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectWrongOrder.out b/tests/data/parser/parseSelectWrongOrder.out index f6acfa4dd..a961a2511 100644 --- a/tests/data/parser/parseSelectWrongOrder.out +++ b/tests/data/parser/parseSelectWrongOrder.out @@ -2,6 +2,8 @@ "query": "SELECT pid, name2 FROM tablename LIMIT 10 WHERE pid = 20", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT pid, name2 FROM tablename LIMIT 10 WHERE pid = 20", "len": 56, "last": 56, @@ -264,8 +266,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -278,12 +280,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -358,9 +360,7 @@ "last": 21 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSelectWrongOrder2.out b/tests/data/parser/parseSelectWrongOrder2.out index 2470edb65..887482cc6 100644 --- a/tests/data/parser/parseSelectWrongOrder2.out +++ b/tests/data/parser/parseSelectWrongOrder2.out @@ -2,6 +2,8 @@ "query": "SELECT DISTINCT * FROM tbl1 INNER JOIN tbl2 ON id1 = id2 WHERE 1=1 LEFT OUTER JOIN l3;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SELECT DISTINCT * FROM tbl1 INNER JOIN tbl2 ON id1 = id2 WHERE 1=1 LEFT OUTER JOIN l3;", "len": 86, "last": 86, @@ -376,8 +378,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@39" @@ -388,12 +390,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -471,9 +473,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetCharacterSet.out b/tests/data/parser/parseSetCharacterSet.out index 1b7661807..b3f113df3 100644 --- a/tests/data/parser/parseSetCharacterSet.out +++ b/tests/data/parser/parseSetCharacterSet.out @@ -2,6 +2,8 @@ "query": "SET CHARACTER SET 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET CHARACTER SET 'utf8'", "len": 24, "last": 24, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,12 +89,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -116,9 +118,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetCharacterSetError.out b/tests/data/parser/parseSetCharacterSetError.out index e509af32b..61af6f967 100644 --- a/tests/data/parser/parseSetCharacterSetError.out +++ b/tests/data/parser/parseSetCharacterSetError.out @@ -2,6 +2,8 @@ "query": "SET CHARACTER SET ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET CHARACTER SET ", "len": 18, "last": 18, @@ -60,8 +62,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -74,12 +76,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -103,9 +105,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetCharset.out b/tests/data/parser/parseSetCharset.out index f17595a1c..9a7974d7b 100644 --- a/tests/data/parser/parseSetCharset.out +++ b/tests/data/parser/parseSetCharset.out @@ -2,6 +2,8 @@ "query": "SET CHARSET 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET CHARSET 'utf8'", "len": 18, "last": 18, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,12 +89,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -116,9 +118,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetCharsetError.out b/tests/data/parser/parseSetCharsetError.out index 082605cf2..7748e7836 100644 --- a/tests/data/parser/parseSetCharsetError.out +++ b/tests/data/parser/parseSetCharsetError.out @@ -2,6 +2,8 @@ "query": "SET CHARSET ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET CHARSET ", "len": 12, "last": 12, @@ -62,8 +64,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -76,12 +78,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -105,9 +107,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetError1.out b/tests/data/parser/parseSetError1.out index a4453d10a..d75eed7e1 100644 --- a/tests/data/parser/parseSetError1.out +++ b/tests/data/parser/parseSetError1.out @@ -2,6 +2,8 @@ "query": "SET CHARSET 'utf8' CHARACTER SET 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET CHARSET 'utf8' CHARACTER SET 'utf8'", "len": 39, "last": 39, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -166,9 +168,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetGlobalVariable.out b/tests/data/parser/parseSetGlobalVariable.out index a83334ca6..f3fe3bb33 100644 --- a/tests/data/parser/parseSetGlobalVariable.out +++ b/tests/data/parser/parseSetGlobalVariable.out @@ -2,6 +2,8 @@ "query": "SET GLOBAL max_connections = 1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET GLOBAL max_connections = 1", "len": 30, "last": 30, @@ -121,8 +123,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -135,12 +137,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -165,9 +167,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetNames.out b/tests/data/parser/parseSetNames.out index 38374a776..15414d4b8 100644 --- a/tests/data/parser/parseSetNames.out +++ b/tests/data/parser/parseSetNames.out @@ -2,6 +2,8 @@ "query": "SET NAMES 'utf8'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET NAMES 'utf8'", "len": 16, "last": 16, @@ -73,8 +75,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -87,12 +89,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -116,9 +118,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetNames2.out b/tests/data/parser/parseSetNames2.out index 3663fff6e..ae3331ad2 100644 --- a/tests/data/parser/parseSetNames2.out +++ b/tests/data/parser/parseSetNames2.out @@ -2,6 +2,8 @@ "query": "SET NAMES 'utf8' COLLATE 'utf8_general_ci'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET NAMES 'utf8' COLLATE 'utf8_general_ci'", "len": 42, "last": 42, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -170,9 +172,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetNames3.out b/tests/data/parser/parseSetNames3.out index 21637826e..b78b74f13 100644 --- a/tests/data/parser/parseSetNames3.out +++ b/tests/data/parser/parseSetNames3.out @@ -2,6 +2,8 @@ "query": "SET NAMES 'utf8' DEFAULT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET NAMES 'utf8' DEFAULT;", "len": 25, "last": 25, @@ -108,8 +110,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@13" @@ -120,12 +122,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -154,9 +156,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetNamesError.out b/tests/data/parser/parseSetNamesError.out index 405e8f970..86374ad57 100644 --- a/tests/data/parser/parseSetNamesError.out +++ b/tests/data/parser/parseSetNamesError.out @@ -2,6 +2,8 @@ "query": "SET NAMES ", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET NAMES ", "len": 10, "last": 10, @@ -60,8 +62,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -74,12 +76,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -103,9 +105,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetNamesError2.out b/tests/data/parser/parseSetNamesError2.out index 9b96437d5..bd379bcd8 100644 --- a/tests/data/parser/parseSetNamesError2.out +++ b/tests/data/parser/parseSetNamesError2.out @@ -2,6 +2,8 @@ "query": "SET NAMES 'utf8' DEFAULT 'utf8_general_ci'", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET NAMES 'utf8' DEFAULT 'utf8_general_ci'", "len": 42, "last": 42, @@ -117,8 +119,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -131,12 +133,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -165,9 +167,7 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetNamesError3.out b/tests/data/parser/parseSetNamesError3.out index 185a88bd7..e425895c1 100644 --- a/tests/data/parser/parseSetNamesError3.out +++ b/tests/data/parser/parseSetNamesError3.out @@ -2,6 +2,8 @@ "query": "SET NAMES 'utf8' COLLATE", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET NAMES 'utf8' COLLATE", "len": 24, "last": 24, @@ -95,8 +97,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -109,12 +111,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -148,9 +150,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetVariable.out b/tests/data/parser/parseSetVariable.out index ba783573e..0c4521fbf 100644 --- a/tests/data/parser/parseSetVariable.out +++ b/tests/data/parser/parseSetVariable.out @@ -2,6 +2,8 @@ "query": "SET @foo = 1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET @foo = 1", "len": 12, "last": 12, @@ -99,8 +101,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -113,12 +115,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -141,9 +143,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseSetVariable2.out b/tests/data/parser/parseSetVariable2.out index 211131648..48f8f98e6 100644 --- a/tests/data/parser/parseSetVariable2.out +++ b/tests/data/parser/parseSetVariable2.out @@ -2,6 +2,8 @@ "query": "SET @foo := 1\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "SET @foo := 1\n", "len": 14, "last": 14, @@ -110,8 +112,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -124,12 +126,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -152,9 +154,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTable1.out b/tests/data/parser/parseTable1.out index 13830ca15..57c32e822 100644 --- a/tests/data/parser/parseTable1.out +++ b/tests/data/parser/parseTable1.out @@ -2,6 +2,8 @@ "query": "TABLE `fo` ORDER BY `fo`.`uuid` ASC;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "TABLE `fo` ORDER BY `fo`.`uuid` ASC;", "len": 36, "last": 36, @@ -154,8 +156,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@18" @@ -166,19 +168,17 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, "statements": [], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction.out b/tests/data/parser/parseTransaction.out index 72c81a061..bcec87773 100644 --- a/tests/data/parser/parseTransaction.out +++ b/tests/data/parser/parseTransaction.out @@ -2,6 +2,8 @@ "query": "START TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "START TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;", "len": 118, "last": 118, @@ -488,8 +490,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -500,12 +502,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -635,9 +637,7 @@ "last": 0 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction2.out b/tests/data/parser/parseTransaction2.out index 987d4692e..4042c91c6 100644 --- a/tests/data/parser/parseTransaction2.out +++ b/tests/data/parser/parseTransaction2.out @@ -2,6 +2,8 @@ "query": "START TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nROLLBACK;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "START TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nROLLBACK;", "len": 120, "last": 120, @@ -488,8 +490,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -500,12 +502,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -635,9 +637,7 @@ "last": 0 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction3.out b/tests/data/parser/parseTransaction3.out index a92738b0e..858b9722e 100644 --- a/tests/data/parser/parseTransaction3.out +++ b/tests/data/parser/parseTransaction3.out @@ -2,6 +2,8 @@ "query": "begin;\nSELECT * FROM `tablename`\ncommit;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "begin;\nSELECT * FROM `tablename`\ncommit;\n", "len": 41, "last": 41, @@ -176,8 +178,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -188,12 +190,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -245,9 +247,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction4.out b/tests/data/parser/parseTransaction4.out index 4c4161afb..ed607a241 100644 --- a/tests/data/parser/parseTransaction4.out +++ b/tests/data/parser/parseTransaction4.out @@ -2,6 +2,8 @@ "query": "\nSTART TRANSACTION;\nSET time_zone = \"+00:00\";\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "\nSTART TRANSACTION;\nSET time_zone = \"+00:00\";\n", "len": 46, "last": 46, @@ -167,8 +169,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@7" @@ -179,12 +181,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -222,9 +224,7 @@ "last": 1 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction5.out b/tests/data/parser/parseTransaction5.out index 214dc1b11..af9d32218 100644 --- a/tests/data/parser/parseTransaction5.out +++ b/tests/data/parser/parseTransaction5.out @@ -2,6 +2,8 @@ "query": "BEGIN;\n INSERT INTO t2 VALUES (3);\n SAVEPOINT my_savepoint;\n INSERT INTO t2 VALUES (4);\n RELEASE SAVEPOINT my_savepoint;\nCOMMIT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "BEGIN;\n INSERT INTO t2 VALUES (3);\n SAVEPOINT my_savepoint;\n INSERT INTO t2 VALUES (4);\n RELEASE SAVEPOINT my_savepoint;\nCOMMIT;", "len": 140, "last": 140, @@ -497,8 +499,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -509,12 +511,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -634,9 +636,7 @@ "last": 0 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction6.out b/tests/data/parser/parseTransaction6.out index 4ab3f9b9b..5f4d9f332 100644 --- a/tests/data/parser/parseTransaction6.out +++ b/tests/data/parser/parseTransaction6.out @@ -2,6 +2,8 @@ "query": "BEGIN;\n INSERT INTO t2 VALUES (3);\n SAVEPOINT my_savepoint;\n INSERT INTO t2 VALUES (4);\n ROLLBACK WORK TO SAVEPOINT my_savepoint;\nCOMMIT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "BEGIN;\n INSERT INTO t2 VALUES (3);\n SAVEPOINT my_savepoint;\n INSERT INTO t2 VALUES (4);\n ROLLBACK WORK TO SAVEPOINT my_savepoint;\nCOMMIT;", "len": 149, "last": 149, @@ -541,8 +543,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -553,12 +555,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -693,9 +695,7 @@ "last": 45 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransaction7.out b/tests/data/parser/parseTransaction7.out index c6880e25f..0f9091495 100644 --- a/tests/data/parser/parseTransaction7.out +++ b/tests/data/parser/parseTransaction7.out @@ -2,6 +2,8 @@ "query": "BEGIN;\n INSERT INTO t2 VALUES (3);\n SAVEPOINT my_savepoint;\n INSERT INTO t2 VALUES (4);\n ROLLBACK TO SAVEPOINT my_savepoint;\nCOMMIT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "BEGIN;\n INSERT INTO t2 VALUES (3);\n SAVEPOINT my_savepoint;\n INSERT INTO t2 VALUES (4);\n ROLLBACK TO SAVEPOINT my_savepoint;\nCOMMIT;", "len": 144, "last": 144, @@ -519,8 +521,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -531,12 +533,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -670,9 +672,7 @@ "last": 43 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseTransactionErr1.out b/tests/data/parser/parseTransactionErr1.out index 159483a6b..cc1d550a8 100644 --- a/tests/data/parser/parseTransactionErr1.out +++ b/tests/data/parser/parseTransactionErr1.out @@ -2,6 +2,8 @@ "query": "COMMIT;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "COMMIT;", "len": 7, "last": 7, @@ -38,8 +40,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@5" @@ -50,12 +52,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -75,9 +77,7 @@ "last": 0 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUnlock1.out b/tests/data/parser/parseUnlock1.out index 2ed9e0cfc..62b8e5eb6 100644 --- a/tests/data/parser/parseUnlock1.out +++ b/tests/data/parser/parseUnlock1.out @@ -2,6 +2,8 @@ "query": "UNLOCK TABLES;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UNLOCK TABLES;", "len": 14, "last": 14, @@ -62,8 +64,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@8" @@ -74,12 +76,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -93,9 +95,7 @@ "last": 3 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUnlockErr1.out b/tests/data/parser/parseUnlockErr1.out index c5788ff9e..c549b0e7a 100644 --- a/tests/data/parser/parseUnlockErr1.out +++ b/tests/data/parser/parseUnlockErr1.out @@ -2,6 +2,8 @@ "query": "UNLOCK TABLES abc;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UNLOCK TABLES abc;", "len": 18, "last": 18, @@ -86,8 +88,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@11" @@ -98,12 +100,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -117,9 +119,7 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate1.out b/tests/data/parser/parseUpdate1.out index 0c31ca185..8eafbde91 100644 --- a/tests/data/parser/parseUpdate1.out +++ b/tests/data/parser/parseUpdate1.out @@ -2,6 +2,8 @@ "query": "UPDATE\n users\nSET\n username = \"Dan\",\n id=155;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE\n users\nSET\n username = \"Dan\",\n id=155;", "len": 54, "last": 54, @@ -213,8 +215,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@25" @@ -225,12 +227,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -273,9 +275,7 @@ "last": 15 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate2.out b/tests/data/parser/parseUpdate2.out index 58fcbb1b2..4cb0a16c8 100644 --- a/tests/data/parser/parseUpdate2.out +++ b/tests/data/parser/parseUpdate2.out @@ -2,6 +2,8 @@ "query": "UPDATE\n users\nSET\n username = \"Dan\",\n id=155\nWHERE\n username = \"Paul\"\nLIMIT 1 OFFSET 2;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE\n users\nSET\n username = \"Dan\",\n id=155\nWHERE\n username = \"Paul\"\nLIMIT 1 OFFSET 2;", "len": 99, "last": 99, @@ -389,8 +391,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@41" @@ -401,12 +403,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -463,9 +465,7 @@ "last": 31 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate3.out b/tests/data/parser/parseUpdate3.out index b0b8c965d..3c228cdca 100644 --- a/tests/data/parser/parseUpdate3.out +++ b/tests/data/parser/parseUpdate3.out @@ -2,6 +2,8 @@ "query": "UPDATE foo SET bar = WHERE baz = 0\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE foo SET bar = WHERE baz = 0\n", "len": 36, "last": 36, @@ -220,8 +222,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -234,12 +236,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -280,9 +282,7 @@ "last": 17 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate4.out b/tests/data/parser/parseUpdate4.out index 61fcc1726..8351c797c 100644 --- a/tests/data/parser/parseUpdate4.out +++ b/tests/data/parser/parseUpdate4.out @@ -2,6 +2,8 @@ "query": "UPDATE Country x, City y set x.Name=x.Name where x.Code=y.CountryCode;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE Country x, City y set x.Name=x.Name where x.Code=y.CountryCode;", "len": 70, "last": 70, @@ -363,8 +365,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@37" @@ -375,12 +377,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -440,9 +442,7 @@ "last": 29 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate5.out b/tests/data/parser/parseUpdate5.out index 103bd47f0..4331d0a7b 100644 --- a/tests/data/parser/parseUpdate5.out +++ b/tests/data/parser/parseUpdate5.out @@ -2,6 +2,8 @@ "query": "update user u left join user_detail ud on u.id = ud.user_id set ud.ip ='33' where u.id = 1", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "update user u left join user_detail ud on u.id = ud.user_id set ud.ip ='33' where u.id = 1", "len": 90, "last": 90, @@ -486,8 +488,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -500,12 +502,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -582,9 +584,7 @@ "last": 41 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate6.out b/tests/data/parser/parseUpdate6.out index eaa7e71d5..651737e50 100644 --- a/tests/data/parser/parseUpdate6.out +++ b/tests/data/parser/parseUpdate6.out @@ -2,6 +2,8 @@ "query": "UPDATE customer_table c\n\n JOIN\n employee_table e\n ON c.city_id = e.city_id\n JOIN\n anyother_table a\n ON a.someID = e.someID\n\nSET c.active = \"Yes\"\nWHERE c.city = \"New york\";", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE customer_table c\n\n JOIN\n employee_table e\n ON c.city_id = e.city_id\n JOIN\n anyother_table a\n ON a.someID = e.someID\n\nSET c.active = \"Yes\"\nWHERE c.city = \"New york\";", "len": 193, "last": 193, @@ -706,8 +708,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@69" @@ -718,12 +720,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -827,9 +829,7 @@ "last": 60 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdate7.out b/tests/data/parser/parseUpdate7.out index b97cff3b8..944d14c2e 100644 --- a/tests/data/parser/parseUpdate7.out +++ b/tests/data/parser/parseUpdate7.out @@ -2,6 +2,8 @@ "query": "UPDATE customer_table c\n\n INNER JOIN\n employee_table e\n ON c.city_id = e.city_id\n LEFT JOIN\n anyother_table a\n ON a.someID = e.someID\n\nSET c.active = \"Yes\"\nWHERE c.city = \"New york\";", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "UPDATE customer_table c\n\n INNER JOIN\n employee_table e\n ON c.city_id = e.city_id\n LEFT JOIN\n anyother_table a\n ON a.someID = e.someID\n\nSET c.active = \"Yes\"\nWHERE c.city = \"New york\";", "len": 204, "last": 204, @@ -706,8 +708,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@69" @@ -718,12 +720,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -827,9 +829,7 @@ "last": 60 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseUpdateErr.out b/tests/data/parser/parseUpdateErr.out index bdc40ddd9..f487bc1d4 100644 --- a/tests/data/parser/parseUpdateErr.out +++ b/tests/data/parser/parseUpdateErr.out @@ -2,6 +2,8 @@ "query": "-- extraneous comma\nUPDATE\n users\nSET\n username = \"Dan\",\n id=155,\nWHERE 1 = 1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "-- extraneous comma\nUPDATE\n users\nSET\n username = \"Dan\",\n id=155,\nWHERE 1 = 1;", "len": 87, "last": 87, @@ -336,8 +338,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@37" @@ -348,12 +350,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -403,9 +405,7 @@ "last": 26 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement.out b/tests/data/parser/parseWithStatement.out index 14de6f8d2..26bb6bfc3 100644 --- a/tests/data/parser/parseWithStatement.out +++ b/tests/data/parser/parseWithStatement.out @@ -2,6 +2,8 @@ "query": "INSERT INTO table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "len": 94, "last": 94, @@ -429,8 +431,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -443,12 +445,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -496,6 +498,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -612,14 +616,14 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -699,9 +703,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -719,9 +721,7 @@ "last": 36 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement1.out b/tests/data/parser/parseWithStatement1.out index 1c8f726c8..2e8bc4792 100644 --- a/tests/data/parser/parseWithStatement1.out +++ b/tests/data/parser/parseWithStatement1.out @@ -2,6 +2,8 @@ "query": "CREATE table table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE table table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "len": 95, "last": 95, @@ -429,8 +431,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -443,12 +445,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -486,6 +488,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -602,14 +606,14 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -689,9 +693,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -721,9 +723,7 @@ "last": 36 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement2.out b/tests/data/parser/parseWithStatement2.out index 04b982985..1a0b1c330 100644 --- a/tests/data/parser/parseWithStatement2.out +++ b/tests/data/parser/parseWithStatement2.out @@ -2,6 +2,8 @@ "query": "INSERT INTO table_name WITH cte (col1) AS ( SELECT 1 ) SELECT col1 FROM cte ON DUPLICATE KEY UPDATE col_name = 3", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO table_name WITH cte (col1) AS ( SELECT 1 ) SELECT col1 FROM cte ON DUPLICATE KEY UPDATE col_name = 3", "len": 112, "last": 112, @@ -517,8 +519,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -531,12 +533,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -584,6 +586,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 5, @@ -643,14 +647,14 @@ "last": 4 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -730,9 +734,7 @@ "last": 7 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -756,9 +758,7 @@ "last": 44 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement3.out b/tests/data/parser/parseWithStatement3.out index a193b65c3..46380d8f9 100644 --- a/tests/data/parser/parseWithStatement3.out +++ b/tests/data/parser/parseWithStatement3.out @@ -2,6 +2,8 @@ "query": "WITH categories(identifier, name, parent_id) AS ( SELECT c.identifier, c.name, c.parent_id FROM category c WHERE c.identifier = 'a' UNION ALL SELECT c.identifier, c.name, c.parent_id FROM categories, category c WHERE c.identifier = categories.parent_id ), foo AS ( SELECT * FROM test ) SELECT * FROM categories", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH categories(identifier, name, parent_id) AS ( SELECT c.identifier, c.name, c.parent_id FROM category c WHERE c.identifier = 'a' UNION ALL SELECT c.identifier, c.name, c.parent_id FROM categories, category c WHERE c.identifier = categories.parent_id ), foo AS ( SELECT * FROM test ) SELECT * FROM categories", "len": 310, "last": 310, @@ -1276,8 +1278,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -1290,12 +1292,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -1323,6 +1325,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 72, @@ -1717,9 +1721,7 @@ "last": 71 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } }, "foo": { @@ -1728,6 +1730,8 @@ "columns": [], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 9, @@ -1810,14 +1814,14 @@ "last": 8 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -1897,9 +1901,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -1909,9 +1911,7 @@ "last": 113 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement4.out b/tests/data/parser/parseWithStatement4.out index 47d6a485c..8d34e4e1a 100644 --- a/tests/data/parser/parseWithStatement4.out +++ b/tests/data/parser/parseWithStatement4.out @@ -2,6 +2,8 @@ "query": "CREATE table table_name AS WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) NO", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE table table_name AS WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) NO", "len": 80, "last": 80, @@ -385,8 +387,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -399,12 +401,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -442,6 +444,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -558,9 +562,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, @@ -593,9 +595,7 @@ "last": 31 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement5.out b/tests/data/parser/parseWithStatement5.out index 9ad6d31ea..b34fc0a27 100644 --- a/tests/data/parser/parseWithStatement5.out +++ b/tests/data/parser/parseWithStatement5.out @@ -2,6 +2,8 @@ "query": "CREATE view view_name AS WITH aa(col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE view view_name AS WITH aa(col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "len": 95, "last": 95, @@ -440,8 +442,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -454,12 +456,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -497,6 +499,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -613,14 +617,14 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 8, @@ -700,9 +704,7 @@ "last": 6 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -736,9 +738,7 @@ "last": 38 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement6.out b/tests/data/parser/parseWithStatement6.out index 738ebf7ab..533ca306a 100644 --- a/tests/data/parser/parseWithStatement6.out +++ b/tests/data/parser/parseWithStatement6.out @@ -2,6 +2,8 @@ "query": "CREATE view view_name WITH aa(col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE view view_name WITH aa(col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "len": 92, "last": 92, @@ -418,8 +420,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -432,12 +434,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -566,9 +568,7 @@ "last": 36 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatement7.out b/tests/data/parser/parseWithStatement7.out index f8af2ed3d..cd189d499 100644 --- a/tests/data/parser/parseWithStatement7.out +++ b/tests/data/parser/parseWithStatement7.out @@ -2,6 +2,8 @@ "query": "WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT * FROM cte INNER JOIN table2 ON table2.col1=cte.col1;", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT * FROM cte INNER JOIN table2 ON table2.col1=cte.col1;", "len": 111, "last": 111, @@ -530,8 +532,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@53" @@ -542,12 +544,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -571,6 +573,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -687,14 +691,14 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, "cteStatementParser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 23, @@ -847,9 +851,7 @@ "last": 20 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", @@ -859,9 +861,7 @@ "last": 45 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr.out b/tests/data/parser/parseWithStatementErr.out index afb145069..f227b5823 100644 --- a/tests/data/parser/parseWithStatementErr.out +++ b/tests/data/parser/parseWithStatementErr.out @@ -2,6 +2,8 @@ "query": "INSERT INTO table_name WITH cte col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO table_name WITH cte col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "len": 93, "last": 93, @@ -418,8 +420,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -432,12 +434,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -493,9 +495,7 @@ "last": 9 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr1.out b/tests/data/parser/parseWithStatementErr1.out index ca0673c27..b09839126 100644 --- a/tests/data/parser/parseWithStatementErr1.out +++ b/tests/data/parser/parseWithStatementErr1.out @@ -2,6 +2,8 @@ "query": "CREATE table table_name WITH cte (col1) ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE table table_name WITH cte (col1) ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FROM cte", "len": 92, "last": 92, @@ -407,8 +409,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -421,12 +423,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -614,9 +616,7 @@ "last": 34 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr2.out b/tests/data/parser/parseWithStatementErr2.out index 6fededc9f..7b690d3e9 100644 --- a/tests/data/parser/parseWithStatementErr2.out +++ b/tests/data/parser/parseWithStatementErr2.out @@ -2,6 +2,8 @@ "query": "WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 )", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 )", "len": 50, "last": 50, @@ -275,8 +277,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -289,12 +291,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -318,6 +320,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -434,9 +438,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, @@ -449,9 +451,7 @@ "last": 22 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr3.out b/tests/data/parser/parseWithStatementErr3.out index 35b0a0bf0..a1153a9ff 100644 --- a/tests/data/parser/parseWithStatementErr3.out +++ b/tests/data/parser/parseWithStatementErr3.out @@ -2,6 +2,8 @@ "query": "CREATE table table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ),", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE table table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ),", "len": 75, "last": 75, @@ -352,8 +354,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -366,12 +368,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -409,6 +411,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -525,9 +529,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, @@ -560,9 +562,7 @@ "last": 29 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr4.out b/tests/data/parser/parseWithStatementErr4.out index 2ed0a47c3..31298919a 100644 --- a/tests/data/parser/parseWithStatementErr4.out +++ b/tests/data/parser/parseWithStatementErr4.out @@ -2,6 +2,8 @@ "query": "CREATE table table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) NO", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE table table_name WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) NO", "len": 77, "last": 77, @@ -363,8 +365,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -377,12 +379,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -420,6 +422,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -536,9 +540,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, @@ -571,9 +573,7 @@ "last": 29 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr5.out b/tests/data/parser/parseWithStatementErr5.out index 0a219b1c3..7eec23fdb 100644 --- a/tests/data/parser/parseWithStatementErr5.out +++ b/tests/data/parser/parseWithStatementErr5.out @@ -2,6 +2,8 @@ "query": "CREATE table table_name WITH (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) NO", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "CREATE table table_name WITH (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) NO", "len": 73, "last": 73, @@ -341,8 +343,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -355,12 +357,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -411,9 +413,7 @@ "last": 7 } ], - "brackets": 1, - "strict": false, - "errors": [] + "brackets": 1 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr6.out b/tests/data/parser/parseWithStatementErr6.out index 8c7d41962..f938e812e 100644 --- a/tests/data/parser/parseWithStatementErr6.out +++ b/tests/data/parser/parseWithStatementErr6.out @@ -2,6 +2,8 @@ "query": "INSERT INTO table_name WITH cte (col1) AS ( INSERT INTO table_name (column1, column2, column3) VALUES (value1, value2, value3) ) SELECT col1 FROM cte ON DUPLICATE KEY UPDATE col_name = 3", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "INSERT INTO table_name WITH cte (col1) AS ( INSERT INTO table_name (column1, column2, column3) VALUES (value1, value2, value3) ) SELECT col1 FROM cte ON DUPLICATE KEY UPDATE col_name = 3", "len": 186, "last": 186, @@ -781,8 +783,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -795,12 +797,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -963,9 +965,7 @@ "last": 55 } ], - "brackets": 1, - "strict": false, - "errors": [] + "brackets": 1 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr7.out b/tests/data/parser/parseWithStatementErr7.out index 586f11c47..35c615d9b 100644 --- a/tests/data/parser/parseWithStatementErr7.out +++ b/tests/data/parser/parseWithStatementErr7.out @@ -2,6 +2,8 @@ "query": "WITH cte (col1) AS ( SELECT 1 UNN ALL SELECT 2 ) SELECT col1 FROM cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH cte (col1) AS ( SELECT 1 UNN ALL SELECT 2 ) SELECT col1 FROM cte", "len": 69, "last": 69, @@ -385,8 +387,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -399,12 +401,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -484,9 +486,7 @@ "last": 32 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parseWithStatementErr8.out b/tests/data/parser/parseWithStatementErr8.out index fca41553a..fd5fdd0f9 100644 --- a/tests/data/parser/parseWithStatementErr8.out +++ b/tests/data/parser/parseWithStatementErr8.out @@ -2,6 +2,8 @@ "query": "WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FR cte", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": "WITH cte (col1) AS ( SELECT 1 UNION ALL SELECT 2 ) SELECT col1 FR cte", "len": 69, "last": 69, @@ -363,8 +365,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "PhpMyAdmin\\SqlParser\\TokenType", @@ -377,12 +379,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@1" }, @@ -406,6 +408,8 @@ ], "statement": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "PhpMyAdmin\\SqlParser\\TokensList", "count": 11, @@ -522,9 +526,7 @@ "last": 10 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 } } }, @@ -572,9 +574,7 @@ "last": 30 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [], diff --git a/tests/data/parser/parsephpMyAdminExport1.out b/tests/data/parser/parsephpMyAdminExport1.out index 85a8bb3e2..ab4e20d3a 100644 --- a/tests/data/parser/parsephpMyAdminExport1.out +++ b/tests/data/parser/parsephpMyAdminExport1.out @@ -2,6 +2,8 @@ "query": "-- phpMyAdmin SQL Dump\n-- version 5.0.0-dev\n-- https://www.phpmyadmin.net/\n--\n-- Hôte : xxxx.xxxxx.eu-west-1.rds.amazonaws.com\n-- Généré le : mer. 05 sep. 2018 à 00:03\n-- Version du serveur : 10.0.24-MariaDB\n-- Version de PHP : 7.2.8-1+ubuntu18.04.1+deb.sury.org+1\n\nSET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\nSET AUTOCOMMIT = 0;\nSTART TRANSACTION;\nSET time_zone = \"+00:00\";\n\n\n/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;\n/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;\n/*!40101 SET NAMES utf8mb4 */;\n\n--\n-- Base de données : `xxxxxdbnamexxxxx`\n--\n\n-- --------------------------------------------------------\n\n--\n-- Structure de la table `monitoring__times`\n--\n\nCREATE TABLE `monitoring__times` (\n `idServer` int(11) UNSIGNED NOT NULL COMMENT 'Id of server',\n `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Time UTC',\n `totalTime` float UNSIGNED NOT NULL COMMENT 'Total time in ms'\n) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;\n\n--\n-- Déclencheurs `monitoring__times`\n--\nDELIMITER $$\nCREATE TRIGGER `copyTimes` AFTER INSERT ON `monitoring__times` FOR EACH ROW INSERT INTO monitoring__times_mirror\n(`idServer`, `time`, `totalTime`) VALUES(new.idServer, new.time, new.totalTime)\n$$\nDELIMITER ;\nDELIMITER $$\nCREATE TRIGGER `deleteTimes` AFTER DELETE ON `monitoring__times` FOR EACH ROW DELETE FROM monitoring__times_mirror\nWHERE `idServer`=old.idServer\nAND `time`=old.time\nAND `totalTime`=old.totalTime\n$$\nDELIMITER ;\nDELIMITER $$\nCREATE TRIGGER `updateTimes` AFTER UPDATE ON `monitoring__times` FOR EACH ROW UPDATE monitoring__times_mirror\nSET `idServer`=new.idServer,\n`time`=new.time,\n`totalTime`=new.totalTime\nWHERE `idServer`=old.idServer\nAND `time`=old.time\nAND `totalTime`=old.totalTime\n$$\nDELIMITER ;\n\n--\n-- Index pour les tables déchargées\n--\n\n--\n-- Index pour la table `monitoring__times`\n--\nALTER TABLE `monitoring__times`\n ADD UNIQUE KEY `idServer` (`idServer`,`time`) USING BTREE COMMENT 'Unique idServer/time',\n ADD KEY `INDEX_totalTime` (`totalTime`) USING BTREE COMMENT 'Index for totalTime column';\n\n--\n-- Contraintes pour les tables déchargées\n--\n\n--\n-- Contraintes pour la table `monitoring__times`\n--\nALTER TABLE `monitoring__times`\n ADD CONSTRAINT `monitoring__times__idServer` FOREIGN KEY (`idServer`) REFERENCES `monitoring__servers` (`id`);\nCOMMIT;\n\n/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n", "lexer": { "@type": "PhpMyAdmin\\SqlParser\\Lexer", + "strict": false, + "errors": [], "str": { "@type": "PhpMyAdmin\\SqlParser\\UtfString", "str": "-- phpMyAdmin SQL Dump\n-- version 5.0.0-dev\n-- https://www.phpmyadmin.net/\n--\n-- Hôte : xxxx.xxxxx.eu-west-1.rds.amazonaws.com\n-- Généré le : mer. 05 sep. 2018 à 00:03\n-- Version du serveur : 10.0.24-MariaDB\n-- Version de PHP : 7.2.8-1+ubuntu18.04.1+deb.sury.org+1\n\nSET SQL_MODE = \"NO_AUTO_VALUE_ON_ZERO\";\nSET AUTOCOMMIT = 0;\nSTART TRANSACTION;\nSET time_zone = \"+00:00\";\n\n\n/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;\n/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;\n/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;\n/*!40101 SET NAMES utf8mb4 */;\n\n--\n-- Base de données : `xxxxxdbnamexxxxx`\n--\n\n-- --------------------------------------------------------\n\n--\n-- Structure de la table `monitoring__times`\n--\n\nCREATE TABLE `monitoring__times` (\n `idServer` int(11) UNSIGNED NOT NULL COMMENT 'Id of server',\n `time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'Time UTC',\n `totalTime` float UNSIGNED NOT NULL COMMENT 'Total time in ms'\n) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;\n\n--\n-- Déclencheurs `monitoring__times`\n--\nDELIMITER $$\nCREATE TRIGGER `copyTimes` AFTER INSERT ON `monitoring__times` FOR EACH ROW INSERT INTO monitoring__times_mirror\n(`idServer`, `time`, `totalTime`) VALUES(new.idServer, new.time, new.totalTime)\n$$\nDELIMITER ;\nDELIMITER $$\nCREATE TRIGGER `deleteTimes` AFTER DELETE ON `monitoring__times` FOR EACH ROW DELETE FROM monitoring__times_mirror\nWHERE `idServer`=old.idServer\nAND `time`=old.time\nAND `totalTime`=old.totalTime\n$$\nDELIMITER ;\nDELIMITER $$\nCREATE TRIGGER `updateTimes` AFTER UPDATE ON `monitoring__times` FOR EACH ROW UPDATE monitoring__times_mirror\nSET `idServer`=new.idServer,\n`time`=new.time,\n`totalTime`=new.totalTime\nWHERE `idServer`=old.idServer\nAND `time`=old.time\nAND `totalTime`=old.totalTime\n$$\nDELIMITER ;\n\n--\n-- Index pour les tables déchargées\n--\n\n--\n-- Index pour la table `monitoring__times`\n--\nALTER TABLE `monitoring__times`\n ADD UNIQUE KEY `idServer` (`idServer`,`time`) USING BTREE COMMENT 'Unique idServer/time',\n ADD KEY `INDEX_totalTime` (`totalTime`) USING BTREE COMMENT 'Index for totalTime column';\n\n--\n-- Contraintes pour les tables déchargées\n--\n\n--\n-- Contraintes pour la table `monitoring__times`\n--\nALTER TABLE `monitoring__times`\n ADD CONSTRAINT `monitoring__times__idServer` FOREIGN KEY (`idServer`) REFERENCES `monitoring__servers` (`id`);\nCOMMIT;\n\n/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;\n/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;\n/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;\n", @@ -5581,8 +5583,8 @@ }, { "@type": "PhpMyAdmin\\SqlParser\\Token", - "token": null, - "value": null, + "token": "", + "value": "", "keyword": null, "type": { "@type": "@33" @@ -5593,12 +5595,12 @@ ] }, "delimiter": ";", - "delimiterLen": 1, - "strict": false, - "errors": [] + "delimiterLen": 1 }, "parser": { "@type": "PhpMyAdmin\\SqlParser\\Parser", + "strict": false, + "errors": [], "list": { "@type": "@2" }, @@ -6704,9 +6706,7 @@ "last": 501 } ], - "brackets": 0, - "strict": false, - "errors": [] + "brackets": 0 }, "errors": { "lexer": [],