diff --git a/tests/data/bugs/gh14.out b/tests/data/bugs/gh14.out index 781c01230..2c1ea7350 100644 --- a/tests/data/bugs/gh14.out +++ b/tests/data/bugs/gh14.out @@ -766,6 +766,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { @@ -966,6 +1000,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/bugs/gh16.out b/tests/data/bugs/gh16.out index a95fde9c5..b0d828469 100644 --- a/tests/data/bugs/gh16.out +++ b/tests/data/bugs/gh16.out @@ -1731,22 +1731,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1760,8 +1748,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/bugs/gh317.out b/tests/data/bugs/gh317.out index 1c8649a89..00f139e84 100644 --- a/tests/data/bugs/gh317.out +++ b/tests/data/bugs/gh317.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/bugs/gh9.out b/tests/data/bugs/gh9.out index 75747b21a..ee4c09079 100644 --- a/tests/data/bugs/gh9.out +++ b/tests/data/bugs/gh9.out @@ -1660,22 +1660,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1689,8 +1677,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/bugs/pma11843.out b/tests/data/bugs/pma11843.out index d41f323dc..d5e4bf5f3 100644 --- a/tests/data/bugs/pma11843.out +++ b/tests/data/bugs/pma11843.out @@ -831,22 +831,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -860,8 +848,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseAlter.out b/tests/data/parser/parseAlter.out index 00adf5b97..234b536a7 100644 --- a/tests/data/parser/parseAlter.out +++ b/tests/data/parser/parseAlter.out @@ -739,6 +739,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { @@ -892,6 +926,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter10.out b/tests/data/parser/parseAlter10.out index 666c16f84..d063cd726 100644 --- a/tests/data/parser/parseAlter10.out +++ b/tests/data/parser/parseAlter10.out @@ -703,6 +703,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter11.out b/tests/data/parser/parseAlter11.out index fc24d3e98..312823bdf 100644 --- a/tests/data/parser/parseAlter11.out +++ b/tests/data/parser/parseAlter11.out @@ -739,6 +739,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter12.out b/tests/data/parser/parseAlter12.out index b754a2f00..0ca8a34ca 100644 --- a/tests/data/parser/parseAlter12.out +++ b/tests/data/parser/parseAlter12.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter13.out b/tests/data/parser/parseAlter13.out index eeaa90d26..f07c32584 100644 --- a/tests/data/parser/parseAlter13.out +++ b/tests/data/parser/parseAlter13.out @@ -685,6 +685,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter2.out b/tests/data/parser/parseAlter2.out index 980ab53e5..bee884513 100644 --- a/tests/data/parser/parseAlter2.out +++ b/tests/data/parser/parseAlter2.out @@ -739,6 +739,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter3.out b/tests/data/parser/parseAlter3.out index 8ca69c178..cd3a891e0 100644 --- a/tests/data/parser/parseAlter3.out +++ b/tests/data/parser/parseAlter3.out @@ -937,6 +937,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter4.out b/tests/data/parser/parseAlter4.out index 72e7312ca..a5d678c4a 100644 --- a/tests/data/parser/parseAlter4.out +++ b/tests/data/parser/parseAlter4.out @@ -604,6 +604,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter5.out b/tests/data/parser/parseAlter5.out index d9a82ba1a..d452bf20e 100644 --- a/tests/data/parser/parseAlter5.out +++ b/tests/data/parser/parseAlter5.out @@ -613,6 +613,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter6.out b/tests/data/parser/parseAlter6.out index 2bc238275..3fa1b1150 100644 --- a/tests/data/parser/parseAlter6.out +++ b/tests/data/parser/parseAlter6.out @@ -649,6 +649,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter7.out b/tests/data/parser/parseAlter7.out index 1960bc756..3ae99dec2 100644 --- a/tests/data/parser/parseAlter7.out +++ b/tests/data/parser/parseAlter7.out @@ -892,6 +892,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { @@ -1104,6 +1138,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter8.out b/tests/data/parser/parseAlter8.out index 64f95a677..f17aa4caf 100644 --- a/tests/data/parser/parseAlter8.out +++ b/tests/data/parser/parseAlter8.out @@ -721,6 +721,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlter9.out b/tests/data/parser/parseAlter9.out index e578e12e1..cd69d0c2c 100644 --- a/tests/data/parser/parseAlter9.out +++ b/tests/data/parser/parseAlter9.out @@ -775,6 +775,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterErr.out b/tests/data/parser/parseAlterErr.out index d543c12db..d914c5ebb 100644 --- a/tests/data/parser/parseAlterErr.out +++ b/tests/data/parser/parseAlterErr.out @@ -901,6 +901,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterErr2.out b/tests/data/parser/parseAlterErr2.out index 62b8fd8d1..06f58b94d 100644 --- a/tests/data/parser/parseAlterErr2.out +++ b/tests/data/parser/parseAlterErr2.out @@ -847,6 +847,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterErr3.out b/tests/data/parser/parseAlterErr3.out index 686819f4a..725f60dbb 100644 --- a/tests/data/parser/parseAlterErr3.out +++ b/tests/data/parser/parseAlterErr3.out @@ -730,6 +730,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterErr4.out b/tests/data/parser/parseAlterErr4.out index f2568e87a..bc1806211 100644 --- a/tests/data/parser/parseAlterErr4.out +++ b/tests/data/parser/parseAlterErr4.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet1.out b/tests/data/parser/parseAlterTableCharacterSet1.out index de526b3a1..04ffaea4a 100644 --- a/tests/data/parser/parseAlterTableCharacterSet1.out +++ b/tests/data/parser/parseAlterTableCharacterSet1.out @@ -649,6 +649,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet2.out b/tests/data/parser/parseAlterTableCharacterSet2.out index b46b10a75..007755ff3 100644 --- a/tests/data/parser/parseAlterTableCharacterSet2.out +++ b/tests/data/parser/parseAlterTableCharacterSet2.out @@ -604,6 +604,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet3.out b/tests/data/parser/parseAlterTableCharacterSet3.out index a3fed8e90..6d401be6d 100644 --- a/tests/data/parser/parseAlterTableCharacterSet3.out +++ b/tests/data/parser/parseAlterTableCharacterSet3.out @@ -613,6 +613,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet4.out b/tests/data/parser/parseAlterTableCharacterSet4.out index 717b85cf2..8320849ae 100644 --- a/tests/data/parser/parseAlterTableCharacterSet4.out +++ b/tests/data/parser/parseAlterTableCharacterSet4.out @@ -649,6 +649,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet5.out b/tests/data/parser/parseAlterTableCharacterSet5.out index 3d19040fd..ac8b8e29f 100644 --- a/tests/data/parser/parseAlterTableCharacterSet5.out +++ b/tests/data/parser/parseAlterTableCharacterSet5.out @@ -613,6 +613,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet6.out b/tests/data/parser/parseAlterTableCharacterSet6.out index a25a750e4..1ee96850b 100644 --- a/tests/data/parser/parseAlterTableCharacterSet6.out +++ b/tests/data/parser/parseAlterTableCharacterSet6.out @@ -649,6 +649,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableCharacterSet7.out b/tests/data/parser/parseAlterTableCharacterSet7.out index 1b4a2d71a..b1f7b808d 100644 --- a/tests/data/parser/parseAlterTableCharacterSet7.out +++ b/tests/data/parser/parseAlterTableCharacterSet7.out @@ -649,6 +649,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterTableSetAutoIncrementError.out b/tests/data/parser/parseAlterTableSetAutoIncrementError.out index fd627b83c..73af995f4 100644 --- a/tests/data/parser/parseAlterTableSetAutoIncrementError.out +++ b/tests/data/parser/parseAlterTableSetAutoIncrementError.out @@ -586,6 +586,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser.out b/tests/data/parser/parseAlterUser.out index 88e937e23..116d2abd2 100644 --- a/tests/data/parser/parseAlterUser.out +++ b/tests/data/parser/parseAlterUser.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser1.out b/tests/data/parser/parseAlterUser1.out index 63eff1b34..61e511b65 100644 --- a/tests/data/parser/parseAlterUser1.out +++ b/tests/data/parser/parseAlterUser1.out @@ -604,6 +604,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser2.out b/tests/data/parser/parseAlterUser2.out index e009d382d..cc5fce2e2 100644 --- a/tests/data/parser/parseAlterUser2.out +++ b/tests/data/parser/parseAlterUser2.out @@ -604,6 +604,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser3.out b/tests/data/parser/parseAlterUser3.out index 650348145..dfa8121c5 100644 --- a/tests/data/parser/parseAlterUser3.out +++ b/tests/data/parser/parseAlterUser3.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser4.out b/tests/data/parser/parseAlterUser4.out index 2bbed4ce5..117201cb3 100644 --- a/tests/data/parser/parseAlterUser4.out +++ b/tests/data/parser/parseAlterUser4.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser5.out b/tests/data/parser/parseAlterUser5.out index 67e22f216..094d7883f 100644 --- a/tests/data/parser/parseAlterUser5.out +++ b/tests/data/parser/parseAlterUser5.out @@ -613,6 +613,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser6.out b/tests/data/parser/parseAlterUser6.out index 2a6471409..df17c7635 100644 --- a/tests/data/parser/parseAlterUser6.out +++ b/tests/data/parser/parseAlterUser6.out @@ -604,6 +604,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser7.out b/tests/data/parser/parseAlterUser7.out index 85602f8f5..80ee84227 100644 --- a/tests/data/parser/parseAlterUser7.out +++ b/tests/data/parser/parseAlterUser7.out @@ -658,6 +658,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterUser8.out b/tests/data/parser/parseAlterUser8.out index 56ea018f5..e3103360b 100644 --- a/tests/data/parser/parseAlterUser8.out +++ b/tests/data/parser/parseAlterUser8.out @@ -595,6 +595,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseAlterWithInvisible.out b/tests/data/parser/parseAlterWithInvisible.out index ef7da3e5a..f98be9c38 100644 --- a/tests/data/parser/parseAlterWithInvisible.out +++ b/tests/data/parser/parseAlterWithInvisible.out @@ -829,6 +829,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { @@ -1008,6 +1042,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { @@ -1181,6 +1249,40 @@ "VIEW_OPTIONS": { "AS": 1 }, + "EVENT_OPTIONS": { + "ON SCHEDULE": 1, + "EVERY": [ + 2, + "expr" + ], + "AT": [ + 2, + "expr" + ], + "STARTS": [ + 3, + "expr" + ], + "ENDS": [ + 4, + "expr" + ], + "ON COMPLETION PRESERVE": 5, + "ON COMPLETION NOT PRESERVE": 5, + "RENAME": 6, + "TO": [ + 7, + "var" + ], + "ENABLE": 8, + "DISABLE": 8, + "DISABLE ON SLAVE": 8, + "COMMENT": [ + 9, + "var" + ], + "DO": 10 + }, "options": { "@type": "PhpMyAdmin\\SqlParser\\Components\\OptionsArray", "options": { diff --git a/tests/data/parser/parseCreateDatabase.out b/tests/data/parser/parseCreateDatabase.out index e8171c978..7ace419aa 100644 --- a/tests/data/parser/parseCreateDatabase.out +++ b/tests/data/parser/parseCreateDatabase.out @@ -642,22 +642,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -671,8 +659,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateDatabaseErr.out b/tests/data/parser/parseCreateDatabaseErr.out index 04185f984..648d04539 100644 --- a/tests/data/parser/parseCreateDatabaseErr.out +++ b/tests/data/parser/parseCreateDatabaseErr.out @@ -669,22 +669,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -698,8 +686,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateFunction.out b/tests/data/parser/parseCreateFunction.out index 9009c9b39..e0b18e96f 100644 --- a/tests/data/parser/parseCreateFunction.out +++ b/tests/data/parser/parseCreateFunction.out @@ -1029,22 +1029,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1058,8 +1046,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateFunctionErr1.out b/tests/data/parser/parseCreateFunctionErr1.out index cae90ca09..a9d0247e6 100644 --- a/tests/data/parser/parseCreateFunctionErr1.out +++ b/tests/data/parser/parseCreateFunctionErr1.out @@ -993,22 +993,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1022,8 +1010,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateFunctionErr2.out b/tests/data/parser/parseCreateFunctionErr2.out index 0303421b7..634a0f90e 100644 --- a/tests/data/parser/parseCreateFunctionErr2.out +++ b/tests/data/parser/parseCreateFunctionErr2.out @@ -615,22 +615,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -644,8 +632,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateFunctionErr3.out b/tests/data/parser/parseCreateFunctionErr3.out index 73307dadd..d00f5d2ad 100644 --- a/tests/data/parser/parseCreateFunctionErr3.out +++ b/tests/data/parser/parseCreateFunctionErr3.out @@ -660,22 +660,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -689,8 +677,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateProcedure.out b/tests/data/parser/parseCreateProcedure.out index a84e191ab..892932abe 100644 --- a/tests/data/parser/parseCreateProcedure.out +++ b/tests/data/parser/parseCreateProcedure.out @@ -813,22 +813,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -842,8 +830,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateProcedure2.out b/tests/data/parser/parseCreateProcedure2.out index 5fbc1442d..50c5d6353 100644 --- a/tests/data/parser/parseCreateProcedure2.out +++ b/tests/data/parser/parseCreateProcedure2.out @@ -894,22 +894,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -923,8 +911,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateSchema.out b/tests/data/parser/parseCreateSchema.out index e8171c978..7ace419aa 100644 --- a/tests/data/parser/parseCreateSchema.out +++ b/tests/data/parser/parseCreateSchema.out @@ -642,22 +642,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -671,8 +659,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateSchemaErr.out b/tests/data/parser/parseCreateSchemaErr.out index 92fddd600..ec147b94c 100644 --- a/tests/data/parser/parseCreateSchemaErr.out +++ b/tests/data/parser/parseCreateSchemaErr.out @@ -669,22 +669,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -698,8 +686,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable.out b/tests/data/parser/parseCreateTable.out index dfbe5477e..3cfba1f36 100644 --- a/tests/data/parser/parseCreateTable.out +++ b/tests/data/parser/parseCreateTable.out @@ -1110,22 +1110,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1139,8 +1127,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable2.out b/tests/data/parser/parseCreateTable2.out index 8e7fc5b59..94f5b1ed8 100644 --- a/tests/data/parser/parseCreateTable2.out +++ b/tests/data/parser/parseCreateTable2.out @@ -2433,22 +2433,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -2462,8 +2450,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable3.out b/tests/data/parser/parseCreateTable3.out index 2f2816e86..ebe7f59ca 100644 --- a/tests/data/parser/parseCreateTable3.out +++ b/tests/data/parser/parseCreateTable3.out @@ -1092,22 +1092,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1121,8 +1109,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable4.out b/tests/data/parser/parseCreateTable4.out index 7fd35d9d4..dae644d1d 100644 --- a/tests/data/parser/parseCreateTable4.out +++ b/tests/data/parser/parseCreateTable4.out @@ -1605,22 +1605,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1634,8 +1622,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable5.out b/tests/data/parser/parseCreateTable5.out index fd53b7191..605fd9003 100644 --- a/tests/data/parser/parseCreateTable5.out +++ b/tests/data/parser/parseCreateTable5.out @@ -705,22 +705,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -734,8 +722,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable6.out b/tests/data/parser/parseCreateTable6.out index ea25b48b6..3e9c82466 100644 --- a/tests/data/parser/parseCreateTable6.out +++ b/tests/data/parser/parseCreateTable6.out @@ -714,22 +714,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -743,8 +731,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable7.out b/tests/data/parser/parseCreateTable7.out index e50ceb8b0..21b1c2bd7 100644 --- a/tests/data/parser/parseCreateTable7.out +++ b/tests/data/parser/parseCreateTable7.out @@ -2010,22 +2010,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -2039,8 +2027,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTable8.out b/tests/data/parser/parseCreateTable8.out index 67c3f8315..1ac5eecc5 100644 --- a/tests/data/parser/parseCreateTable8.out +++ b/tests/data/parser/parseCreateTable8.out @@ -840,22 +840,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -869,8 +857,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableAsSelect.out b/tests/data/parser/parseCreateTableAsSelect.out index 03983206e..4f408b5a7 100644 --- a/tests/data/parser/parseCreateTableAsSelect.out +++ b/tests/data/parser/parseCreateTableAsSelect.out @@ -678,22 +678,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -707,8 +695,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableEnforcedCheck.out b/tests/data/parser/parseCreateTableEnforcedCheck.out index 858616c24..9acc2768d 100644 --- a/tests/data/parser/parseCreateTableEnforcedCheck.out +++ b/tests/data/parser/parseCreateTableEnforcedCheck.out @@ -867,22 +867,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -896,8 +884,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableErr1.out b/tests/data/parser/parseCreateTableErr1.out index 16498e6ef..95ddf4620 100644 --- a/tests/data/parser/parseCreateTableErr1.out +++ b/tests/data/parser/parseCreateTableErr1.out @@ -714,22 +714,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -743,8 +731,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableErr2.out b/tests/data/parser/parseCreateTableErr2.out index 07d840b6b..630651f30 100644 --- a/tests/data/parser/parseCreateTableErr2.out +++ b/tests/data/parser/parseCreateTableErr2.out @@ -561,22 +561,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -590,8 +578,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableErr3.out b/tests/data/parser/parseCreateTableErr3.out index b76edca82..806f6cd9a 100644 --- a/tests/data/parser/parseCreateTableErr3.out +++ b/tests/data/parser/parseCreateTableErr3.out @@ -615,22 +615,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -644,8 +632,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableErr4.out b/tests/data/parser/parseCreateTableErr4.out index 2e78c16bd..47989bfa5 100644 --- a/tests/data/parser/parseCreateTableErr4.out +++ b/tests/data/parser/parseCreateTableErr4.out @@ -705,22 +705,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -734,8 +722,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableErr5.out b/tests/data/parser/parseCreateTableErr5.out index 3cbdc301b..28eb04aac 100644 --- a/tests/data/parser/parseCreateTableErr5.out +++ b/tests/data/parser/parseCreateTableErr5.out @@ -714,22 +714,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -743,8 +731,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableLike.out b/tests/data/parser/parseCreateTableLike.out index b8a7bf491..84bc4695e 100644 --- a/tests/data/parser/parseCreateTableLike.out +++ b/tests/data/parser/parseCreateTableLike.out @@ -624,22 +624,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -653,8 +641,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableNotEnforcedCheck.out b/tests/data/parser/parseCreateTableNotEnforcedCheck.out index 3bf27d84c..6401e09af 100644 --- a/tests/data/parser/parseCreateTableNotEnforcedCheck.out +++ b/tests/data/parser/parseCreateTableNotEnforcedCheck.out @@ -885,22 +885,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -914,8 +902,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableSelect.out b/tests/data/parser/parseCreateTableSelect.out index cc095e9bc..aa976918f 100644 --- a/tests/data/parser/parseCreateTableSelect.out +++ b/tests/data/parser/parseCreateTableSelect.out @@ -660,22 +660,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -689,8 +677,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableSpatial.out b/tests/data/parser/parseCreateTableSpatial.out index 296e937ad..1734d6a9f 100644 --- a/tests/data/parser/parseCreateTableSpatial.out +++ b/tests/data/parser/parseCreateTableSpatial.out @@ -750,22 +750,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -779,8 +767,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableTimestampWithPrecision.out b/tests/data/parser/parseCreateTableTimestampWithPrecision.out index 1e579c86b..84ed3ea93 100644 --- a/tests/data/parser/parseCreateTableTimestampWithPrecision.out +++ b/tests/data/parser/parseCreateTableTimestampWithPrecision.out @@ -1029,22 +1029,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1058,8 +1046,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTableWithInvisibleKey.out b/tests/data/parser/parseCreateTableWithInvisibleKey.out index 4a9ed24c0..b06b123e1 100644 --- a/tests/data/parser/parseCreateTableWithInvisibleKey.out +++ b/tests/data/parser/parseCreateTableWithInvisibleKey.out @@ -1902,22 +1902,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1931,8 +1919,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateTrigger.out b/tests/data/parser/parseCreateTrigger.out index 150cb3b05..611d48c6b 100644 --- a/tests/data/parser/parseCreateTrigger.out +++ b/tests/data/parser/parseCreateTrigger.out @@ -831,22 +831,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -860,8 +848,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateUser.out b/tests/data/parser/parseCreateUser.out index ac515d848..74adcdf71 100644 --- a/tests/data/parser/parseCreateUser.out +++ b/tests/data/parser/parseCreateUser.out @@ -579,22 +579,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -608,8 +596,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateView.out b/tests/data/parser/parseCreateView.out index 7a1738bd2..cf6667fb6 100644 --- a/tests/data/parser/parseCreateView.out +++ b/tests/data/parser/parseCreateView.out @@ -3099,22 +3099,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -3128,8 +3116,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateView2.out b/tests/data/parser/parseCreateView2.out index 49e6cea3f..e7fa2bcff 100644 --- a/tests/data/parser/parseCreateView2.out +++ b/tests/data/parser/parseCreateView2.out @@ -840,22 +840,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -869,8 +857,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateView3.out b/tests/data/parser/parseCreateView3.out index b32711b8c..248605be4 100644 --- a/tests/data/parser/parseCreateView3.out +++ b/tests/data/parser/parseCreateView3.out @@ -831,22 +831,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -860,8 +848,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateView4.out b/tests/data/parser/parseCreateView4.out index b25d780b1..cc66b5f5f 100644 --- a/tests/data/parser/parseCreateView4.out +++ b/tests/data/parser/parseCreateView4.out @@ -687,22 +687,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -716,8 +704,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateView5.out b/tests/data/parser/parseCreateView5.out index b3a759be7..c19864727 100644 --- a/tests/data/parser/parseCreateView5.out +++ b/tests/data/parser/parseCreateView5.out @@ -759,22 +759,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -788,8 +776,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateViewAsWithAs.out b/tests/data/parser/parseCreateViewAsWithAs.out index 3a0ce4df1..e0067129f 100644 --- a/tests/data/parser/parseCreateViewAsWithAs.out +++ b/tests/data/parser/parseCreateViewAsWithAs.out @@ -1875,22 +1875,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1904,8 +1892,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, @@ -3699,22 +3686,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -3728,8 +3703,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateViewMultiple.out b/tests/data/parser/parseCreateViewMultiple.out index 5fd5a0100..bc64c1b77 100644 --- a/tests/data/parser/parseCreateViewMultiple.out +++ b/tests/data/parser/parseCreateViewMultiple.out @@ -1893,22 +1893,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -1922,8 +1910,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateViewWithQuotes.out b/tests/data/parser/parseCreateViewWithQuotes.out index 52bc6f739..9ba56b8d0 100644 --- a/tests/data/parser/parseCreateViewWithQuotes.out +++ b/tests/data/parser/parseCreateViewWithQuotes.out @@ -921,22 +921,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -950,8 +938,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateViewWithUnion.out b/tests/data/parser/parseCreateViewWithUnion.out index 8b3f9b463..6c7321efe 100644 --- a/tests/data/parser/parseCreateViewWithUnion.out +++ b/tests/data/parser/parseCreateViewWithUnion.out @@ -948,22 +948,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -977,8 +965,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateViewWithWrongSyntax.out b/tests/data/parser/parseCreateViewWithWrongSyntax.out index 7afd36a13..b4e88b687 100644 --- a/tests/data/parser/parseCreateViewWithWrongSyntax.out +++ b/tests/data/parser/parseCreateViewWithWrongSyntax.out @@ -705,22 +705,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -734,8 +722,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseCreateViewWithoutQuotes.out b/tests/data/parser/parseCreateViewWithoutQuotes.out index ae14f6331..b45a2fcd7 100644 --- a/tests/data/parser/parseCreateViewWithoutQuotes.out +++ b/tests/data/parser/parseCreateViewWithoutQuotes.out @@ -930,22 +930,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -959,8 +947,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseExplainErr1.out b/tests/data/parser/parseExplainErr1.out index 65719b42a..e8af3cdb3 100644 --- a/tests/data/parser/parseExplainErr1.out +++ b/tests/data/parser/parseExplainErr1.out @@ -905,7 +905,7 @@ }, "message": "An expression was expected.", "code": 0, - "file": "\/mnt\/Dev\/@phpmyadmin\/sql-parser\/src\/Parser.php", + "file": "\/Users\/fawzi\/Desktop\/software\/other\/opensource\/sql_parser\/src\/Parser.php", "line": 623 }, { @@ -915,7 +915,7 @@ }, "message": "An expression was expected.", "code": 0, - "file": "\/mnt\/Dev\/@phpmyadmin\/sql-parser\/src\/Parser.php", + "file": "\/Users\/fawzi\/Desktop\/software\/other\/opensource\/sql_parser\/src\/Parser.php", "line": 623 } ] diff --git a/tests/data/parser/parseWithStatement1.out b/tests/data/parser/parseWithStatement1.out index 07ec8549b..4e226b376 100644 --- a/tests/data/parser/parseWithStatement1.out +++ b/tests/data/parser/parseWithStatement1.out @@ -867,22 +867,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -896,8 +884,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatement4.out b/tests/data/parser/parseWithStatement4.out index cc9fa6854..ee1ff28a7 100644 --- a/tests/data/parser/parseWithStatement4.out +++ b/tests/data/parser/parseWithStatement4.out @@ -831,22 +831,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -860,8 +848,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatement5.out b/tests/data/parser/parseWithStatement5.out index 12e4fa0c9..6c0b78fd1 100644 --- a/tests/data/parser/parseWithStatement5.out +++ b/tests/data/parser/parseWithStatement5.out @@ -876,22 +876,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -905,8 +893,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatement6.out b/tests/data/parser/parseWithStatement6.out index acdae0146..5437fbf76 100644 --- a/tests/data/parser/parseWithStatement6.out +++ b/tests/data/parser/parseWithStatement6.out @@ -858,22 +858,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -887,8 +875,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatementErr1.out b/tests/data/parser/parseWithStatementErr1.out index 3d742c279..b3d9f29f7 100644 --- a/tests/data/parser/parseWithStatementErr1.out +++ b/tests/data/parser/parseWithStatementErr1.out @@ -849,22 +849,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -878,8 +866,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatementErr3.out b/tests/data/parser/parseWithStatementErr3.out index 0913234ea..f7eaa6faf 100644 --- a/tests/data/parser/parseWithStatementErr3.out +++ b/tests/data/parser/parseWithStatementErr3.out @@ -804,22 +804,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -833,8 +821,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatementErr4.out b/tests/data/parser/parseWithStatementErr4.out index 422cf0610..7dbf11c42 100644 --- a/tests/data/parser/parseWithStatementErr4.out +++ b/tests/data/parser/parseWithStatementErr4.out @@ -813,22 +813,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -842,8 +830,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1, diff --git a/tests/data/parser/parseWithStatementErr5.out b/tests/data/parser/parseWithStatementErr5.out index 6543a1a27..152bc47f5 100644 --- a/tests/data/parser/parseWithStatementErr5.out +++ b/tests/data/parser/parseWithStatementErr5.out @@ -795,22 +795,10 @@ 3, "var=" ], - "CONTAINS": [ - 4, - "expr" - ], - "NO": [ - 4, - "var" - ], - "READS": [ - 4, - "var" - ], - "MODIFIES": [ - 4, - "expr" - ], + "CONTAINS SQL": 4, + "NO SQL": 4, + "READS SQL DATA": 4, + "MODIFIES SQL DATA": 4, "SQL SECURITY": [ 6, "var" @@ -824,8 +812,7 @@ "var" ], "CREATE": 1, - "DETERMINISTIC": 2, - "DATA": 5 + "DETERMINISTIC": 2 }, "TRIGGER_OPTIONS": { "BEFORE": 1,