December 2022 - Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] 55e95c: Fix type error when copying tables
by Maurício Meneghini Fauth 14 Dec '22

14 Dec '22

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 55e95ccd09ff04dd58fa87fac6a0695be3355de2 https://github.com/phpmyadmin/phpmyadmin/commit/55e95ccd09ff04dd58fa87fac6a… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2022-12-14 (Wed, 12 December 2022) -03:00 Changed paths: M libraries/classes/Table.php M psalm-baseline.xml Log Message: ----------- Fix type error when copying tables Related to 873eb098b922638d33a7748fedc3b33ead33227c and a84cae6c2d5feb725cb174842a4b2189bafeba67. Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>

1 0

[phpmyadmin/phpmyadmin] 47238d: Fix ImportController failing test and other minor fixes
by Maurício Meneghini Fauth 14 Dec '22

14 Dec '22

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 47238d6c8c8e04e3363680cb7bb269740a832cfa https://github.com/phpmyadmin/phpmyadmin/commit/47238d6c8c8e04e3363680cb7bb… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2022-12-14 (Wed, 12 December 2022) -03:00 Changed paths: M libraries/classes/Controllers/Import/ImportController.php M libraries/classes/Database/Designer/Common.php M phpstan-baseline.neon M psalm-baseline.xml M test/classes/Controllers/Import/ImportControllerTest.php Log Message: ----------- Fix ImportController failing test and other minor fixes Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev>

1 0

