- Git - lists.phpmyadmin.net

[phpmyadmin/phpmyadmin] f73a98: Fixed database renaming
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: f73a98e42176e1c463afd1d1c573892d3d1f7959 https://github.com/phpmyadmin/phpmyadmin/commit/f73a98e42176e1c463afd1d1c57… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M ChangeLog M db_operations.php Log Message: ----------- Fixed database renaming Fixes #12955 Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/phpmyadmin] b575f7: db_central_columns: new column collapsing issue
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b575f7ef1b6477f5240da31053d30ef75eb5ab49 https://github.com/phpmyadmin/phpmyadmin/commit/b575f7ef1b6477f5240da31053d… Author: Piyush Agrawal <poush12(a)gmail.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M db_central_columns.php M libraries/central_columns.lib.php M test/libraries/PMA_central_columns_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- db_central_columns: new column collapsing issue Signed-off-by: Piyush Agrawal <poush12(a)gmail.com> Commit: 80de04451754e747ec5d9b15183a682f4e718991 https://github.com/phpmyadmin/phpmyadmin/commit/80de04451754e747ec5d9b15183… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12904 and #12939 Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 3cfe34985d6291919989c5a7139c71bc67bb8b6c https://github.com/phpmyadmin/phpmyadmin/commit/3cfe34985d6291919989c5a7139… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M ChangeLog M db_central_columns.php M libraries/central_columns.lib.php M test/libraries/PMA_central_columns_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5d3a6fbc2546...3cfe34985d62

1 0

[phpmyadmin/phpmyadmin] b575f7: db_central_columns: new column collapsing issue
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b575f7ef1b6477f5240da31053d30ef75eb5ab49 https://github.com/phpmyadmin/phpmyadmin/commit/b575f7ef1b6477f5240da31053d… Author: Piyush Agrawal <poush12(a)gmail.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M db_central_columns.php M libraries/central_columns.lib.php M test/libraries/PMA_central_columns_test.php M themes/original/css/common.css.php M themes/pmahomme/css/common.css.php Log Message: ----------- db_central_columns: new column collapsing issue Signed-off-by: Piyush Agrawal <poush12(a)gmail.com> Commit: 80de04451754e747ec5d9b15183a682f4e718991 https://github.com/phpmyadmin/phpmyadmin/commit/80de04451754e747ec5d9b15183… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M ChangeLog Log Message: ----------- Changelog entry for #12904 and #12939 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b534e55cab9...80de04451754

1 0

