gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
101,818 Commits 12 Branches 481 Tags 2.4 GiB
f25de2d221
Commit Graph

288 Commits

Author SHA1 Message Date
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
Marc Delisle
bcb699f72d Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-06 14:01:42 -04:00
Marc Delisle
36ba14ad8e Make scrutinizer happy 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-08-03 16:04:58 -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
Dan Ungureanu
cb9cc68fe9 Fixed more issues. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-25 19:39:33 +03:00
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
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
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
Michal ฤŒihaล™
b39cb1cb81 Merge remote-tracking branch 'origin/QA_4_4' 2015-07-02 13:40:23 +02:00
Michal ฤŒihaล™
a6fd4c2ed4 Cleanup URLs to our website 
- use https everywhere
- follow redirects on renamed pages

Signed-off-by: Michal ฤŒihaล™ <michal@cihar.com>
 2015-07-02 13:39:10 +02:00
Marc Delisle
b18bda2e51 Fix loose comparison 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-07-01 07:57:12 -04: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
Marc Delisle
b69b481612 Merge pull request #1679 from Tithugues/addReturns_master 
Add missing return.
 2015-05-18 07:48:34 -04:00
Hugues Peccatte
f305c14d1d PHPDoc update. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 15:12:32 +02:00
Hugues Peccatte
d3dd47217e Add missing return. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-05-17 12:54:37 +02:00
Madhura Jayaratne
4345479ee7 Remove extra spaces before opening parenthesis 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 16:15:05 +05:30
Madhura Jayaratne
5857fe163d Fix spacing after opening brace 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 11:05:08 +05:30
Madhura Jayaratne
5e7dca6968 Fix spacing after param name 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:50:50 +05:30
Madhura Jayaratne
d54df757f6 Fix spacing after param type 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 10:47:24 +05:30
Madhura Jayaratne
b775f07207 Underscore for private methods 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:31:07 +05:30
Madhura Jayaratne
f98600d174 More doc updates 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:26:24 +05:30
Madhura Jayaratne
40c82aad55 Update docs 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-28 07:21:41 +05:30
Madhura Jayaratne
0cb93d6870 File is being conditionally included; use "include" instead 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 19:11:26 +05:30
Madhura Jayaratne
3d85296d79 Spaces around assignments 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:06:36 +05:30
Madhura Jayaratne
7c82094f60 Do not use inline control structures 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-27 18:00:49 +05:30
Madhura Jayaratne
598f618427 Remove from metadata export until we find a way to align ids between them 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:27:45 +05:30
Madhura Jayaratne
50d5db0643 Remove id field from some of the metadata 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 19:11:21 +05:30
Madhura Jayaratne
2693ad8699 Dump all metadata at the end 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-23 18:53:42 +05:30
Madhura Jayaratne
ef981aa335 rfe #1632 Importing and exporting pMA meta-data 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-04-10 16:00:57 +05:30