gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,583 Commits 12 Branches 481 Tags 2.4 GiB
696eeb463d
Commit Graph

43 Commits

Author SHA1 Message Date
Michal Čihař
637d4eb4de Merge branch 'QA_4_6-security' into master-security 2016-06-20 17:35:46 +02:00
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ř
0b2b23f2ce Merge branch 'QA_4_6' 2016-06-08 14:00:26 +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ř
8a494f26d2 Merge branch 'QA_4_6' 2016-06-03 14:42:07 +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ř
9d5c5f0c86 Adjust tests to new error messages 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 21:27:41 +02:00
Michal Čihař
4cd8ab8a95 Better report errors while generating SQL exports 
The errors will include table and database name in the dump and the
error is also shown in the UI on next page.

Fixes #5555

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-23 17:21:58 +02:00
Michal Čihař
1d1e269144 Merge branch 'QA_4_6' 2016-05-23 15:54:33 +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ř
a2b8bfc308 Merge branch 'QA_4_6' 2016-05-17 10:50:16 +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ř
aaa707ab4d Merge branch 'QA_4_6' 2016-05-17 10:18:52 +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ř
e2deac4b22 Move getting collation to the DBI layer 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 11:42:29 +02:00
Michal Čihař
cd4008b3d7 Move MySQL charset maps to separate class 
This allows us to load it only when needed

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 10:33:40 +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ř
67b681d63e Merge branch 'QA_4_5' into QA_4_6 2016-02-16 10:21:07 +01:00
Dan Ungureanu
c6b3292fe5 Merge branch 'QA_4_5' into QA_4_6 2016-02-12 09:39:01 +02: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ř
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
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
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
Hugues Peccatte
6c8c288067 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-29 21:19:57 +02:00
Hugues Peccatte
71b62bcef9 Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-09-26 13:50:49 +02:00
Hugues Peccatte
330c92ddf7 Set namespace on properties classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 22:16:23 +02:00
Hugues Peccatte
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02:00
Hugues Peccatte
6c594eb0cf Fix calls. 
Remove useless PHPDoc.
Add missing require.
Add missing 'use'.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 22:58:47 +02:00
Hugues Peccatte
04b4f723d8 Move libraries/plugins/auth and export classes into a namespace. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-05 00:09:30 +02:00