Commit Graph

254 Commits

Author SHA1 Message Date
Madhura Jayaratne
950d4ff3c2 Merge branch 'QA_4_4' 2015-04-03 18:54:55 +05:30
Madhura Jayaratne
c5260bb56d bug #4836 Server warning after moving from console to direct clicks
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-04-03 18:53:31 +05:30
Marc Delisle
778ea5f2dc Merge pull request #1613 from nijel/sql-session
Close session for executing user SQL queries
2015-03-28 08:03:15 -04:00
Madhura Jayaratne
8f58c8f851 bug #4805 Inline edit broken when using functions in query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-27 19:39:11 +05:30
Madhura Jayaratne
5e823b1813 isset($num_rows) always evaluated to false
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-26 18:51:49 +05:30
Michal Čihař
d0ee2336e1 Close session for executing user SQL queries
This allows other requests to be performed while executing long SQL
query.

RFE #1001

Signed-off-by: Michal Čihař <michal@cihar.com>
2015-03-26 13:43:56 +01:00
Madhura Jayaratne
ccca280ea6 rfe #947 Show edit/delete also when there is calculated column
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-03-24 20:13:01 +05:30
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
Madhura Jayaratne
58a7bf4a60 Update another instance of setProperties
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-10 16:40:59 +05:30
Madhura Jayaratne
f45c4d4975 Preserve 'is_browse_distinct' while navigating results
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-02-10 16:37:16 +05:30
Madhura Jayaratne
635413442a Coding style improvements
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-23 16:52:33 +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
Madhura Jayaratne
785123b643 bug #4705 Table structure: adding primary key doesn't refresh page
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-01-14 18:05:14 +05:30
Marc Delisle
a824169cbd Fix param doc
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-03 10:09:38 -05:00
Marc Delisle
aae2bcf6e6 Remove unnecessary display mode
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-03 09:35:09 -05:00
Marc Delisle
eb37dccbb2 Merge branch 'QA_4_3' 2015-01-03 07:31:41 -05:00
Marc Delisle
cf8bed2e3e Incorrect parameter passed to function
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-03 07:30:57 -05:00
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
Marc Delisle
8680240319 Remove unneeded level of function call
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-28 06:52:36 -05:00
Marc Delisle
3443ce8a18 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-27 07:47:18 -05:00
Madhura Jayaratne
974f7afe71 Merge branch 'QA_4_3'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 15:15:18 +05:30
Madhura Jayaratne
7cf678f79d bug #4664 select min() displays 1 row, but reports the table amount of rows returned
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-23 15:03:23 +05:30
Marc Delisle
e17ccae612 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-09 12:52:40 -05:00
Marc Delisle
6e9eee5cc6 Merge pull request #1414 from Tithugues/b4593_master
Fix #4593 Manual SELECT doesn't change active table
2014-12-06 18:28:11 -05:00
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
f9eb088bfa Update PHPDoc.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-12-06 12:42:23 +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
Madhura Jayaratne
8c215b4a84 Do no use ID attributes for bookmark fields
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 15:54:08 +05:30
Madhura Jayaratne
a362667e3c Use class attribute instead of id for sqlqueryresults
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-12-01 10:44:36 +05:30
Madhura Jayaratne
d21f37b3f1 Use class to identify bookmarkQueryForm
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-28 12:51:30 +05:30
Madhura Jayaratne
e528721543 Show messages for mulitquery
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-27 16:26:37 +05:30
Madhura Jayaratne
dfd10b34fe Serve both ajax and non-ajax scenarios
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-27 15:06:14 +05:30
Marc Delisle
51f2efc9e1 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-24 09:50:17 -05:00
Marc Delisle
c53f5f7c7c Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-11-23 07:08:55 -05:00
Madhura Jayaratne
8887b07a55 Make the method return html
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 16:12:05 +05:30
Madhura Jayaratne
c67b8bf9d6 Do not exit here
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 14:56:17 +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
74c7714cd3 Separate getResponse for sendResponse
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 11:52:27 +05:30
Madhura Jayaratne
a87ce10f9d Make methods return html rather than sending and exiting
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-12 11:42:48 +05:30
Madhura Jayaratne
3b3bd0c2eb Merge branch 'QA_4_2'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:41:56 +05:30
Madhura Jayaratne
ffcd97aa48 bug #4404 Recordset return from procedure display nothing
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-11-11 10:28:58 +05:30
Hugues Peccatte
2b4d6c955e Remove duplicated js function.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-03 21:57:55 +01:00
Hugues Peccatte
42e0bdd47a Fix typos.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-11-02 18:32:42 +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
90ee48f0ba Merge pull request #1384 from phpmyadmin/ZweiSteinSoft/rfe/1550-pma-url-getcommon-new-style
RFE 1550: PMA_URL_getCommon(): new style
2014-10-28 08:14:45 -04:00
Hugues Peccatte
80869ba0ec Merge branch 'master' into stringFunctions_useStandardFunctions_master 2014-10-25 17:08:48 +02:00
Marc Delisle
e92107b9b5 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-24 13:00:23 -04:00
Chanaka Dharmarathna
b1b6232c04 Remove dead codes
Signed-off-by: Chanaka Dharmarathna <pe.chanaka.ck@gmail.com>
2014-10-22 23:08:13 +05:30
Hugues Peccatte
74f0beda8f Fix syntax error.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-10-20 20:56:12 +02:00