[phpmyadmin/phpmyadmin] 1b7914: Remove connect_type setting
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b7914a4e59e962849092f746b3bbee05c7d8f64 https://github.com/phpmyadmin/phpmyadmin/commit/1b7914a4e59e962849092f746b3… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M libraries/DatabaseInterface.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.php M setup/lib/common.inc.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/test_data/config.inc.php Log Message: ----------- Remove connect_type setting It is really not necessary as MySQL decides connection type rather based on hostname than on anything else. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 34946a285b27eedc3854a8be5a72915662e04fa8 https://github.com/phpmyadmin/phpmyadmin/commit/34946a285b27eedc3854a8be5a7… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2017-02-04 (Sat, 04 Feb 2017) Changed paths: M doc/config.rst Log Message: ----------- Improve documentation on socket or tcp/ip setup Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 7201940bcc5d58177ae5fe1c8791d3aca33325d2 https://github.com/phpmyadmin/phpmyadmin/commit/7201940bcc5d58177ae5fe1c879… Author: Capita-Finnish <tom.shaw2(a)capita.co.uk> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M po/fi.po Log Message: ----------- Translated using Weblate (Finnish) Currently translated at 69.4% (2222 of 3199 strings) [CI skip] Commit: 33717e72689ab55d13ae8d3d6c092e6012a4349e https://github.com/phpmyadmin/phpmyadmin/commit/33717e72689ab55d13ae8d3d6c0… Author: Franco <fulanodetal.github1(a)openaliasbox.org> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M po/es.po Log Message: ----------- Translated using Weblate (Spanish) Currently translated at 100.0% (3199 of 3199 strings) [CI skip] Commit: 3d29350b0a6145e07632e6bcc95f1e44bd6d06e6 https://github.com/phpmyadmin/phpmyadmin/commit/3d29350b0a6145e07632e6bcc95… Author: Weblate <noreply(a)weblate.org> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M doc/setup.rst Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_7' into QA_4_7 Commit: 162d13566238d03c0a64295429f183cdbb323a8a https://github.com/phpmyadmin/phpmyadmin/commit/162d13566238d03c0a64295429f… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M doc/config.rst Log Message: ----------- Clarify socket connection docs Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9b534e55cab963dcd46d6ea560ced19b29ea5398 https://github.com/phpmyadmin/phpmyadmin/commit/9b534e55cab963dcd46d6ea560c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M libraries/DatabaseInterface.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.php M setup/lib/common.inc.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/test_data/config.inc.php Log Message: ----------- Merge pull request #12950 from nijel/connect_type Remove connect_type setting Commit: 569fcc1ef37033cfc12585ea24ac021e5f3f9264 https://github.com/phpmyadmin/phpmyadmin/commit/569fcc1ef37033cfc12585ea24a… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Log Message: ----------- Merge commit '3d29350b0a6145e07632e6bcc95f1e44bd6d06e6' Commit: 5d3a6fbc2546b0820cdc45196dddf947e5f7a90c https://github.com/phpmyadmin/phpmyadmin/commit/5d3a6fbc2546b0820cdc45196dd… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M libraries/DatabaseInterface.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.php M setup/lib/common.inc.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/test_data/config.inc.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/754b9dc98e7e...5d3a6fbc2546

1 0

[phpmyadmin/phpmyadmin] 1b7914: Remove connect_type setting
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/QA_4_7 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1b7914a4e59e962849092f746b3bbee05c7d8f64 https://github.com/phpmyadmin/phpmyadmin/commit/1b7914a4e59e962849092f746b3… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-02 (Thu, 02 Feb 2017) Changed paths: M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M libraries/DatabaseInterface.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.php M setup/lib/common.inc.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/test_data/config.inc.php Log Message: ----------- Remove connect_type setting It is really not necessary as MySQL decides connection type rather based on hostname than on anything else. Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 34946a285b27eedc3854a8be5a72915662e04fa8 https://github.com/phpmyadmin/phpmyadmin/commit/34946a285b27eedc3854a8be5a7… Author: Isaac Bennetch <bennetch(a)gmail.com> Date: 2017-02-04 (Sat, 04 Feb 2017) Changed paths: M doc/config.rst Log Message: ----------- Improve documentation on socket or tcp/ip setup Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 162d13566238d03c0a64295429f183cdbb323a8a https://github.com/phpmyadmin/phpmyadmin/commit/162d13566238d03c0a64295429f… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M doc/config.rst Log Message: ----------- Clarify socket connection docs Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: 9b534e55cab963dcd46d6ea560ced19b29ea5398 https://github.com/phpmyadmin/phpmyadmin/commit/9b534e55cab963dcd46d6ea560c… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M config.sample.inc.php M doc/config.rst M examples/config.manyhosts.inc.php M libraries/DatabaseInterface.php M libraries/common.inc.php M libraries/config.default.php M libraries/config.values.php M libraries/config/ConfigFile.php M libraries/config/Validator.php M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/plugins/auth/AuthenticationCookie.php M setup/lib/common.inc.php M test/classes/config/ConfigFileTest.php M test/classes/config/FormDisplayTest.php M test/classes/config/FormTest.php M test/classes/plugin/auth/AuthenticationCookieTest.php M test/test_data/config.inc.php Log Message: ----------- Merge pull request #12950 from nijel/connect_type Remove connect_type setting Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3d29350b0a61...9b534e55cab9

1 0

