gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
100,942 Commits 12 Branches 481 Tags 2.4 GiB
deada65601
Commit Graph

201 Commits

Author SHA1 Message Date
Dan Ungureanu
ecc60f3664 Fixed failing tests. Also, removed deprecated PHPUnit configuration that might cause issues with XDebug. 
Fixed a bug where the query delimiter would not be added.
Updated sql-parser to udan11/sql-parser@7c925b6.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
51876a097c Coding style fixes. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:17 +03:00
Dan Ungureanu
eeafcad986 Using the new parser to simulate queries. 
Updated sql-parser library to udan11/sql-parser@e58d230.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:17 +03:00
Marc Delisle
e721080899 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-06-25 08:33:33 -04:00
Nisarg Jhaveri
d1bb026034 Fix bug#4948 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-06-12 12:18:25 +05:30
Nisarg Jhaveri
34720c2365 Disable foreign key checks in SQL query box and config option 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-31 12:28:41 +05:30
Madhura Jayaratne
6ffbf93188 #4927 "Disable foreign key" doesn't work with a single query SQL file 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-05-27 10:57:42 +05:30
Marc Delisle
18a085f6ac Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-03-30 13:23:33 -04:00
Marc Delisle
b28ae18f22 Merge branch 'QA_4_3' into QA_4_4 2015-03-29 07:57:31 -04:00
Andrea Vallorani
cc56e09667 Bug #4718 simulate query fails 
It is not an elegant solution, but it seems functional.
It avoids all the errors caused by the presence of functions in the query.
The $extra_where_clause variable was valorized but never appended to the WHERE clause. (I think that was a mistake)

Signed-off-by: Andrea Vallorani <andrea.vallorani@gmail.com>
 2015-03-29 07:46:49 -04:00
Marc Delisle
20f7402cc5 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-12-05 12:56:42 -05:00
Hugues Peccatte
2768d398b5 Reduce nesting levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-09 17:36:14 +01:00
Hugues Peccatte
037a034b43 Minor coding style modifications. 
Fix typos.
PHPDoc and JSDoc updates.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-11-02 14:04:35 +01:00
Hugues Peccatte
80ced5fe8f Fix PHPCS issues. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-30 18:37:49 +01:00
Hugues Peccatte
35bbe992d0 Remove var_dump. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:32:13 +02:00
Hugues Peccatte
14bda32169 Fix delimiter reading. 
Rum last SQL query.
Fix SQL reading.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-25 12:23:15 +02:00
Hugues Peccatte
f9cd1a1a22 Replace mb functions by standard string functions. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 11:31:50 +02:00
Hugues Peccatte
48bd3b8ee5 Remove unused $pmaString. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-10-05 10:42:44 +02:00
Hugues Peccatte
3de88162ff Replace PMA_String uses by mb_* calls. 
Remove part of unused  variables.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-28 20:53:01 +02:00
Hugues Peccatte
5985894160 Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-07 00:31:45 +02:00
Hugues Peccatte
623715c5f9 Add PMA_String::substrCount. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 17:53:30 +02:00
Hugues Peccatte
9b77d746ab Mass modifications to use PMA_String. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-09-06 10:44:03 +02:00
Ashutosh Dhundhara
60610f9b83 Fix issues reported by Scrutinizer. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-08-17 02:20:05 +05:30
Marc Delisle
0c850e49f5 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-22 15:01:19 -04:00
Marc Delisle
3c84487ca0 Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-22 14:56:54 -04:00
Ashutosh Dhundhara
04d7be1b06 RFE#869: Run SQL query: Allow rollback for InnoDB tables. 
Rollback support for other Transactional engines other than InnoDB.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-22 22:41:23 +05:30
Marc Delisle
30c237754b Clarify the meaning of a variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-19 12:17:41 -04:00
Marc Delisle
fb4387c136 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-19 12:06:53 -04:00
Marc Delisle
0fed3cf40e Merge pull request #1237 from ashutoshdhundhara/simulate_query 
RFE#861: Simulate UPDATE queries.
 2014-06-19 12:00:49 -04:00
Ashutosh Dhundhara
8a46508bd0 RFE#861: Simulate UPDATE queries. 
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Show 'Simulate query' button only in case of UPDATE and DELETE.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>

Fix code style.

Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
 2014-06-19 21:16:13 +05:30
Marc Delisle
65fd429e3c Dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-06-17 12:51:44 -04:00
Marc Delisle
5f12a95d25 Fix undefined variable 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-05-27 12:29:43 -04:00
Michal Čihař
d559fa6a21 Remove trailing whitespace from the code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-03-20 09:36:48 +01:00
Marc Delisle
db3857ef7a Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-03-02 07:40:00 -05:00
Marc Delisle
bbeacf8e78 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-22 13:06:44 -05:00
Marc Delisle
f78e1a2f0f Move function to library and rename it 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-02-22 13:03:25 -05:00
Michal Čihař
45c11eae77 Add missing full stops at the end of a sentence 2014-02-02 11:19:15 +01:00
Marc Delisle
203072c060 Refactor duplicate code for compression detection 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-11 07:58:11 -05:00
Marc Delisle
3b89a4650a Fix typos 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-11 07:23:53 -05:00
Madhura Jayaratne
6335b10574 Fix coding style 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-01-08 14:35:15 +05:30
Hugues Peccatte
66acb18272 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 23:15:13 +01:00
Hugues Peccatte
efd206f1dc Reduce nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-21 00:06:04 +01:00
Hugues Peccatte
37f90df60d Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-20 23:34:52 +01:00
Hugues Peccatte
7bd1bf23d3 Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 22:13:10 +01:00
Hugues Peccatte
d27076392c Fix PHPCS errors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-11 20:44:12 +01:00
Hugues Peccatte
24aa994981 Merge pull request #781 from Tithugues/phpcs 
Rewrite to decrease number of nested levels.
 2013-12-08 06:38:15 -08:00
Marc Delisle
b1fb71c120 Improve function name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 09:05:36 -05:00
Marc Delisle
6003743557 Improve function name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2013-12-08 09:00:18 -05:00
Hugues Peccatte
008b1fa8d3 Rewrite to decrease number of nested levels. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2013-12-07 22:16:16 +01:00
Marc Delisle
8153535e4a Fix coding style 2013-10-20 05:12:35 -07:00