gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
102,867 Commits 12 Branches 481 Tags 2.4 GiB
3bdf520bcb
Commit Graph

14873 Commits

Author SHA1 Message Date
Marc Delisle
3bdf520bcb Force the documented return type 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-04 10:23:50 -04:00
Marc Delisle
0e7e952b7b Remove author name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:15:49 -04:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Madhura Jayaratne
5eef3a9b60 Merge branch 'QA_4_5' 2015-10-03 22:50:59 +10:00
Madhura Jayaratne
88527a0ff0 Merge pull request #11534 from udan11/fix_11519 
Fix #11519. Bug while exporting results when a joined table field name is in SELECT query.
 2015-10-03 22:44:07 +10:00
Madhura Jayaratne
5d2fa0d91b Merge branch 'QA_4_5' 2015-10-03 22:20:06 +10:00
Madhura Jayaratne
b41ab56e3b Fix #11526 Foreign key to other database's tables fails 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-03 22:14:49 +10:00
Dan Ungureanu
a707ab5616 Fixes #11519. Bug while exporting results when a joined table field name is in SELECT query. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-03 12:33:41 +03:00
Dan Ungureanu
f0354276d9 Support for references from other tables. 
Cherry-picked udan11/sql-parser@d1e565d2bb.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-03 12:33:23 +03:00
Dan Ungureanu
238e00b5d9 Fix #11531. Invalid SQL in table definition when exporting table. 
Cherry-picked udan11/sql-parser@e5b1cd830d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-02 13:24:35 -04:00
Marc Delisle
f49f049636 Merge pull request #11532 from udan11/QA_4_5 
Fix #11531.
 2015-10-02 13:22:37 -04:00
Dan Ungureanu
4e668051ee Fix #11531. Invalid SQL in table definition when exporting table. 
Cherry-picked udan11/sql-parser@e5b1cd830d.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-02 18:19:31 +03:00
Marc Delisle
75acdb1344 Merge branch 'QA_4_5' 2015-10-01 11:29:29 -04:00
Marc Delisle
3df771238e Fixes #11524 Yellow star does not change in database Structure after add/remove from favorites 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-01 11:28:29 -04:00
Marc Delisle
d951b9d133 Merge branch 'QA_4_5' 2015-10-01 09:49:52 -04:00
Dan Ungureanu
ce6c465d15 Fixes #11509, #11512, #11518. 
Updated sql-parser library to udan11/sql-parser@2f5d2daabb (v2.1.1).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-10-01 16:22:37 +03:00
Madhura Jayaratne
8324789321 UI does not support inserting multiple values for these functions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-01 21:29:42 +10:00
Madhura Jayaratne
11981e8bd9 Hide values column for HASH and KEY partition types 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-01 07:08:14 +10:00
Madhura Jayaratne
5d5ec35203 Fix notices while changing from HASH type to RANGE type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-10-01 06:23:07 +10:00
Marc Delisle
2d583392e4 Merge pull request #11517 from madhuracj/edit_partitions 
Allow adding and editing partitions
 2015-09-30 13:28:07 -04:00
Marc Delisle
6dbdceef21 Add type definition for JSON 
Add ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-30 08:01:34 -04:00
Marc Delisle
51b80dfc6b Merge remote-tracking branch 'madhuracj/json' 2015-09-30 07:58:01 -04:00
Madhura Jayaratne
b3381a1301 Merge branch 'QA_4_5' 2015-09-30 21:31:17 +10:00
Madhura Jayaratne
b10a08e0da #11516 Fix spaces 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-30 21:29:16 +10:00
Madhura Jayaratne
d0efeac744 Allow adding and editing partitions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-30 21:18:04 +10:00
Madhura Jayaratne
015eb63166 Merge branch 'QA_4_5' 2015-09-30 21:12:15 +10:00
Madhura Jayaratne
6adb719b3f Fix #11516 Some partitions are missing in copied table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-30 21:03:25 +10:00
Marc Delisle
a111236a61 Merge commit 'a4fbbcc' 2015-09-29 05:17:36 -04:00
Marc Delisle
7b3b85c541 Fix typo 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 18:01:15 -04:00
Nisarg Jhaveri
dca9a062ed bug #11510, AUTO_INCREMENT value always shown in export 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-09-29 03:05:43 +05:30
Marc Delisle
54c08f8de8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-28 09:46:18 -04:00
Madhura Jayaratne
2e402b8e35 Hide Insert tab for non-updatable views 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 16:49:43 +10:00
Madhura Jayaratne
257487df03 Add comments. Improved handling of partition restrictions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-28 09:51:56 +10:00
Marc Delisle
50d1c4f950 Merge branch 'QA_4_5' 2015-09-27 08:52:34 -04:00
Marc Delisle
3bc822d626 Fixes #11505 Notice on htmlspecialchars() 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-27 08:52:07 -04:00
Madhura Jayaratne
611222d414 Only RANGE and LIST type partitions allow having subpartitions 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-27 20:44:22 +10:00
Hugues Peccatte
fb48bff1b4 Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:21:27 +02:00
Hugues Peccatte
829a52cfa4 Remove useless constructors. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:16:51 +02:00
Hugues Peccatte
faba0fb75d Use 'static::' when needed. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:13:01 +02:00
Hugues Peccatte
0f80756fe6 Use pre-increment when possible. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 23:12:09 +02:00
Hugues Peccatte
6ccb7ff44f Use php5 syntax instead of php4 for properties declaration. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 22:40:10 +02:00
Hugues Peccatte
d0b3208109 Remove redeclare property. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-26 22:03:43 +02:00
Marc Delisle
62859dffbc Merge branch 'QA_4_5' 2015-09-25 13:49:36 -04:00
Marc Delisle
62a4e61a65 Optimize function call 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 13:48:55 -04:00
Deven Bansod
b13550af11 Fix issue #11500 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2015-09-26 02:54:50 +05:30
Marc Delisle
299d2e8f40 Merge branch 'QA_4_5' 2015-09-25 09:57:57 -04:00
Marc Delisle
1ed1d638f8 Fix failing tests 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 09:57:23 -04:00
Marc Delisle
2f41ca05f7 Merge commit '8d202a3' 2015-09-25 07:21:32 -04:00
Marc Delisle
ac33a96ba8 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:17:04 -04:00
Dan Ungureanu
8d202a3dc1 Fixes #11497. 
Cherry-picked udan11/sql-parser@1415469.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-25 07:07:27 -04:00