gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,650 Commits 12 Branches 481 Tags 2.4 GiB
6dfd382ff7
Commit Graph

99 Commits

Author SHA1 Message Date
Michal Čihař
27fb0b58af Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 14:07:29 +01:00
Michal Čihař
e4bf536906 Update to SQL Parser 4.0.1 
It now follows PSR-4 and uses PhpMyAdmin namespace prefix.

See https://github.com/phpmyadmin/sql-parser/issues/126

Signed-off-by: Michal Čihař <michal@cihar.com>
 2017-01-23 13:56:35 +01:00
Michal Čihař
308c9d7951 Simplify Response object handling 
- always use use and short name
- avoid calling getInstance() several times in one script

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-12-07 18:17:59 +01:00
Deven Bansod
ff91dc93f4 Merge branch 'QA_4_6' 2016-10-05 17:43:04 +05:30
Deven Bansod
9ceb237dd6 Don't append FROM clause for replacing in UNION statements 
If global statement has atleast one union, it should not have a FROM.

Fix #12619

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-10-05 17:38:23 +05:30
Deven Bansod
d6571ef86c Merge branch 'QA_4_6' 
Conflicts:
	po/sk.po
 2016-09-28 20:09:45 +05:30
Deven Bansod
59cd9bf3a1 Replace FROM clause aliases only if FROM clause is present 
Fix #12579

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-28 19:27:35 +05:30
Deven Bansod
3b227209a1 Make phpcs happy 
Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-03-22 11:50:22 +05:30
Marc Delisle
0a9bdc1619 Fix merge conflict 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-12-13 19:41:55 -05:00
Achilles-96
4b8983028a Fixes #11679 
Signed-off-by: Raghuram Vadapalli <raghuram.vadapalli@research.iiit.ac.in>
 2015-12-14 00:31:09 +05:30
Marc Delisle
e02542d0ba Refactor handling of export template actions 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-11-21 06:50:41 -05:00
Hugues Peccatte
ffc4422db7 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-10-19 20:33:21 +02:00
Hugues Peccatte
6f4676cdfc Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-04 18:04:49 +02:00
Marc Delisle
fd7c8522ea Clarify method name 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-10-03 10:14:29 -04:00
Hugues Peccatte
bd0d2b79db Merge remote-tracking branch 'origin/master' into useNamespaces_master 2015-10-01 18:19:18 +02: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
Hugues Peccatte
3bf856e4c4 Merge branch 'master' into useNamespaces_master 2015-09-13 15:53:04 +02:00
Hugues Peccatte
fa801c507f Set namespace on plugins classes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-12 12:51:45 +02:00
Marc Delisle
a2c009e670 Remove duplication 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-12 06:25:36 -04:00
Hugues Peccatte
b92491d799 Merge branch 'master' into useNamespaces_master 2015-09-12 00:53:39 +02:00
Marc Delisle
77c0d66a1b Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 13:37:54 -04:00
Marc Delisle
27e54fb194 Refactor to remove display_export.inc.php 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2015-09-11 11:44:26 -04:00
Hugues Peccatte
e6c142bc56 Add missing require. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-06 12:44:03 +02:00
Hugues Peccatte
6f84933a00 Add missing require. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-06 01:20:11 +02:00
Hugues Peccatte
e5e447e937 Set namespace on config classes. 
Update config classes.
Add @noinspection tag.
Update documentation and script.
Set ConfigGenerator in a namespace.
Rename ConfigGenerator filename.
Remove ConfigGenerator requires.
Fix namespaces of mock objects.
Remove useless require.
Add missing 'use'.
Add missing require.
Update PHPDoc.
Fix class test typo.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:23 +02:00
Hugues Peccatte
f0ba28fc1d Set namespace on Advisor, Config, Console and Util classes. 
Set namespace on DbQbe.
Set namespace to 'DbSearch'.
Split Advisor.class.php file.
Change Advisor namespace.
Rename DbQbe class and file.
Set namespace on DisplayResults.
Set namespace on Error.
Use namespace for ErrorHandler.
Add class autoloader.
Change ErrorHandler filename.
Remove some require.
Update Config namespace path.
Update PMA_Util to PMA\libraries\Util.
Rename Font and File classes files.
Use namespace for Footer.
Set namespace in all libraries classes.
Namespace OutputBuffering.
Export SubPartition.
Rename Partition file.
Namespace PDF.
Namespace RecentFavoriteTable.
Replace PMA_Response by Response and PMA_Message by Message.
Update uses and calls.
Fix unit tests.
Fix SqlParser autoload.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:22:52 +02:00
Hugues Peccatte
bf61709259 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-07-23 14:38:07 +02:00
Madhura Jayaratne
8c19eedca1 Use correct name format 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-17 14:11:19 +05:30
Dan Ungureanu
2dfc29df4a Updated sql-parser library to udan11/sql-parser@5278427. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:19 +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
11f42cd80e Using the new parser for exporting. 
Updated sql-parser library to udan11/sql-parser@06c0a64.

Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-07-10 23:18:17 +03:00
Madhura Jayaratne
f0664e7875 This is an internal directive. Use without underscore to match other similar ones 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:12:21 +05:30
Madhura Jayaratne
8c6261c73f Underscores are preferred to separate words in configuration storage table names/directives 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-09 17:06:28 +05:30
Madhura Jayaratne
c987104160 Make scrutinizer happy 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-06 12:09:04 +05:30
Madhura Jayaratne
4ab83556c6 Allow using templates created for other databases/tables 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:04:02 +05:30
Madhura Jayaratne
545db4a443 rfe #812 store export definitions for reuse 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2015-07-02 21:03:57 +05:30
Hugues Peccatte
37f6b992da Fix typos. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-06-14 13:50:57 +02:00
Nisarg Jhaveri
e115adb533 Page-related settings, rfe#1559 
Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
 2015-05-18 20:38:07 +05:30
