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

177 Commits

Author SHA1 Message Date
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
Marc Delisle
a111236a61 Merge commit 'a4fbbcc' 2015-09-29 05:17:36 -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
2f41ca05f7 Merge commit '8d202a3' 2015-09-25 07:21:32 -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
Nisarg Jhaveri
b5c731ab62 Backport 053edda33f 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-24 04:05:26 -04:00
Marc Delisle
b468d57409 Merge commit 'bd84bb8' 2015-09-23 15:56:27 -04:00
Nisarg Jhaveri
053edda33f Fix #11492, AUTO_INCREMENT statements are partly missing from exports 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-09-24 00:34:07 +05:30
Madhura Jayaratne
93bfdbe371 Remove more references to Drizzle 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:06:58 +10:00
Madhura Jayaratne
7fadb9e37f Remove Drizzle support from import and export 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-09-10 01:02:37 +10:00
Madhura Jayaratne
154d62d27d Fix #11436 CREATE DATABASE should be enabled by default on server exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-28 18:52:37 +10:00
Hugues Peccatte
bd707b871d Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 23:34:50 +02:00
Hugues Peccatte
00bd7f02f3 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:36:16 +02:00
Marc Delisle
325c318e00 Clarify explanation 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-22 07:47:49 -04:00
Marc Delisle
569e0c1414 Merge pull request #11419 from nisargjhaveri/combine_indexes 
Create indexes with table creation if "IF NOT EXISTS" is on
 2015-08-22 07:37:45 -04:00
Nisarg Jhaveri
b2e8e4660b Create indexes with table creation if "IF NOT EXISTS" is on 
- change default of IF NOT EXISTS option in export
- Add warning for efficiency with IF NOT EXISTS option

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-08-22 02:18:38 +05:30
Madhura Jayaratne
aed8527845 Make the SQL exports compatible for side by side comparison with old exports 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 23:45:46 +05:30
Madhura Jayaratne
e27ae93962 Organize export options 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:46:24 +05:30
Madhura Jayaratne
3307089efa Be more explicit that this directive is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:38:25 +05:30
Madhura Jayaratne
f5a02f0eca sql_auto_increment is about auto increment value 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:30:44 +05:30
Madhura Jayaratne
da1d274078 Fix - Respect the Auto increment checkbox 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:24:29 +05:30
Madhura Jayaratne
769a8aa15f Fix #11414 Unclear export options / organization / hierarchy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-20 10:06:38 +05:30
Madhura Jayaratne
9cf71d9169 Fix #11394 Export/import Designer view 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-08-13 10:17:24 +05:30
Marc Delisle
ad5baa88e9 Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 18:00:16 -04:00
Marc Delisle
c3c196cad8 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:49:17 -04:00
Madhura Jayaratne
35d36f966d Revert "Support alias" 
This reverts commit 2cfaf8f411.

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 14:08:10 +05:30
Madhura Jayaratne
2cfaf8f411 Support alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:54:51 +05:30
Madhura Jayaratne
8ebb632bc2 Merge branch 'QA_4_4' 2015-07-31 12:42:54 +05:30
Madhura Jayaratne
eea2bf811a Fix #11336 Exporting a table exports database level events 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-31 12:36:53 +05:30
Madhura Jayaratne
9a8e8e60c8 Fix #11328 Exporting table generates AUTO_INCREMENT=; for new tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-28 16:13:42 +05:30
Jason
6fd29078b6 Fix test failures 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:46:40 +08:00
Jason
6636153071 Resolve conflicts from upstream 
Signed-off-by: Jason <jason.daurus@gmail.com>
 2015-07-23 11:29:53 +08:00
Madhura Jayaratne
9081580c63 Remove extra new line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:23:27 +05:30
Dan Ungureanu
deada65601 Fixed exporting issues related to views. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 19:14:22 +03:00
Dan Ungureanu
fd1dc6d6ec Fixed wrong variable name. 
Updated sql-parser library to udan11/sql-parser@140040f.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 03:37:25 +03:00
Dan Ungureanu
5fa3bdf0d1 Restore SQL mode after export with certain configuration has finished. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-11 00:42:16 +03:00
Dan Ungureanu
8a5e8a275a Using the new parser when generating a table's definition. 
Fixed a small bug regarding an undefined variable.
Updated sql-parser library to udan11/sql-parser@30fdd07.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:19 +03:00
Dan Ungureanu
c123e0f7b4 Replaced the old parser in utilities. 
Updated sql-parser library to udan11/sql-parser@9478c9a.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:18 +03:00
Dan Ungureanu
fc6212b922 Improved documentation. 
Updated sql-parser library to udan11/sql-parser@0bff48a.

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
d4cbb51d04 Using the new parser for replacing aliases for export. 
Updated sql-parser library to udan11/sql-parser@2833495.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:17 +03:00
Dan Ungureanu
c34cf9ff29 More refactoring. 
Updated sql-parser library.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:16 +03:00
Madhura Jayaratne
dadecaf393 Match the name of corresponding config value. 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-30 15:16:42 +05:30
Madhura Jayaratne
7d85ed44dd Simplify the logic 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 17:27:33 +05:30
Madhura Jayaratne
e6b4065aee Merge branch 'QA_4_4' 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 15:21:56 +05:30
Madhura Jayaratne
d6d016aef9 bug #4936 utf8mb4 fields show only ????s for 4-byte Unicode characters after import 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 15:20:18 +05:30
Madhura Jayaratne
5b8ce769c8 Merge branch 'QA_4_4' 2015-06-02 14:43:36 +05:30
Madhura Jayaratne
cd2ee14a7c bug #4937 Custom export with backquotes off is not working 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-06-02 14:40:25 +05:30
Hugues Peccatte
d3dd47217e Add missing return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 12:54:37 +02:00