Branch: refs/heads/QA Home: https://github.com/phpmyadmin/sql-parser Commit: 7095bccebf2b03d645c5b0709c23096350a8cc38 https://github.com/phpmyadmin/sql-parser/commit/7095bccebf2b03d645c5b0709c2… Author: Nicolas Giraud <nicolas.giraud.dev(a)gmail.com> Date: 2020-03-20 (Fri, 03 March 2020) +01:00 Changed paths: A tests/data/lexer/lexOperatorStarIsArithmetic.in A tests/data/lexer/lexOperatorStarIsArithmetic.out A tests/data/lexer/lexOperatorStarIsWildcard.in A tests/data/lexer/lexOperatorStarIsWildcard.out M src/Lexer.php M tests/Lexer/LexerTest.php M tests/data/bugs/gh9.out M tests/data/bugs/pma11836.out M tests/data/lexer/lexDelimiter.out M tests/data/lexer/lexDelimiter2.out M tests/data/lexer/lexUtf8.out M tests/data/lexer/lexWildcardThenComment.out M tests/data/parser/parseArrayErr1.out M tests/data/parser/parseArrayErr3.out M tests/data/parser/parseCreateTableAsSelect.out M tests/data/parser/parseCreateTableSelect.out M tests/data/parser/parseDelete10.out M tests/data/parser/parseDelete11.out M tests/data/parser/parseDelete9.out M tests/data/parser/parseDeleteErr2.out M tests/data/parser/parseDeleteErr4.out M tests/data/parser/parseDeleteErr6.out M tests/data/parser/parseDelimiter.out M tests/data/parser/parseExplain.out M tests/data/parser/parseInsertSelectOnDuplicateKey.out M tests/data/parser/parseLimitErr1.out M tests/data/parser/parseLimitErr2.out M tests/data/parser/parseSelect3.out M tests/data/parser/parseSelect4.out M tests/data/parser/parseSelect6.out M tests/data/parser/parseSelect7.out M tests/data/parser/parseSelect8.out M tests/data/parser/parseSelectErr2.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/parseSelectJoinMultiple.out M tests/data/parser/parseSelectJoinMultiple2.out M tests/data/parser/parseSelectJoinNaturalLeftOuter.out M tests/data/parser/parseSelectJoinNaturalRight.out M tests/data/parser/parseSelectJoinNaturalRightOuter.out M tests/data/parser/parseSelectWrongOrder2.out M tests/data/parser/parseTransaction3.out Log Message: ----------- Fixes #288 - Resolve ambiguity on * operator by setting its flag correctly. Commit: ae228e96afcf19318a6ed47be309ea5c339258b6 https://github.com/phpmyadmin/sql-parser/commit/ae228e96afcf19318a6ed47be30… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-03-20 (Fri, 03 March 2020) +01:00 Changed paths: A tests/data/lexer/lexOperatorStarIsArithmetic.in A tests/data/lexer/lexOperatorStarIsArithmetic.out A tests/data/lexer/lexOperatorStarIsWildcard.in A tests/data/lexer/lexOperatorStarIsWildcard.out M src/Lexer.php M tests/Lexer/LexerTest.php M tests/data/bugs/gh9.out M tests/data/bugs/pma11836.out M tests/data/lexer/lexDelimiter.out M tests/data/lexer/lexDelimiter2.out M tests/data/lexer/lexUtf8.out M tests/data/lexer/lexWildcardThenComment.out M tests/data/parser/parseArrayErr1.out M tests/data/parser/parseArrayErr3.out M tests/data/parser/parseCreateTableAsSelect.out M tests/data/parser/parseCreateTableSelect.out M tests/data/parser/parseDelete10.out M tests/data/parser/parseDelete11.out M tests/data/parser/parseDelete9.out M tests/data/parser/parseDeleteErr2.out M tests/data/parser/parseDeleteErr4.out M tests/data/parser/parseDeleteErr6.out M tests/data/parser/parseDelimiter.out M tests/data/parser/parseExplain.out M tests/data/parser/parseInsertSelectOnDuplicateKey.out M tests/data/parser/parseLimitErr1.out M tests/data/parser/parseLimitErr2.out M tests/data/parser/parseSelect3.out M tests/data/parser/parseSelect4.out M tests/data/parser/parseSelect6.out M tests/data/parser/parseSelect7.out M tests/data/parser/parseSelect8.out M tests/data/parser/parseSelectErr2.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/parseSelectJoinMultiple.out M tests/data/parser/parseSelectJoinMultiple2.out M tests/data/parser/parseSelectJoinNaturalLeftOuter.out M tests/data/parser/parseSelectJoinNaturalRight.out M tests/data/parser/parseSelectJoinNaturalRightOuter.out M tests/data/parser/parseSelectWrongOrder2.out M tests/data/parser/parseTransaction3.out Log Message: ----------- Merge #289 - Fixes #288 - Lexer fails to detect "*" as a wildcard. Pull-request: #289 Fixes: #288 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 1665e9a1a716db001bae5101f6247e84553e9f9f https://github.com/phpmyadmin/sql-parser/commit/1665e9a1a716db001bae5101f62… Author: William Desportes <williamdes(a)wdes.fr> Date: 2020-03-20 (Fri, 03 March 2020) +01:00 Changed paths: M CHANGELOG.md Log Message: ----------- Add CHANGELOG entry for #288 Signed-off-by: William Desportes <williamdes(a)wdes.fr>