[phpmyadmin/sql-parser] 39a522: Document changes
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 39a522e8a3bd4caed8a17303611477b87fd202fe https://github.com/phpmyadmin/sql-parser/commit/39a522e8a3bd4caed8a17303611… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M CHANGELOG.md Log Message: ----------- Document changes Signed-off-by: Michal Čihař <michal(a)cihar.com>

1 0

[phpmyadmin/sql-parser] 024294: Run php-cs-fixer
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 024294e3850135922086679153064e24723f3f54 https://github.com/phpmyadmin/sql-parser/commit/024294e38501359220866791530… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Run php-cs-fixer Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: c5feb2eea5bdfd67c44afa69bb50fbeb182a1c15 https://github.com/phpmyadmin/sql-parser/commit/c5feb2eea5bdfd67c44afa69bb5… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M src/Core.php Log Message: ----------- Fix class name Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: bead40dc670e715ed4309d343ef3d33f519d7446 https://github.com/phpmyadmin/sql-parser/commit/bead40dc670e715ed4309d343ef… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M src/Lexer.php M src/Utils/Query.php Log Message: ----------- Fix comment type Signed-off-by: Michal Čihař <michal(a)cihar.com> Commit: ba296bd6e2017b6c73add5f3c8ba56eac5a984c2 https://github.com/phpmyadmin/sql-parser/commit/ba296bd6e2017b6c73add5f3c8b… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M src/Context.php M src/Lexer.php M src/Statements/DeleteStatement.php M src/Statements/DropStatement.php M src/Statements/SelectStatement.php M src/Statements/UpdateStatement.php M src/Utils/Formatter.php M tools/ContextGenerator.php Log Message: ----------- Remove double spacing Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/sql-parser/compare/65fb611e091e...ba296bd6e201

1 0

[phpmyadmin/docker]
by nijel 06 Feb '17

06 Feb '17

Branch: refs/tags/4.6.6-1 Home: https://github.com/phpmyadmin/docker

1 0