[phpmyadmin/phpmyadmin] a84cae: Refactor ExportSql - part 1 (#17955)
by Kamil Tekiela 14 Dec '22

14 Dec '22

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a84cae6c2d5feb725cb174842a4b2189bafeba67 https://github.com/phpmyadmin/phpmyadmin/commit/a84cae6c2d5feb725cb174842a4… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2022-12-14 (Wed, 12 December 2022) -03:00 Changed paths: M libraries/classes/Plugins/Export/ExportSql.php M libraries/classes/Plugins/ExportPlugin.php M libraries/classes/Table.php M libraries/classes/Tracker.php M phpstan-baseline.neon M psalm-baseline.xml M test/classes/Plugins/Export/ExportSqlTest.php Log Message: ----------- Refactor ExportSql - part 1 (#17955) * Add getTableStatus method Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove unused $errorUrl parameter Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove unused parameter $table Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Add string return types Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Refactor exportUseStatement Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Specify param types for exportConfigurationMetadata Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * param types for getTableDefForView Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Param types for getTableComments Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Small fixes Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Extract addCompatOptions() method Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove no longer needed suppress Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Merge if statements by SonarLint Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update phpstan-baseline.neon Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Specify param types for exportRoutineSQL Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Specify param types for generateComment Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Specify param types for replaceWithAliases Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update psalm-baseline.xml Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] 9e3129: Translated using Weblate (Serbian (latin))
by Kristijan Fremen Velkovski 13 Dec '22

13 Dec '22

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9e31295234d5b5349f066e1057e8a68e3232b5e9 https://github.com/phpmyadmin/phpmyadmin/commit/9e31295234d5b5349f066e1057e… Author: Kristijan Fremen Velkovski <me(a)krisfremen.com> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate (Serbian (latin)) Currently translated at 38.9% (1339 of 3434 strings) [ci skip] Translation: phpMyAdmin/Development Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/master/sr_Latn/ Signed-off-by: Kristijan Fremen Velkovski <me(a)krisfremen.com>

1 0

[phpmyadmin/phpmyadmin] 484970: Translated using Weblate (Serbian (latin))
by Kristijan Fremen Velkovski 13 Dec '22

13 Dec '22

Branch: refs/heads/QA_4_9 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4849709285f55ff4648b8613d9458ee88e8075ff https://github.com/phpmyadmin/phpmyadmin/commit/4849709285f55ff4648b8613d94… Author: Kristijan Fremen Velkovski <me(a)krisfremen.com> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate (Serbian (latin)) Currently translated at 42.5% (1408 of 3309 strings) [CI skip] Translation: phpMyAdmin/4.9 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/4-9/sr_Latn/ Signed-off-by: Kristijan Fremen Velkovski <me(a)krisfremen.com>

1 0

[phpmyadmin/phpmyadmin] 370c6d: Translated using Weblate (Serbian (latin))
by Kristijan Fremen Velkovski 13 Dec '22

13 Dec '22

Branch: refs/heads/QA_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 370c6d372a0752edb2dca7e4c74bd8a6de8aedb6 https://github.com/phpmyadmin/phpmyadmin/commit/370c6d372a0752edb2dca7e4c74… Author: Kristijan Fremen Velkovski <me(a)krisfremen.com> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: M po/sr(a)latin.po Log Message: ----------- Translated using Weblate (Serbian (latin)) Currently translated at 39.2% (1340 of 3418 strings) [ci skip] Translation: phpMyAdmin/5.2 Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/5-2/sr_Latn/ Signed-off-by: Kristijan Fremen Velkovski <me(a)krisfremen.com>

1 0

[phpmyadmin/sql-parser] 4302a1: Update the contexts to support MULTIPOINT and MULTIPOLYGON
by iifawzi 13 Dec '22

13 Dec '22

Branch: refs/heads/6.0.x Home: https://github.com/phpmyadmin/sql-parser Commit: 4302a11f24c74b2a4088816e8479664433f402b8 https://github.com/phpmyadmin/sql-parser/commit/4302a11f24c74b2a4088816e847… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-11-27 (Sun, 11 November 2022) +02:00 Changed paths: A tests/data/parser/parseCreateTable8.in A tests/data/parser/parseCreateTable8.out M src/Contexts/ContextMariaDb100000.php M src/Contexts/ContextMariaDb100100.php M src/Contexts/ContextMariaDb100200.php M src/Contexts/ContextMariaDb100300.php M src/Contexts/ContextMariaDb100400.php M src/Contexts/ContextMariaDb100500.php M src/Contexts/ContextMariaDb100600.php M src/Contexts/ContextMySql50000.php M src/Contexts/ContextMySql50100.php M src/Contexts/ContextMySql50500.php M src/Contexts/ContextMySql50600.php M src/Contexts/ContextMySql50700.php M src/Contexts/ContextMySql80000.php M tools/contexts/_common.txt Log Message: ----------- Update the contexts to support MULTIPOINT and MULTIPOLYGON Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: ff05a90a2713ac1e39d7ed08a956b570ed19f5ef https://github.com/phpmyadmin/sql-parser/commit/ff05a90a2713ac1e39d7ed08a95… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-11-27 (Sun, 11 November 2022) +02:00 Changed paths: M CHANGELOG.md M tests/Parser/CreateStatementTest.php Log Message: ----------- update the tests and the changelog Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 00b28506c984c54e4fd422cf399ac81e158f2e87 https://github.com/phpmyadmin/sql-parser/commit/00b28506c984c54e4fd422cf399… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-11-27 (Sun, 11 November 2022) +02:00 Changed paths: M CHANGELOG.md Log Message: ----------- Update the changelog Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: ab22290da84ae943993d154bd79d85673b4a42b4 https://github.com/phpmyadmin/sql-parser/commit/ab22290da84ae943993d154bd79… Author: iifawzi <iifawzie(a)gmail.com> Date: 2022-11-27 (Sun, 11 November 2022) +02:00 Changed paths: M tools/contexts/_common.txt Log Message: ----------- sort the added keywords alphabetically Signed-off-by: iifawzi <iifawzie(a)gmail.com> Commit: 3b4b2ae89ab4bbfc8715a38a83a22dce93d8327f https://github.com/phpmyadmin/sql-parser/commit/3b4b2ae89ab4bbfc8715a38a83a… Author: Kristijan Fremen Velkovski <me(a)krisfremen.com> Date: 2022-12-09 (Fri, 12 December 2022) +01:00 Changed paths: M locale/mk/LC_MESSAGES/sqlparser.mo M locale/mk/LC_MESSAGES/sqlparser.po Log Message: ----------- Translated using Weblate (Macedonian) Currently translated at 20.3% (11 of 54 strings) [CI skip] Translation: phpMyAdmin/SQL parser Translate-URL: https://hosted.weblate.org/projects/phpmyadmin/sql-parser/mk/ Signed-off-by: Kristijan Fremen Velkovski <me(a)krisfremen.com> Commit: 20872bbe177c8593ccc8f8caef77605f83da252b https://github.com/phpmyadmin/sql-parser/commit/20872bbe177c8593ccc8f8caef7… Author: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Date: 2022-12-10 (Sat, 12 December 2022) -03:00 Changed paths: M .github/workflows/mutation-tests.yml M .github/workflows/tests.yml Log Message: ----------- Add PHP 8.2 to test workflow matrix Signed-off-by: Maurício Meneghini Fauth <mauricio(a)fauth.dev> Commit: a3770778db205fa42d34432ac1bfc32870a85e6b https://github.com/phpmyadmin/sql-parser/commit/a3770778db205fa42d34432ac1b… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-12 (Mon, 12 December 2022) +01:00 Changed paths: M .editorconfig Log Message: ----------- Do not add a final new line for context files Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 6b60b4984b6f4dbcbaa40c1f707be3b5d32b3466 https://github.com/phpmyadmin/sql-parser/commit/6b60b4984b6f4dbcbaa40c1f707… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-12 (Mon, 12 December 2022) +01:00 Changed paths: M .github/workflows/tests.yml Log Message: ----------- Bump codecov action to v3 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: e29ed1e1b957d54d6e31bafd07a3f3fa371c92ab https://github.com/phpmyadmin/sql-parser/commit/e29ed1e1b957d54d6e31bafd07a… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-12 (Mon, 12 December 2022) +01:00 Changed paths: A tests/data/parser/parseCreateTable8.in A tests/data/parser/parseCreateTable8.out M CHANGELOG.md M src/Contexts/ContextMariaDb100000.php M src/Contexts/ContextMariaDb100100.php M src/Contexts/ContextMariaDb100200.php M src/Contexts/ContextMariaDb100300.php M src/Contexts/ContextMariaDb100400.php M src/Contexts/ContextMariaDb100500.php M src/Contexts/ContextMariaDb100600.php M src/Contexts/ContextMySql50000.php M src/Contexts/ContextMySql50100.php M src/Contexts/ContextMySql50500.php M src/Contexts/ContextMySql50600.php M src/Contexts/ContextMySql50700.php M src/Contexts/ContextMySql80000.php M tests/Parser/CreateStatementTest.php M tools/contexts/_common.txt Log Message: ----------- Merge #393 - Fix #326 - Updated contexts to contain multipoint and multipolygon data types Pull-request: #393 Fixes: #326 Signed-off-by: William Desportes <williamdes(a)wdes.fr> 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: e8120cb4198b72cf1e0fdae19bec96fee87a940d https://github.com/phpmyadmin/sql-parser/commit/e8120cb4198b72cf1e0fdae19be… Author: William Desportes <williamdes(a)wdes.fr> Date: 2022-12-13 (Tue, 12 December 2022) +01:00 Changed paths: A tests/data/parser/parseCreateTable8.in A tests/data/parser/parseCreateTable8.out M .editorconfig M .github/workflows/mutation-tests.yml M .github/workflows/tests.yml M CHANGELOG.md M locale/mk/LC_MESSAGES/sqlparser.mo M locale/mk/LC_MESSAGES/sqlparser.po M src/Contexts/ContextMariaDb100000.php M src/Contexts/ContextMariaDb100100.php M src/Contexts/ContextMariaDb100200.php M src/Contexts/ContextMariaDb100300.php M src/Contexts/ContextMariaDb100400.php M src/Contexts/ContextMariaDb100500.php M src/Contexts/ContextMariaDb100600.php M src/Contexts/ContextMySql50000.php M src/Contexts/ContextMySql50100.php M src/Contexts/ContextMySql50500.php M src/Contexts/ContextMySql50600.php M src/Contexts/ContextMySql50700.php M src/Contexts/ContextMySql80000.php M tests/Parser/CreateStatementTest.php M tools/contexts/_common.txt Log Message: ----------- Merge branch 'master' into 6.0.x Signed-off-by: William Desportes <williamdes(a)wdes.fr> 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> Commit: ff440a08916c9bf8cf0822f420a23a2ae2a37a37 https://github.com/phpmyadmin/sql-parser/commit/ff440a08916c9bf8cf0822f420a… 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 src/Utils/Formatter.php M tests/Builder/SelectStatementTest.php M tests/Parser/CreateStatementTest.php M tests/Parser/SelectStatementTest.php 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/pma11800.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/parseAlterUser.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/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/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: ----------- Merge branch 'master' into 6.0.x Signed-off-by: William Desportes <williamdes(a)wdes.fr>

1 0

[phpmyadmin/sql-parser] 184fc9: Making getMergedOptions protected
by iifawzi 13 Dec '22

13 Dec '22

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>

1 0

[phpmyadmin/phpmyadmin] 6ae405: Remove globals from ExportController (#17948)
by Kamil Tekiela 13 Dec '22

13 Dec '22

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6ae40562e5881836d86b945b2db0e1cfafae47ed https://github.com/phpmyadmin/phpmyadmin/commit/6ae40562e5881836d86b945b2db… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) -03:00 Changed paths: M libraries/classes/Controllers/Export/ExportController.php M libraries/classes/Controllers/Preferences/ManageController.php M phpstan-baseline.neon M psalm-baseline.xml Log Message: ----------- Remove globals from ExportController (#17948) * Remove globals from Export controller Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * filename_template Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * export_plugin Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * compression_methods Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * onserver Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * quick_export Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * remember_template Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * mime_type Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * do_relation Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * doComments Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * do_mime Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * do_dates Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * whatStrucOrData Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * db_select Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * table_structure Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * lock_tables Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * allrows Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> Update ExportController.php * limit_to Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> Update ExportController.php Update ExportController.php * limit_from Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Remove unused globals Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * $GLOBALS['filename'] in ManageController Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * filename Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update psalm-baseline.xml Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> * Update phpstan-baseline.neon Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com> Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com>

1 0

[phpmyadmin/phpmyadmin] f783bd: Change variable name case
by Kamil Tekiela 13 Dec '22

13 Dec '22

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f783bdea6c4537a5e56061196d963b0f1f0e8a8b https://github.com/phpmyadmin/phpmyadmin/commit/f783bdea6c4537a5e56061196d9… Author: Kamil Tekiela <tekiela246(a)gmail.com> Date: 2022-12-13 (Tue, 12 December 2022) -03:00 Changed paths: M libraries/classes/Operations.php M phpstan-baseline.neon M psalm-baseline.xml Log Message: ----------- Change variable name case Signed-off-by: Kamil Tekiela <tekiela246(a)gmail.com>

1 0