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

363 Commits

Author SHA1 Message Date
Michal Čihař
1cc7466db3 Quote delimiter before using preg_replace 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-20 12:16:03 +02:00
Michal Čihař
43fdcb67ee Include phpMyAdmin version in JSON dump 
This provides useful information, the 0.1 string was not really helpful.

Issue #12304

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-09 09:19:55 +02:00
Michal Čihař
d7fcbab1cd Ensure we parse query for views as well 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-08 14:00:04 +02:00
Michal Čihař
b49030528f Fixed export of tables without explicitly set engine 
Fixes #12290

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-06-03 14:41:55 +02:00
Michal Čihař
3b374237d6 Fixed export of ARCHIVE tables with keys 
We can not rewrite the ARCHIVE table as it can not be altered.

Fixes #12082

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 15:54:26 +02:00
Michal Čihař
b0f8511e60 Use https for links to www.phpmyadmin.net 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:49:21 +02:00
Michal Čihař
11089cbe41 Use https for links to dev.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:16:44 +02:00
Michal Čihař
1580d2fa4d Fixed SQL quoting in SQL export 
The fix for 4.5 branch was wrongly merged here.

Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-05 10:05:22 +02:00
Michal Čihař
1b43606a48 Fixed possible invalid SQL export 
We should emit the charset restoration only if we have emitted its
setting in the header. As the condition was slightly different in both
cases it was possible that only one part of these two was emitted in
past.

Fixes #12074

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-18 10:34:17 +01:00
Michal Čihař
33f0b947db Merge branch 'QA_4_5' into QA_4_6 2016-02-25 12:30:42 +01:00
Michal Čihař
1297747a65 Fixed incorrect usage of SQL parser context in SQL export 
Fixes #12029

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-25 12:29:34 +01:00
Michal Čihař
67b681d63e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 10:21:07 +01:00
Michal Čihař
50af85cf34 Fix export of index comments in SQL 
Fixes #11968

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-16 10:20:09 +01:00
Michal Čihař
5042b65398 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 10:45:43 +01:00
Michal Čihař
4534a90b80 Silent warnings when checking for file existance 
Another occurences of file_exists which can be limited by open_basedir.

Issue #11940

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-12 10:38:47 +01:00
Dan Ungureanu
c6b3292fe5 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 09:39:01 +02:00
Dan Ungureanu
490325c89d Fixes #11920. Can't disable backquotes in export 
Updated sql-parser to phpmyadmin/sql-parser@de8b3efbbc (v3.2.0).

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2016-02-12 09:37:03 +02:00
Michal Čihař
e4dfb159c4 Do not use global constant with class 
As this doesn't play well together. This fixes the PDF schema export.

Fixes #11849

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-22 15:24:48 +01:00
Marc Delisle
68f8adfd84 No letters for logical operators 
https://github.com/dseguy/clearPHP/blob/master/rules/no-letter-logical.md

Signed-off-by: Marc Delisle <marc@infomarc.info>
 2016-01-05 17:17:43 -05:00
Michal Čihař
628b19283d Fix spacing of docstrings 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:40:44 +01:00
Michal Čihař
049e62285c Fix spacing after . 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:33:13 +01:00
Michal Čihař
af258e8073 Fix spacing of comments 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:31:30 +01:00
Michal Čihař
a7bafe5a6c Share code for exporting routines and events to XML 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 16:08:32 +01:00
Michal Čihař
ca59f5046c Use new contructor for Group() objects 
This safes us next calls to setName and setText.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:26:52 +01:00
Michal Čihař
4975ef2bc2 Use new constructor for Item() objects 
This allows to directly set name and text.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 15:04:02 +01:00
Michal Čihař
1168ed61b4 Share code for routines export 
The exporting of functions and procedures is almost same.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 13:06:28 +01:00
Michal Čihař
c660edd057 Simplify code by removing parallel if statements 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 12:53:18 +01:00
Michal Čihař
f4eb1a9b4f There is no need to reset() before foreach() 
The code is there since past when PHP 4 was still supported reset was
necessary.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-05 11:26:34 +01:00
Michal Čihař
55b317c699 Remove /*overload*/ prefix from mb_* calls 
I believe this was temporary flagging to see which code is migrated and
can be safely removed now.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-01-04 16:35:28 +01:00
Hugues Peccatte
8baf7c4a8a Update PHPDoc. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-12-11 23:21:54 +01:00
Madhura Jayaratne
fd0f3d4264 Merge branch 'QA_4_5' 2015-12-11 16:29:12 +11:00
Madhura Jayaratne
f0aba98e35 Fix #11732 Exporting feature does not work with union table 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-12-11 16:24:58 +11:00
Marc Delisle
2f2b505a2e Fixes ##11711 Clarify the meaning of "Stand-in structure for view" in SQL export 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-02 10:44:14 -05:00
Marc Delisle
80f079e525 Clarify message because a table name can be the same as a database name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-17 08:14:36 -05:00
Marc Delisle
06a4c57da1 Remove dead code 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-09 05:39:17 -08:00
Hugues Peccatte
e1dd0a9f97 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-18 22:51:01 +02:00
Hugues Peccatte
37d2a661c0 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:49:49 +02:00
Hugues Peccatte
09f87f4770 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 22:09:55 +02:00
Hugues Peccatte
af7eaeb047 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-07 21:51:21 +02:00
Hugues Peccatte
c0617bcd5f Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-03 15:14:47 +02: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
Hugues Peccatte
6c8c288067 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-29 21:19:57 +02: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
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
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