Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 196607e420ffd05348d41e31d5fa4c7e97adf45b https://github.com/phpmyadmin/sql-parser/commit/196607e420ffd05348d41e31d5fa... Author: Michal Čihař michal@cihar.com Date: 2017-02-06 (Mon, 06 Feb 2017)

Changed paths: M tools/run_generators.sh

Log Message: ----------- Run generators without locales

We do not want localized messages to appear in testcases.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 5fdfa5b0767c8b62e5dd16f1b99465c2d59c9d2f https://github.com/phpmyadmin/sql-parser/commit/5fdfa5b0767c8b62e5dd16f1b994... Author: Michal Čihař michal@cihar.com Date: 2017-02-06 (Mon, 06 Feb 2017)

Changed paths: M src/Token.php M tests/data/bugs/gh14.out M tests/data/bugs/gh16.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/pma11867.out M tests/data/bugs/pma11879.out M tests/data/lexer/lex.out M tests/data/lexer/lexBool.out M tests/data/lexer/lexComment.out M tests/data/lexer/lexDelimiter.out M tests/data/lexer/lexDelimiter2.out M tests/data/lexer/lexDelimiterErr1.out M tests/data/lexer/lexDelimiterErr2.out M tests/data/lexer/lexDelimiterErr3.out M tests/data/lexer/lexKeyword.out M tests/data/lexer/lexKeyword2.out M tests/data/lexer/lexLabel1.out M tests/data/lexer/lexLabel2.out M tests/data/lexer/lexNumber.out M tests/data/lexer/lexOperator.out M tests/data/lexer/lexString.out M tests/data/lexer/lexStringErr1.out M tests/data/lexer/lexSymbol.out M tests/data/lexer/lexSymbolErr1.out M tests/data/lexer/lexSymbolErr2.out M tests/data/lexer/lexSymbolErr3.out M tests/data/lexer/lexSymbolUser.out M tests/data/lexer/lexUtf8.out M tests/data/lexer/lexWhitespace.out M tests/data/parser/parse.out M tests/data/parser/parse2.out M tests/data/parser/parseAlter.out M tests/data/parser/parseAlter2.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/parseArrayErr1.out M tests/data/parser/parseArrayErr3.out M tests/data/parser/parseCall.out M tests/data/parser/parseCall2.out M tests/data/parser/parseCall3.out M tests/data/parser/parseCreateFunction.out M tests/data/parser/parseCreateFunctionErr1.out M tests/data/parser/parseCreateFunctionErr2.out M tests/data/parser/parseCreateProcedure.out M tests/data/parser/parseCreateProcedure2.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/parseCreateTableAsSelect.out M tests/data/parser/parseCreateTableErr1.out M tests/data/parser/parseCreateTableErr2.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/parseCreateTableSelect.out M tests/data/parser/parseCreateTableSpatial.out M tests/data/parser/parseCreateTableTimestampWithPrecision.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/parseCreateViewWithQuotes.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/parseDeleteErr1.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/parseDelimiter.out M tests/data/parser/parseExplain.out M tests/data/parser/parseInsert.out M tests/data/parser/parseInsertErr.out M tests/data/parser/parseInsertErr2.out M tests/data/parser/parseInsertIntoErr.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/parseRename.out M tests/data/parser/parseRename2.out M tests/data/parser/parseRenameErr1.out M tests/data/parser/parseRenameErr2.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/parseReplaceErr2.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/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/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/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/parseSelectNested.out M tests/data/parser/parseSelectUnion.out M tests/data/parser/parseSelectUnion2.out M tests/data/parser/parseSelectWrongOrder.out M tests/data/parser/parseSetCharacterSet.out M tests/data/parser/parseSetCharacterSetError.out M tests/data/parser/parseSetCharset.out M tests/data/parser/parseSetCharsetError.out M tests/data/parser/parseSetError1.out M tests/data/parser/parseSetNames.out M tests/data/parser/parseSetNamesError.out M tests/data/parser/parseTransaction.out M tests/data/parser/parseTransaction2.out M tests/data/parser/parseTransactionErr1.out M tests/data/parser/parseUpdate.out M tests/data/parser/parseUpdate2.out M tests/data/parser/parseUpdate3.out

Log Message: ----------- Store uppercase keyword value for later processing

This makes easier to compare it later.

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 1a1168169c3d3acdf7ee3c5f1a839bcb66829297 https://github.com/phpmyadmin/sql-parser/commit/1a1168169c3d3acdf7ee3c5f1a83... Author: Michal Čihař michal@cihar.com Date: 2017-02-06 (Mon, 06 Feb 2017)

Changed paths: M src/Components/CaseExpression.php M src/Components/CreateDefinition.php M src/Components/Expression.php M src/Components/IntoKeyword.php M src/Components/JoinKeyword.php M src/Components/Limit.php M src/Components/OrderKeyword.php M src/Components/PartitionDefinition.php M src/Components/RenameOperation.php M src/Parser.php M src/Statements/CreateStatement.php M src/Statements/DeleteStatement.php M src/Statements/InsertStatement.php M src/Statements/RenameStatement.php M src/Statements/ReplaceStatement.php M src/Utils/Formatter.php M src/Utils/Query.php

Log Message: ----------- Use keyword attribute for comparing keyword name

We do not uppercase non reserved keywords, so this way we make the comparison properly handle that.

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/sql-parser/compare/d4c198d6693b...1a1168169c3d