Rahul Kadyan
4d308ba364 Remove unneeded closing tags 
Closing tags at the end of file are not mandatory. It is often
suggested to omit to closing tags at the end of file to prevent
unwanted effects as PHP will start output buffering if there is
any character after closing tag.

Reference: http://php.net/manual/en/language.basic-syntax.phptags.php

Signed-off-by: Rahul Kadyan <hi@znck.me>
 2015-03-06 23:37:35 +05:30
Madhura Jayaratne
8252099d9d bug #4444 No insert statement produced in SQL export for queries with alias 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-11-19 10:36:29 +05:30
Michal Čihař
9c141ee607 Various coding style fixes 2013-08-06 15:56:32 +02:00
xmujay
0157002bd1 rename server_export.lib.php to display_export.lib.php due to it works for server and database, table level export 2013-07-21 10:23:35 +08:00
Madhura Jayaratne
2baf473ad7 Merge branch 'master' into OOP_DBI 
Conflicts:
	libraries/database_interface.lib.php
 2013-05-26 21:43:33 +05:30
Marc Delisle
1fd1a41541 Add unset() statement to help for future refactoring 2013-05-26 09:52:34 -04:00
Marc Delisle
efbe487468 Fix typos 2013-05-26 09:36:17 -04:00
Chanaka Indrajith
df37fd140f Fixed bug 3912 2013-05-26 16:07:00 +05:30
Samith Dassanayake
ae3d3f5a84 Used preg_split() instead of explode() to split sql query, 
Since explode is case sensitive and if table or column contains substring "where" it will give an error
 2013-02-20 20:06:57 +05:30
Samith Dassanayake
ea0f6d0210 Fixed #3830 Can't export custom query because it lowercases table names 2013-02-20 18:14:53 +05:30
Marc Delisle
c52dc0d2b7 Improve comments 2012-11-02 06:53:09 -04:00