[phpmyadmin/sql-parser] 7f61c4: Begin writing new format queries tests
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 7f61c4b57fafce54d77bfded84314b57d5182080 https://github.com/phpmyadmin/sql-parser/commit/7f61c4b57fafce54d77bfded843… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Begin writing new format queries tests Commit: e4f682702c43e5251e9868035e4f7d970d97d370 https://github.com/phpmyadmin/sql-parser/commit/e4f682702c43e5251e9868035e4… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- select with comment Commit: fd87828bba25cdfc24b977a19c6571276b3b7d5d https://github.com/phpmyadmin/sql-parser/commit/fd87828bba25cdfc24b977a19c6… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing comments Commit: 73348fcaeed8916ba2c097e9b3a4464680f11892 https://github.com/phpmyadmin/sql-parser/commit/73348fcaeed8916ba2c097e9b3a… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Rebased on top of master Commit: a067ee1e863e6bcb7f72251bb4371241e451bc6a https://github.com/phpmyadmin/sql-parser/commit/a067ee1e863e6bcb7f72251bb43… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing strip comments Commit: 7368fddbb16559a6c706a0ece6c9e5b710440089 https://github.com/phpmyadmin/sql-parser/commit/7368fddbb16559a6c706a0ece6c… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing keywords Commit: 8f857c00f27c25dd7a6807dfbf47dc231a1531ea https://github.com/phpmyadmin/sql-parser/commit/8f857c00f27c25dd7a6807dfbf4… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing create procedure Commit: f810a7bf08ced39a5e731b8b824bc2ed642d96be https://github.com/phpmyadmin/sql-parser/commit/f810a7bf08ced39a5e731b8b824… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing Insert Commit: d92d5f996dd5ffa8f4300a684790ded68c375221 https://github.com/phpmyadmin/sql-parser/commit/d92d5f996dd5ffa8f4300a68479… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing distinct count Commit: ac5d4b119b4372673f5192f05a94109b7112edab https://github.com/phpmyadmin/sql-parser/commit/ac5d4b119b4372673f5192f05a9… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing string as alias Commit: 9dde9b870b737b62d48250d8935e3c577b008556 https://github.com/phpmyadmin/sql-parser/commit/9dde9b870b737b62d48250d8935… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing escaping cli and escaping html Commit: 6242ca938c314419448a5169b6f475a7edc193bb https://github.com/phpmyadmin/sql-parser/commit/6242ca938c314419448a5169b6f… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M src/Utils/Formatter.php M tests/Utils/FormatterTest.php Log Message: ----------- Testing create table Commit: efdf6f3dd915a0d349effdc1d2eaff3515379a66 https://github.com/phpmyadmin/sql-parser/commit/efdf6f3dd915a0d349effdc1d2e… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing minimal and simply Commit: ce5781cfafd249f06d36b7a938bdef8f7a7c765f https://github.com/phpmyadmin/sql-parser/commit/ce5781cfafd249f06d36b7a938b… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Fix test create table Commit: 74d4450635ee56dd9ac4b5524a1b26159605cb5d https://github.com/phpmyadmin/sql-parser/commit/74d4450635ee56dd9ac4b5524a1… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Testing typical Commit: 9a120dfede5f34a9354ea87bb09df9e81f3f02a8 https://github.com/phpmyadmin/sql-parser/commit/9a120dfede5f34a9354ea87bb09… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-01 (Wed, 01 Feb 2017) Changed paths: M src/Utils/Formatter.php Log Message: ----------- And now? Commit: 305b897adda7a5f0d1c794778f7ad841ee5a9f46 https://github.com/phpmyadmin/sql-parser/commit/305b897adda7a5f0d1c794778f7… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-03 (Fri, 03 Feb 2017) Changed paths: M src/Utils/Formatter.php Log Message: ----------- Remove @var Commit: 96a904a54102670165a9388e1b586683bd69ede6 https://github.com/phpmyadmin/sql-parser/commit/96a904a54102670165a9388e1b5… Author: Damian Dlugosz <bigfootdd(a)gmail.com> Date: 2017-02-05 (Sun, 05 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Remove old tests and fix method names 'formatQueries' and 'testFormat' Commit: 108927f28df40bb9feb35e6c5501b2513b21bc63 https://github.com/phpmyadmin/sql-parser/commit/108927f28df40bb9feb35e6c550… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M src/Utils/Formatter.php M tests/Utils/FormatterTest.php Log Message: ----------- Merge remote-tracking branch 'origin/pull/120' into tmp Commit: 65fb611e091ef7d0b28039126733848bd20edb9d https://github.com/phpmyadmin/sql-parser/commit/65fb611e091ef7d0b2803912673… Author: Michal Čihař <michal(a)cihar.com> Date: 2017-02-06 (Mon, 06 Feb 2017) Changed paths: M tests/Utils/FormatterTest.php Log Message: ----------- Fix expected format for BEGIN/END Issue #120 Signed-off-by: Michal Čihař <michal(a)cihar.com> Compare: https://github.com/phpmyadmin/sql-parser/compare/1a1168169c3d...65fb611e091e

1 0

[phpmyadmin/sql-parser] 196607: Run generators without locales
by Michal Čihař 06 Feb '17

06 Feb '17

Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: 196607e420ffd05348d41e31d5fa4c7e97adf45b https://github.com/phpmyadmin/sql-parser/commit/196607e420ffd05348d41e31d5f… Author: Michal Čihař <michal(a)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(a)cihar.com> Commit: 5fdfa5b0767c8b62e5dd16f1b99465c2d59c9d2f https://github.com/phpmyadmin/sql-parser/commit/5fdfa5b0767c8b62e5dd16f1b99… Author: Michal Čihař <michal(a)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(a)cihar.com> Commit: 1a1168169c3d3acdf7ee3c5f1a839bcb66829297 https://github.com/phpmyadmin/sql-parser/commit/1a1168169c3d3acdf7ee3c5f1a8… Author: Michal Čihař <michal(a)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(a)cihar.com> Compare: https://github.com/phpmyadmin/sql-parser/compare/d4c198d6693b...1a1168169c3d

1 0