[phpMyAdmin Git] [phpmyadmin/sql-parser] 184fc9: Making getMergedOptions protected

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 184fc9db84ff64b718ec263313a951eaa69ca76f https://github.com/phpmyadmin/sql-parser/commit/184fc9db84ff64b718ec263313a… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: M src/Utils/Formatter.php Log Message: ----------- Making getMergedOptions protected Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 7dc4b80b20e2c1576895c171759c68baf6d84d2c https://github.com/phpmyadmin/sql-parser/commit/7dc4b80b20e2c1576895c171759… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: A tests/data/parser/parseCreateView5.in A tests/data/parser/parseCreateView5.out M CHANGELOG.md M src/Components/Expression.php M tests/Builder/SelectStatementTest.php Log Message: ----------- Improving Expression to allow is null and is not null column options Fixes: https://github.com/phpmyadmin/phpmyadmin/issues/17422 Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 5e34787a8aa0a9b057714ee6a366505d9e7e7de1 https://github.com/phpmyadmin/sql-parser/commit/5e34787a8aa0a9b057714ee6a36… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: M src/Components/Expression.php M tests/Builder/SelectStatementTest.php Log Message: ----------- Tiny improvement to handle the columns if backtick is used Example: SELECT `test3`.`t1` is not null AS `is_not_null` FROM `test3` Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: eff7fa796f69bc0d672aca7b62c47e60368354f0 https://github.com/phpmyadmin/sql-parser/commit/eff7fa796f69bc0d672aca7b62c… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: A tests/data/parser/parseSelectOrderByIsNull.in A tests/data/parser/parseSelectOrderByIsNull.out M tests/Builder/SelectStatementTest.php M tests/Parser/CreateStatementTest.php M tests/Parser/SelectStatementTest.php Log Message: ----------- Adding more tests to test order by is null columns Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: aea568fc0de62e4bb5715f1de388c9894a7802f8 https://github.com/phpmyadmin/sql-parser/commit/aea568fc0de62e4bb5715f1de38… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: M src/Components/Expression.php Log Message: ----------- sorting the allowed keywords and adding between Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 26cf20e543dd2629d457512ccd057c398fa6fd37 https://github.com/phpmyadmin/sql-parser/commit/26cf20e543dd2629d457512ccd0… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: M tests/Builder/SelectStatementTest.php Log Message: ----------- Adding more tests to test the expression component Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 7bffadaa56403c93f177b888f632bcbb0f207cef https://github.com/phpmyadmin/sql-parser/commit/7bffadaa56403c93f177b888f63… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: M CHANGELOG.md Log Message: ----------- Update the changelog Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: d3e3c6ce9e5e39e09fd3ce85948362619fdc6c1c https://github.com/phpmyadmin/sql-parser/commit/d3e3c6ce9e5e39e09fd3ce85948… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) +02:00 Changed paths: M src/Components/Expression.php M tests/Builder/SelectStatementTest.php M tests/data/bugs/pma11800.out M tests/data/parser/parseAlterUser.out Log Message: ----------- Support RLIKE, and improve whitespace handling Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 6d873dbd96da44c67574ace39ad4c024cf0490dd https://github.com/phpmyadmin/sql-parser/commit/6d873dbd96da44c67574ace39ad… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: M src/Utils/Formatter.php Log Message: ----------- Merge #400 - Fixing tests on php 8.3 - making getMergedOptions protected Pull-request: #400 This is an acceptable workaround, related functions are protected Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 0b186b17eca3c257c85cd640c905aec620730e28 https://github.com/phpmyadmin/sql-parser/commit/0b186b17eca3c257c85cd640c90… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: A tests/data/parser/parseCreateView5.in A tests/data/parser/parseCreateView5.out A tests/data/parser/parseSelectOrderByIsNull.in A tests/data/parser/parseSelectOrderByIsNull.out M CHANGELOG.md M src/Components/Expression.php M tests/Builder/SelectStatementTest.php M tests/Parser/CreateStatementTest.php M tests/Parser/SelectStatementTest.php M tests/data/bugs/pma11800.out M tests/data/parser/parseAlterUser.out Log Message: ----------- Merge #399 - Improving the Expression component's allowed keywords Pull-request: #399 Fixes: phpmyadmin/phpmyadmin#17422 Fixes: #396 Fixes: #171 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: a6da770b9d5b52b63262412dd76c0cef467abd23 https://github.com/phpmyadmin/sql-parser/commit/a6da770b9d5b52b63262412dd76… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: M tests/data/bugs/gh14.out M tests/data/bugs/gh16.out M tests/data/bugs/gh317.out M tests/data/bugs/gh9.out M tests/data/bugs/pma11836.out M tests/data/bugs/pma11843.out M tests/data/bugs/pma11879.out M tests/data/misc/parseParameter.out M tests/data/parser/parse.out M tests/data/parser/parse2.out M tests/data/parser/parseAlter.out M tests/data/parser/parseAlter10.out M tests/data/parser/parseAlter11.out M tests/data/parser/parseAlter12.out M tests/data/parser/parseAlter13.out M tests/data/parser/parseAlter3.out M tests/data/parser/parseAlter4.out M tests/data/parser/parseAlter5.out M tests/data/parser/parseAlter6.out M tests/data/parser/parseAlter7.out M tests/data/parser/parseAlter8.out M tests/data/parser/parseAlter9.out M tests/data/parser/parseAlterErr.out M tests/data/parser/parseAlterErr2.out M tests/data/parser/parseAlterErr3.out M tests/data/parser/parseAlterErr4.out M tests/data/parser/parseAlterTableCharacterSet1.out M tests/data/parser/parseAlterTableCharacterSet2.out M tests/data/parser/parseAlterTableCharacterSet3.out M tests/data/parser/parseAlterTableCharacterSet4.out M tests/data/parser/parseAlterTableCharacterSet5.out M tests/data/parser/parseAlterTableCharacterSet6.out M tests/data/parser/parseAlterTableCharacterSet7.out M tests/data/parser/parseAlterTableSetAutoIncrementError.out M tests/data/parser/parseAlterUser1.out M tests/data/parser/parseAlterUser2.out M tests/data/parser/parseAlterUser3.out M tests/data/parser/parseAlterUser4.out M tests/data/parser/parseAlterUser5.out M tests/data/parser/parseAlterUser6.out M tests/data/parser/parseAlterUser7.out M tests/data/parser/parseAlterUser8.out M tests/data/parser/parseAlterWithInvisible.out M tests/data/parser/parseAnalyzeTable.out M tests/data/parser/parseAnalyzeTable1.out M tests/data/parser/parseArrayErr1.out M tests/data/parser/parseArrayErr3.out M tests/data/parser/parseCreateDatabase.out M tests/data/parser/parseCreateDatabaseErr.out M tests/data/parser/parseCreateFunction.out M tests/data/parser/parseCreateFunctionErr1.out M tests/data/parser/parseCreateFunctionErr2.out M tests/data/parser/parseCreateFunctionErr3.out M tests/data/parser/parseCreateProcedure.out M tests/data/parser/parseCreateProcedure1.out M tests/data/parser/parseCreateProcedure2.out M tests/data/parser/parseCreateSchema.out M tests/data/parser/parseCreateSchemaErr.out M tests/data/parser/parseCreateTable.out M tests/data/parser/parseCreateTable2.out M tests/data/parser/parseCreateTable3.out M tests/data/parser/parseCreateTable4.out M tests/data/parser/parseCreateTable5.out M tests/data/parser/parseCreateTable6.out M tests/data/parser/parseCreateTable7.out M tests/data/parser/parseCreateTable8.out M tests/data/parser/parseCreateTableAsSelect.out M tests/data/parser/parseCreateTableEnforcedCheck.out M tests/data/parser/parseCreateTableErr1.out M tests/data/parser/parseCreateTableErr3.out M tests/data/parser/parseCreateTableErr4.out M tests/data/parser/parseCreateTableErr5.out M tests/data/parser/parseCreateTableLike.out M tests/data/parser/parseCreateTableNotEnforcedCheck.out M tests/data/parser/parseCreateTableSelect.out M tests/data/parser/parseCreateTableSpatial.out M tests/data/parser/parseCreateTableTimestampWithPrecision.out M tests/data/parser/parseCreateTableWithInvisibleKey.out M tests/data/parser/parseCreateTrigger.out M tests/data/parser/parseCreateUser.out M tests/data/parser/parseCreateView.out M tests/data/parser/parseCreateView2.out M tests/data/parser/parseCreateView3.out M tests/data/parser/parseCreateView4.out M tests/data/parser/parseCreateView5.out M tests/data/parser/parseCreateViewAsWithAs.out M tests/data/parser/parseCreateViewMultiple.out M tests/data/parser/parseCreateViewWithQuotes.out M tests/data/parser/parseCreateViewWithUnion.out M tests/data/parser/parseCreateViewWithWrongSyntax.out M tests/data/parser/parseCreateViewWithoutQuotes.out M tests/data/parser/parseDelete.out M tests/data/parser/parseDelete10.out M tests/data/parser/parseDelete11.out M tests/data/parser/parseDelete12.out M tests/data/parser/parseDelete2.out M tests/data/parser/parseDelete3.out M tests/data/parser/parseDelete4.out M tests/data/parser/parseDelete5.out M tests/data/parser/parseDelete6.out M tests/data/parser/parseDelete7.out M tests/data/parser/parseDelete8.out M tests/data/parser/parseDelete9.out M tests/data/parser/parseDeleteErr10.out M tests/data/parser/parseDeleteErr11.out M tests/data/parser/parseDeleteErr12.out M tests/data/parser/parseDeleteErr2.out M tests/data/parser/parseDeleteErr3.out M tests/data/parser/parseDeleteErr4.out M tests/data/parser/parseDeleteErr5.out M tests/data/parser/parseDeleteErr6.out M tests/data/parser/parseDeleteErr7.out M tests/data/parser/parseDeleteErr8.out M tests/data/parser/parseDeleteErr9.out M tests/data/parser/parseDeleteJoin.out M tests/data/parser/parseDelimiter.out M tests/data/parser/parseDrop.out M tests/data/parser/parseDrop2.out M tests/data/parser/parseExplain.out M tests/data/parser/parseExplain1.out M tests/data/parser/parseExplain3.out M tests/data/parser/parseExplain4.out M tests/data/parser/parseExplainErr.out M tests/data/parser/parseInsert.out M tests/data/parser/parseInsertErr2.out M tests/data/parser/parseInsertIntoErr.out M tests/data/parser/parseInsertIntoSet.out M tests/data/parser/parseInsertOnDuplicateKey.out M tests/data/parser/parseInsertOnDuplicateKeyErr.out M tests/data/parser/parseInsertSelect.out M tests/data/parser/parseInsertSelectOnDuplicateKey.out M tests/data/parser/parseInsertSet.out M tests/data/parser/parseInsertSetOnDuplicateKey.out M tests/data/parser/parseLimitErr1.out M tests/data/parser/parseLimitErr2.out M tests/data/parser/parseLoad1.out M tests/data/parser/parseLoad2.out M tests/data/parser/parseLoad3.out M tests/data/parser/parseLoad4.out M tests/data/parser/parseLoad5.out M tests/data/parser/parseLoad6.out M tests/data/parser/parseLoadErr3.out M tests/data/parser/parseLoadErr4.out M tests/data/parser/parseLoadErr5.out M tests/data/parser/parseLoadErr6.out M tests/data/parser/parseLock1.out M tests/data/parser/parseLock2.out M tests/data/parser/parseLock3.out M tests/data/parser/parseLock4.out M tests/data/parser/parseLock5.out M tests/data/parser/parseLock6.out M tests/data/parser/parseLockErr1.out M tests/data/parser/parseLockErr10.out M tests/data/parser/parseLockErr2.out M tests/data/parser/parseLockErr5.out M tests/data/parser/parseLockErr6.out M tests/data/parser/parseLockErr7.out M tests/data/parser/parseLockErr8.out M tests/data/parser/parseLockErr9.out M tests/data/parser/parsePurge.out M tests/data/parser/parsePurge2.out M tests/data/parser/parsePurge3.out M tests/data/parser/parsePurge4.out M tests/data/parser/parsePurgeErr3.out M tests/data/parser/parseRename.out M tests/data/parser/parseRename2.out M tests/data/parser/parseRenameErr1.out M tests/data/parser/parseRenameErr3.out M tests/data/parser/parseRenameErr4.out M tests/data/parser/parseReplace.out M tests/data/parser/parseReplace2.out M tests/data/parser/parseReplaceErr.out M tests/data/parser/parseReplaceErr3.out M tests/data/parser/parseReplaceIntoErr.out M tests/data/parser/parseReplaceSelect.out M tests/data/parser/parseReplaceSet.out M tests/data/parser/parseReplaceValues.out M tests/data/parser/parseRestore.out M tests/data/parser/parseSelect.out M tests/data/parser/parseSelect10.out M tests/data/parser/parseSelect11.out M tests/data/parser/parseSelect12.out M tests/data/parser/parseSelect13.out M tests/data/parser/parseSelect14.out M tests/data/parser/parseSelect2.out M tests/data/parser/parseSelect3.out M tests/data/parser/parseSelect4.out M tests/data/parser/parseSelect5.out M tests/data/parser/parseSelect6.out M tests/data/parser/parseSelect7.out M tests/data/parser/parseSelect8.out M tests/data/parser/parseSelect9.out M tests/data/parser/parseSelectCase1.out M tests/data/parser/parseSelectCase2.out M tests/data/parser/parseSelectCase3.out M tests/data/parser/parseSelectCase4.out M tests/data/parser/parseSelectCase5.out M tests/data/parser/parseSelectCaseAlias1.out M tests/data/parser/parseSelectCaseAlias2.out M tests/data/parser/parseSelectCaseAlias3.out M tests/data/parser/parseSelectCaseAlias4.out M tests/data/parser/parseSelectCaseAlias5.out M tests/data/parser/parseSelectCaseAlias6.out M tests/data/parser/parseSelectCaseAliasErr1.out M tests/data/parser/parseSelectCaseAliasErr2.out M tests/data/parser/parseSelectCaseAliasErr3.out M tests/data/parser/parseSelectCaseAliasErr4.out M tests/data/parser/parseSelectCaseErr1.out M tests/data/parser/parseSelectCaseErr2.out M tests/data/parser/parseSelectCaseErr3.out M tests/data/parser/parseSelectCaseErr4.out M tests/data/parser/parseSelectCaseErr5.out M tests/data/parser/parseSelectEndOptions1.out M tests/data/parser/parseSelectEndOptions2.out M tests/data/parser/parseSelectEndOptionsErr.out M tests/data/parser/parseSelectErr1.out M tests/data/parser/parseSelectErr2.out M tests/data/parser/parseSelectExists.out M tests/data/parser/parseSelectIndexHint1.out M tests/data/parser/parseSelectIndexHint2.out M tests/data/parser/parseSelectIndexHintErr1.out M tests/data/parser/parseSelectIndexHintErr2.out M tests/data/parser/parseSelectIndexHintErr3.out M tests/data/parser/parseSelectIndexHintErr4.out M tests/data/parser/parseSelectIntoOptions1.out M tests/data/parser/parseSelectIntoOptions2.out M tests/data/parser/parseSelectIntoOptions3.out M tests/data/parser/parseSelectJoinCross.out M tests/data/parser/parseSelectJoinMultiple.out M tests/data/parser/parseSelectJoinMultiple2.out M tests/data/parser/parseSelectJoinNatural.out M tests/data/parser/parseSelectJoinNaturalLeft.out M tests/data/parser/parseSelectJoinNaturalLeftOuter.out M tests/data/parser/parseSelectJoinNaturalRight.out M tests/data/parser/parseSelectJoinNaturalRightOuter.out M tests/data/parser/parseSelectJoinStraight.out M tests/data/parser/parseSelectNested.out M tests/data/parser/parseSelectOrderByComment.out M tests/data/parser/parseSelectOrderByIsNull.out M tests/data/parser/parseSelectOverAlias_mariadb_100600.out M tests/data/parser/parseSelectUnion.out M tests/data/parser/parseSelectUnion2.out M tests/data/parser/parseSelectWhere.out M tests/data/parser/parseSelectWithParenthesis.out M tests/data/parser/parseSelectWrongOrder.out M tests/data/parser/parseSelectWrongOrder2.out M tests/data/parser/parseTransaction.out M tests/data/parser/parseTransaction2.out M tests/data/parser/parseTransaction3.out M tests/data/parser/parseUpdate.out M tests/data/parser/parseUpdate2.out M tests/data/parser/parseUpdate3.out M tests/data/parser/parseUpdateErr.out M tests/data/parser/parseWithStatement.out M tests/data/parser/parseWithStatement1.out M tests/data/parser/parseWithStatement2.out M tests/data/parser/parseWithStatement3.out M tests/data/parser/parseWithStatement4.out M tests/data/parser/parseWithStatement5.out M tests/data/parser/parseWithStatement6.out M tests/data/parser/parseWithStatement7.out M tests/data/parser/parseWithStatementErr.out M tests/data/parser/parseWithStatementErr1.out M tests/data/parser/parseWithStatementErr2.out M tests/data/parser/parseWithStatementErr3.out M tests/data/parser/parseWithStatementErr4.out M tests/data/parser/parseWithStatementErr5.out M tests/data/parser/parseWithStatementErr6.out M tests/data/parser/parseWithStatementErr7.out M tests/data/parser/parseWithStatementErr8.out Log Message: ----------- Update out files Signed-off-by: William Desportes <williamdes(a)wdes.fr>