Commit Graph

100 Commits

Author SHA1 Message Date
Hugues Peccatte
6bb56cf491 Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-08-24 21:03:10 +02:00
Dan Ungureanu
cb9cc68fe9 Fixed more issues.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-25 19:39:33 +03:00
Hugues Peccatte
e29101e06f Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-23 22:20:28 +02:00
Jason
6636153071 Resolve conflicts from upstream
Signed-off-by: Jason <jason.daurus@gmail.com>
2015-07-23 11:29:53 +08:00
Hugues Peccatte
b92c1f4fdd Update PHPDoc.
Make PHPCS happy.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-07-19 15:32:27 +02:00
Dan Ungureanu
91b97fadc2 Remove unneeded closing tags.
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
2015-07-19 00:18:38 +03:00
Madhura Jayaratne
45cb8e8e7c Improve comments
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 11:56:04 +05:30
Madhura Jayaratne
714ab04d51 bug #4795 Query builder: missing joint for the intermediary table
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 11:47:22 +05:30
Madhura Jayaratne
f965893c7b Refactor: Move table JOINing logic to a separate method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:53:39 +05:30
Madhura Jayaratne
fae84aca9a Refactor: move to a new method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:45:19 +05:30
Madhura Jayaratne
7a4efae405 Better variable names
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:32:15 +05:30
Madhura Jayaratne
2d331942f5 Reduce duplication
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-17 10:10:07 +05:30
Hugues Peccatte
9867e4459b Make PHPcs happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-06-14 13:36:16 +02:00
Hugues Peccatte
8d443b08a5 Make PHPcs happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2015-06-14 13:22:52 +02:00
Madhura Jayaratne
393aa8e694 Add master table only if it's not empty
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-12 18:31:02 +05:30
Madhura Jayaratne
8dacdd198e Move the column count obtaining logic to a separate method
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-12 18:24:47 +05:30
Madhura Jayaratne
ab9a8bdd25 Do array multi sort only when sort order is defined
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-12 11:58:50 +05:30
Madhura Jayaratne
401dbb1918 Allow ordering order by clauses
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-12 10:36:16 +05:30
Madhura Jayaratne
ab6b617e97 Introduce aliases
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-12 07:27:51 +05:30
Madhura Jayaratne
2a0397dd33 Remove the choice to select whether or not to use joins. Reverts 27c259c and 357f0be
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-12 06:23:51 +05:30
Madhura Jayaratne
115607abb2 bug #4510 QBE generates wrong query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-11 21:27:06 +05:30
Madhura Jayaratne
357f0be265 Use negation
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-11 14:00:04 +05:30
Madhura Jayaratne
7e69d0ff54 And and Or checkboxes in last column is redundant
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-11 13:29:57 +05:30
Madhura Jayaratne
bdf51f23cd Interchange show and sort rows
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-11 13:05:23 +05:30
Madhura Jayaratne
27c259c7cb Allow user to chose whether to use joins or not
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-11 12:58:11 +05:30
Madhura Jayaratne
036d70aa8d All tables are not defined outside
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-06-11 12:45:57 +05:30
Madhura Jayaratne
f931072342 Use CodeMirror editor in query
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2015-05-08 13:44:21 +05:30
Marc Delisle
4c6181dbf1 Fix some PMD ShortVariable warnings
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-04-12 07:02:59 -04:00
Marc Delisle
c326cc9542 Merge pull request #1572 from tapanhalani/master
Fix Feature#1609- Lock page navigation when entering data.
2015-03-15 06:52:28 -04:00
Tapan Halani
0ac7e8f0f6 Fix feature#1609: Lock page navigation when entering data.
Signed-off-by: Tapan Halani <tapanhalani231@gmail.com>
2015-03-14 22:07:44 +05:30
Marc Delisle
6d56ef9c4d Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2015-01-16 06:02:39 -05:00
Marc Delisle
0a2fd56c49 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-17 13:46:43 -05:00
Marc Delisle
ee960768ca Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-17 13:26:54 -05: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
0a37b28e0a Fix undefined offset notice
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-30 10:57:33 -04:00
Marc Delisle
e7598d7cc9 Remove dead code
Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-10-27 12:57:35 -04: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
fe452a7240 Make Scrutinizer happier.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
2014-09-06 13:56:42 +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
9191c1aa4e Bug#4511: QBE fails to generate LEFT join for InnoDB foreign keys in absence of configuration storage.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-11 03:58:19 +05:30
Ashutosh Dhundhara
057a5cbf97 Improve 'LEFT JOIN' generation for internal relations.
Signed-off-by: Ashutosh Dhundhara <ashutoshdhundhara@yahoo.com>
2014-08-04 03:53:37 +05:30
Ann + J.M
f5a9a60382 Fix coding style
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-07-03 20:27:39 +02:00
Ann + J.M
ddf78c212b Re-merge b3dbec1...9207203, changes got lost on original merge from QA_4_2
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-26 10:39:50 +02:00
Marc Delisle
1acfaf4a7f Merge commit 'ddbe5ae' 2014-05-23 10:15:49 -04:00
Ann + J.M
ddbe5aed27 DBQbe::_getInsDelAndOrCell: Fix PHPDoc param type 2014-05-21 20:19:23 +02:00
Ann + J.M
69ddb29989 Code style fixes
Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
2014-05-19 22:33:01 +02:00
Madhura Jayaratne
a53ded5d9e $cfgRelation is an array
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
2014-05-10 10:21:53 +02:00