Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fixed invalid lexing of queries with : in strings. | Michal Čihař | 2017-05-15 | 3 | -0/+6 | |
| | | | | | | | | We really can't use anyting as label, it has way stricter syntax. Fixes https://github.com/phpmyadmin/phpmyadmin/issues/13272 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Maximum length of a delimiter is 15 characters. | Dan Ungureanu | 2017-05-08 | 3 | -0/+10 | |
| | | | | | | Fixes #12. Signed-off-by: Dan Ungureanu <udan1107@gmail.com> | |||||
* | Remove debug error messages | Michal Čihař | 2017-05-05 | 3 | -3/+3 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Properly handle lowercase begin statement | Michal Čihař | 2017-05-05 | 3 | -0/+14 | |
| | | | | | | | | Actually all statements where main token is used as an option. Fixes https://github.com/phpmyadmin/phpmyadmin/issues/13240 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Fixes wrong extract of string tokens with escaped characters. | Dan Ungureanu | 2017-04-11 | 7 | -18/+28 | |
| | | | | | | Fixes #40. Signed-off-by: Dan Ungureanu <udan1107@gmail.com> | |||||
* | Merge pull request #148 from nijel/inline-comment-newline | Michal Čihař | 2017-04-06 | 2 | -4/+7 | |
|\ | | | | | Fixed inline comments parsing | |||||
| * | Fixed handling newlines in inline coments | Michal Čihař | 2017-04-04 | 2 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | The newline is now included as separate token, previously it was silently discarded, so it was not present in output. See https://github.com/phpmyadmin/phpmyadmin/issues/13139 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge pull request #146 from Achilles-96/Issue-11717 | Michal Čihař | 2017-04-06 | 1 | -1/+25 | |
|\ \ | |/ |/| | Fixes striping of inline comments #11717 | |||||
| * | Fixes striping of inline comments #11717 | Raghuram | 2017-04-05 | 1 | -1/+25 | |
| | | | | | | | | Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in> | |||||
* | | Add utility to tokenize query | Michal Čihař | 2017-04-03 | 1 | -0/+53 | |
|/ | | | | | | | | It's mostly useful for debugging changes in parser. See #147. Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Merge pull request #145 from devenbansod/fix_144 | Michal Čihař | 2017-03-30 | 4 | -0/+12 | |
|\ | | | | | Fix parsing of DELETE clauses with JOINs | |||||
| * | Fix parsing of DELETE clauses with JOINs | Deven Bansod | 2017-03-30 | 4 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | Ref: https://dev.mysql.com/doc/refman/5.7/en/delete.html Fix #144 Fix phpmyadmin/phpmyadmin#13129 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | | Fix BEGIN/END indentation | Michal Čihař | 2017-02-20 | 1 | -12/+12 | |
| | | | | | | | | | | | | Ensure we never have negative indentation Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Aplly coding style fixes | Michal Čihař | 2017-02-20 | 2 | -6/+1 | |
| | | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Fix class prefix in test data | Michal Čihař | 2017-02-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | The test was wrongly using old class names without PhpMyAdmin prefix. Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge pull request #143 from devenbansod/fix_131 | Michal Čihař | 2017-02-20 | 27 | -0/+280 | |
|\ \ | | | | | | | Parse LOAD statement properly | |||||
| * | | Parse LOAD statement properly | Deven Bansod | 2017-02-18 | 27 | -0/+280 | |
| |/ | | | | | | | | | | | | | | | Fix #131 Might help to fix phpmyadmin/phpmyadmin#12345 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | | Merge pull request #141 from bigfoot90/inline-joins | Michal Čihař | 2017-02-20 | 1 | -0/+7 | |
|\ \ | | | | | | | Inline JOINs | |||||
| * | | Inline JOINs | Damian Dlugosz | 2017-02-16 | 1 | -0/+7 | |
| |/ | ||||||
* | | Fix broken clause order validation | Deven Bansod | 2017-02-17 | 3 | -0/+3 | |
|/ | | | | | | Fix #113 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | Merge remote-tracking branch 'origin/pull/137' | Michal Čihař | 2017-02-14 | 27 | -0/+87 | |
|\ | ||||||
| * | Apply cs fixes | Damian Dlugosz | 2017-02-12 | 27 | -0/+53 | |
| | | ||||||
* | | Order imports | Damian Dlugosz | 2017-02-12 | 33 | -35/+35 | |
|/ | ||||||
* | Various coding style fixes | Michal Čihař | 2017-02-07 | 1 | -3/+1 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Test getopt() invocation as well | Michal Čihař | 2017-02-07 | 1 | -0/+16 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Run php-cs-fixer | Michal Čihař | 2017-02-06 | 1 | -85/+43 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Fix expected format for BEGIN/END | Michal Čihař | 2017-02-06 | 1 | -6/+12 | |
| | | | | | | Issue #120 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Merge remote-tracking branch 'origin/pull/120' into tmp | Michal Čihař | 2017-02-06 | 1 | -132/+296 | |
|\ | ||||||
| * | Remove old tests and fix method names 'formatQueries' and 'testFormat' | Damian Dlugosz | 2017-02-05 | 1 | -148/+3 | |
| | | ||||||
| * | Testing typical | Damian Dlugosz | 2017-02-01 | 1 | -1/+46 | |
| | | ||||||
| * | Fix test create table | Damian Dlugosz | 2017-02-01 | 1 | -7/+7 | |
| | | ||||||
| * | Testing minimal and simply | Damian Dlugosz | 2017-02-01 | 1 | -6/+30 | |
| | | ||||||
| * | Testing create table | Damian Dlugosz | 2017-02-01 | 1 | -1/+35 | |
| | | ||||||
| * | Testing escaping cli and escaping html | Damian Dlugosz | 2017-02-01 | 1 | -4/+36 | |
| | | ||||||
| * | Testing string as alias | Damian Dlugosz | 2017-02-01 | 1 | -3/+15 | |
| | | ||||||
| * | Testing distinct count | Damian Dlugosz | 2017-02-01 | 1 | -0/+12 | |
| | | ||||||
| * | Testing Insert | Damian Dlugosz | 2017-02-01 | 1 | -6/+12 | |
| | | ||||||
| * | Testing create procedure | Damian Dlugosz | 2017-02-01 | 1 | -6/+42 | |
| | | ||||||
| * | Testing keywords | Damian Dlugosz | 2017-02-01 | 1 | -1/+13 | |
| | | ||||||
| * | Testing strip comments | Damian Dlugosz | 2017-02-01 | 1 | -11/+41 | |
| | | ||||||
| * | Rebased on top of master | Damian Dlugosz | 2017-02-01 | 1 | -25/+17 | |
| | | ||||||
| * | Testing comments | Damian Dlugosz | 2017-02-01 | 1 | -9/+31 | |
| | | ||||||
| * | select with comment | Damian Dlugosz | 2017-02-01 | 1 | -0/+13 | |
| | | ||||||
| * | Begin writing new format queries tests | Damian Dlugosz | 2017-02-01 | 1 | -13/+52 | |
| | | ||||||
* | | Store uppercase keyword value for later processing | Michal Čihař | 2017-02-06 | 179 | -537/+537 | |
|/ | | | | | | This makes easier to compare it later. Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-23 | 239 | -760/+760 | |
|\ | ||||||
| * | Added PhpMyAdmin namespace prefix to follow PSR-4. | Michal Čihař | 2017-01-23 | 239 | -760/+760 | |
| | | | | | | | | | | | | Fixes #126 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-23 | 4 | -27/+29 | |
|\ \ | |/ | ||||||
| * | Merge pull request #123 from bigfoot90/fix-comment-parsing | Michal Čihař | 2017-01-20 | 4 | -27/+29 | |
| |\ | | | | | | | Fix comment parsing | |||||
| | * | Fix comment parsing | Damian Dlugosz | 2017-01-10 | 2 | -13/+25 | |
| | | | ||||||
| | * | Fix comment parsing | Damian Dlugosz | 2017-01-08 | 3 | -15/+5 | |
| | | | ||||||
* | | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-20 | 8 | -33/+50 | |
|\ \ \ | |/ / | ||||||
| * | | Fixed parsing of unterminated variables. | Michal Čihař | 2017-01-20 | 3 | -0/+6 | |
| |/ | | | | | | | | | | | Fixes https://github.com/phpmyadmin/phpmyadmin/issues/12894 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
| * | Merge pull request #121 from bigfoot90/better-html | Michal Čihař | 2017-01-07 | 2 | -31/+37 | |
| |\ | | | | | | | Fix indentation on html format | |||||
| | * | Fix indentation on html format | Damian Dlugosz | 2017-01-06 | 2 | -31/+37 | |
| | | | ||||||
| * | | autload-dev | Damian Dlugosz | 2017-01-06 | 1 | -2/+1 | |
| |/ | ||||||
| * | Properly handle operators AND, NOT, OR, XOR, DIV, MOD | Michal Čihař | 2017-01-06 | 3 | -0/+6 | |
| | | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-06 | 60 | -311/+200 | |
|\ \ | |/ | ||||||
| * | Apply php-cs-fixer | Damian Dlugosz | 2017-01-06 | 60 | -311/+200 | |
| | | ||||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-03 | 2 | -3/+37 | |
|\ \ | |/ | ||||||
| * | Add some missing assertions | Michal Čihař | 2017-01-03 | 1 | -3/+31 | |
| | | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
| * | Simplify rules merging | Michal Čihař | 2017-01-03 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | We first sanitize the merged array and we can later use it without checking. Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-03 | 3 | -0/+6 | |
|\ \ | |/ | ||||||
| * | Properly report missing expression error | Michal Čihař | 2017-01-03 | 3 | -0/+6 | |
| | | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-03 | 1 | -0/+5 | |
|\ \ | |/ | ||||||
| * | Add test for text formatter | Michal Čihař | 2017-01-03 | 1 | -0/+5 | |
| | | | | | | | | | | | | Issue #110 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-03 | 3 | -0/+6 | |
|\ \ | |/ | ||||||
| * | Test error on double AS | Michal Čihař | 2017-01-03 | 3 | -0/+6 | |
| | | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-03 | 3 | -0/+6 | |
|\ \ | |/ | ||||||
| * | Add missing test for error condition | Michal Čihař | 2017-01-03 | 3 | -0/+6 | |
| | | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2017-01-02 | 1 | -0/+214 | |
|\ \ | |/ | ||||||
| * | Handling merging formats arrays | Damian Dlugosz | 2016-12-30 | 1 | -0/+214 | |
| | | ||||||
* | | Merge branch 'master' into motranslator | Michal Čihař | 2016-12-22 | 8 | -0/+58 | |
|\ \ | |/ | ||||||
| * | Merge pull request #107 from devenbansod/fix_105 | Michal Čihař | 2016-12-22 | 8 | -0/+58 | |
| |\ | | | | | | | Fix #105: Fix parsing of FIELDS and LINES options in Select..Into | |||||
| | * | Add more tests, fix unneeded error | Deven Bansod | 2016-12-21 | 3 | -0/+11 | |
| | | | | | | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
| | * | Add more tests | Deven Bansod | 2016-12-21 | 4 | -0/+32 | |
| | | | | | | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
| | * | Add tests for parsing of FIELDS and LINES options in SELECT..INTO | Deven Bansod | 2016-12-21 | 3 | -0/+15 | |
| | | | | | | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | | | Merge branch 'master' into motranslator | Michal Čihař | 2016-12-21 | 3 | -3/+3 | |
|\ \ \ | |/ / | ||||||
| * | | Consistently end message with . | Michal Čihař | 2016-12-21 | 3 | -3/+3 | |
| |/ | | | | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | | Replace __( usage by Translator class | Michal Čihař | 2016-12-21 | 3 | -6/+8 | |
|/ | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Document why unserialize() is needed for tests | Michal Čihař | 2016-12-08 | 1 | -0/+5 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Recognize BINARY as function | Michal Čihař | 2016-11-30 | 3 | -0/+6 | |
| | | | | | | Fixes https://github.com/phpmyadmin/phpmyadmin/issues/12762 Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Add tests for prevention of incorrect errors in UNION queries | Deven Bansod | 2016-11-20 | 3 | -0/+3 | |
| | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Conflicts: tests/Parser/SelectStatementTest.php | |||||
* | Add a forgotten test | Deven Bansod | 2016-11-20 | 1 | -0/+1 | |
| | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | Add tests for prevention of wrong order in JOINs | Deven Bansod | 2016-11-15 | 3 | -0/+11 | |
| | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | Add builders test for end options in SELECT | Deven Bansod | 2016-11-12 | 1 | -0/+23 | |
| | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | Add parser tests for end options in SELECT | Deven Bansod | 2016-11-12 | 7 | -0/+21 | |
| | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | Add forgotten testcase | Michal Čihař | 2016-11-09 | 2 | -0/+11 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Fix test for pr #97 and #98 | Michal Čihař | 2016-11-09 | 1 | -1/+1 | |
| | | | | Signed-off-by: Michal Čihař <michal@cihar.com> | |||||
* | Fix test for terminology change | Marc Delisle | 2016-11-09 | 1 | -1/+1 | |
| | ||||||
* | Add tests for #22 | Deven Bansod | 2016-11-03 | 3 | -0/+3 | |
| | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | Merge branch 'master' of https://github.com/phpmyadmin/sql-parser | Deven Bansod | 2016-10-25 | 21 | -2/+144 | |
|\ | ||||||
| * | Merge pull request #94 from devenbansod/fix_57 | Michal Čihař | 2016-10-25 | 5 | -0/+86 | |
| |\ | | | | | | | Enable Lexing of begin_label in the in-procedure statements | |||||
| | * | Enable Lexing of begin_label in the in-procedure statements | Deven Bansod | 2016-10-21 | 5 | -0/+86 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ex. BEGIN.. END, LOOP, REPEAT, WHILE statements Fix #57 Fix phpmyadmin/phpmyadmin#12344 Fix phpmyadmin/phpmyadmin#12228 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
| * | | Merge pull request #95 from devenbansod/fix_93 | Michal Čihař | 2016-10-25 | 16 | -2/+58 | |
| |\ \ | | | | | | | | | Fix #93 : Fix parsing of NATURAL JOIN, CROSS JOIN and related joins | |||||
| | * | | Add call to test in test file | Deven Bansod | 2016-10-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
| | * | | Add parsing of multiple JOINS in single query | Deven Bansod | 2016-10-24 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
| | * | | Add tests for various NATURAL JOINS, fix test | Deven Bansod | 2016-10-24 | 10 | -2/+25 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
| | * | | Fix parsing of NATURAL JOIN, CROSS JOIN and related joins | Deven Bansod | 2016-10-24 | 5 | -0/+26 | |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Fix #93 Add tests to cover parsing of these joins Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> | |||||
* | | | Add tests for removal of option which has value attached to it | Deven Bansod | 2016-10-25 | 1 | -0/+15 | |
|/ / | | | | | | | Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> |