Branch: refs/heads/master Home: https://github.com/phpmyadmin/sql-parser Commit: f5a05864b8671d5f2d9a57eed4e6f3cfcfe017e8 https://github.com/phpmyadmin/sql-parser/commit/f5a05864b8671d5f2d9a57eed4e6... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-11-20 (Sun, 20 Nov 2016) Changed paths: M src/Utils/Query.php Log Message: ----------- Prevent incorrect error messages in UNION queries Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 57cc4cfd7816f3591a3e6bf58af51b9f04608d78 https://github.com/phpmyadmin/sql-parser/commit/57cc4cfd7816f3591a3e6bf58af5... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-11-20 (Sun, 20 Nov 2016) Changed paths: M tests/Parser/SelectStatementTest.php A tests/data/parser/parseSelectUnion2.in A tests/data/parser/parseSelectUnion2.out Log Message: ----------- Add tests for prevention of incorrect errors in UNION queries Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Conflicts: tests/Parser/SelectStatementTest.php Commit: e69da4e0f5fbf29450ca310e9e6625b4a8455763 https://github.com/phpmyadmin/sql-parser/commit/e69da4e0f5fbf29450ca310e9e66... Author: Michal Čihař <michal@cihar.com> Date: 2016-11-21 (Mon, 21 Nov 2016) Changed paths: M src/Utils/Query.php M tests/Parser/SelectStatementTest.php A tests/data/parser/parseSelectUnion2.in A tests/data/parser/parseSelectUnion2.out Log Message: ----------- Merge pull request #101 from devenbansod/fix_incorrect_error_in_union Fix incorrect error in union queries Compare: https://github.com/phpmyadmin/sql-parser/compare/fcfed04c77f0...e69da4e0f5fb