Commit Graph

257 Commits

Author SHA1 Message Date
Marc Delisle
a6fedd3415 Merge branch 'QA_4_4' 2015-08-10 08:42:23 -04:00
Marc Delisle
c0803823f2 Fixes #11380 Incomplete message after import
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-08-10 08:41:07 -04:00
Dan Ungureanu
6e1b2aa54b Fix #11340.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-08-02 00:15:36 +03:00
Marc Delisle
1c416c14d6 Directly use the POST parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-31 08:38:59 -04:00
Marc Delisle
c30271da7a Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-30 08:33:37 -04:00
Marc Delisle
da4bcee69f Directly use the POST parameter
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-07-29 18:43:12 -04:00
Dan Ungureanu
b6fc66649e Added tests for sql.lib.php and parse_analyze.inc.php.
Removed dead code.
Fixed miscellaneous issues.
Fixed a bug in PMA_isJustBrowsing().
Updated sql-parser library to udan11/sql-parser@e713c9f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-25 19:39:33 +03:00
Hugues Peccatte
9cbfa30745 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-23 17:47:53 +02:00
Hugues Peccatte
bf61709259 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-23 14:38:07 +02:00
Dan Ungureanu
f7689d5c7e Replaced more of the old parser.
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-10 23:18:15 +03:00
Madhura Jayaratne
a3c3c57261 Use type hinting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-18 14:06:21 +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
6439a10af2 bug #4872 Drop table doesn't remove the table name from navigation bar
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-29 19:17:58 +05:30
Madhura Jayaratne
cca0e028b5 Improve parameter applying
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-29 18:33:37 +05:30
Madhura Jayaratne
8cb82815c7 rfe #1380 Support for Paramaters with raw SQL
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-29 15:35:52 +05:30
Marc Delisle
498c14fc62 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-09 11:47:59 -04:00
Marc Delisle
3a0440b80f Merge commit '0d94439' 2015-03-30 08:33:51 -04:00
Marc Delisle
d230d78bb2 Merge commit 'e3735f9' 2015-03-30 08:33:29 -04:00
Marc Delisle
0d94439eda Improve a message
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-03-30 08:31:35 -04:00
Madhura Jayaratne
f6dd7c2cd4 Pass local_import_file
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-30 16:14:59 +05:30
Madhura Jayaratne
4c0b0f9687 bug #4821 Timed-out import fails to restart when file represented
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-30 16:01:51 +05:30
Marc Delisle
4eccae5290 Merge pull request #1547 from znck/master
Remove unneeded closing tags
2015-03-26 07:56:45 -04:00
Madhura Jayaratne
b48f1ea52f rfe #933 Manage multiple variable in bookmarked query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-23 15:15:28 +05:30
Marc Delisle
3ad82c865e Merge branch 'QA_4_4' 2015-03-11 16:01:08 -04:00
Marc Delisle
44c28bd5a2 Merge branch 'QA_4_3' into QA_4_4 2015-03-11 15:59:28 -04:00
Dan Ungureanu
446d35f859 Bug #4784 Incomplete bookmark saving
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-03-11 15:58:07 -04:00
Madhura Jayaratne
df38a76b9f rfe #1306 Add lock tables, disable keys options
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-11 10:48:59 +05:30
Rahul Kadyan
4d308ba364 Remove unneeded closing tags
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
2015-03-06 23:37:35 +05:30
Marc Delisle
535db88e47 Merge branch 'QA_4_3' 2015-01-20 12:48:58 -05:00
RAKESH KUMAR
915f209ca1 BugFix#4714
Signed-off-by: RAKESH KUMAR <rakeshkumar4294@gmail.com>
2015-01-20 19:34:12 +05:30
Marc Delisle
629e08cbc4 Code cleanup: $disp_mode was always empty at this point
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-28 09:48:04 -05:00
Madhura Jayaratne
3621900b96 Merge branch 'QA_4_3' 2014-12-22 17:10:35 +05:30
Madhura Jayaratne
fbe587ce73 bug #4661 Drag and drop file import always fails
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-22 17:09:10 +05:30
Hugues Peccatte
603498a6fc Fix #4593 Manual SELECT doesn't change active table
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 14:01:55 +01:00
Hugues Peccatte
eda24da12e Fix #4593 Manual SELECT doesn't change active table
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 00:57:38 +01:00
Marc Delisle
47b1f9e6b2 Merge pull request #1397 from madhuracj/multiquery
Multiquery
2014-11-22 07:28:54 -05:00
Madhura Jayaratne
fc340c3e87 Use variable 'bookmark_variable' directly from REQUEST
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-14 12:41:47 +05:30
Madhura Jayaratne
83a4a2d896 action_bookmark_all was never added to GLOBALS, use from REQUEST directly
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-14 12:38:42 +05:30
Madhura Jayaratne
f9248d3ee2 Use request params directly, 'id_bookmark'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-14 12:34:58 +05:30
Madhura Jayaratne
303dfd7fec User request params directly, 'action_bookimark'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-14 12:31:32 +05:30
Madhura Jayaratne
89158e98a7 Use request data directly for 'allow_interrupt'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-14 12:21:36 +05:30
Madhura Jayaratne
2352809dae Use query execution and results display mechanism multiple time for multi queries
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 12:58:54 +05:30
Madhura Jayaratne
ff5e32553e Executing multiple SQLs - add missing parameter
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 10:54:44 +05:30
Madhura Jayaratne
52e0087b0e Long messages wrapped
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 17:45:59 +05:30
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
e17de11c74 Improve multibytes string manipulation performances.
Review SQL import process.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-30 17:40:09 +01:00
Marc Delisle
62d04772ed Merge commit '2b4ed22' 2014-10-28 15:53:38 -04:00
Marc Delisle
2b4ed22505 bug #4572 missing trailing slash (import and open_basedir)
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-28 15:51:10 -04:00
Ann + J.M
29ec69c849 Merge branch 'master' into ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-10-22 16:58:00 +02:00