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

251 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
Michal Čihař
dad93483c1 Merge branch 'QA_4_6' 2016-11-10 11:08:36 +01:00
Deven Bansod
f14cffdbe7 Properly escape strings in MySQL statement values 
Use *_real_escape string functions provided by connectors to escape strings while exporting

Fix #12453

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>

Conflicts:
	libraries/server_privileges.lib.php
 2016-10-29 10:45:12 +05:30
Michal Čihař
4d9febb855 Use built in pow for column calculation 
We're certainly not able to process more fields than integer can store.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-09-27 09:34:32 +02:00
Michal Čihař
3debfa5d1f Merge branch 'QA_4_6' 2016-09-06 11:33:32 +02:00
Deven Bansod
715403c0e7 Fix #12531 : Properly flag queries as DROP DATABASE 
Parser recognizes various DROP statements correctly, but the flags set by SQL Parser are incorrectly used.
In js/functions.js, removed the Regex-based matching, rather handle it in PHP as we have correct flags available from SQL Parser

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
 2016-09-06 14:20:19 +05:30
Michal Čihař
6d8e1d7935 Merge branch 'QA_4_6' 2016-07-28 09:38:08 +02:00
Michal Čihař
257e65ba9f Use https for outbound links where applicable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-28 09:19:13 +02:00
Michal Čihař
d15490088c Merge branch 'QA_4_6' 2016-07-27 16:30:47 +02:00
Michal Čihař
870ca1cc7a Use https for wiki links 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-07-27 16:28:07 +02:00
Michal Čihař
98ad7d1ba4 Merge branch 'QA_4_6' 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:42:37 +02:00
Michal Čihař
05a45fe23f Use https for links to bugs.mysql.com 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-05-17 10:41:13 +02:00
Michal Čihař
9ff296f841 Remove debugging code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-13 14:46:30 +02:00
Michal Čihař
00db766927 Remove unused function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 18:31:56 +02:00
Michal Čihař
e068339e90 Fix import handle cleanup on error 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:20:01 +02:00
Michal Čihař
b54e5b0c4b Use File class for file imports 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-04-11 17:09:40 +02:00
Michal Čihař
4ed47fc4b4 Move charset conversion to a class 
Also removes ancient support for AIX iconv.

Issue #11731

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-03-08 14:05:59 +01:00
Durgesh
0b64827930 Refactored url parmeters generating, Issue #11990 
Signed-off-by: Durgesh <007durgesh219@gmail.com>
 2016-02-22 14:36:41 +05:30
Madhura Jayaratne
d4ad18e630 Remove debugging code 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2016-02-19 23:00:51 +11:00
Michal Čihař
dd09116716 Correct fix for table import processing 
We need to consistently propagate the $sql_data array.

Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 11:12:08 +01:00
Michal Čihař
855145988c Revert "Always use local static storage of executed queries" 
This reverts commit ee8f9b0dba.
 2016-02-17 10:59:37 +01:00
Michal Čihař
18f9231d74 Fixed CSV import 
Fixes #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:52:34 +01:00
Michal Čihař
ee8f9b0dba Always use local static storage of executed queries 
Issue #11850

Signed-off-by: Michal Čihař <michal@cihar.com>
 2016-02-17 10:46:23 +01: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ř
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
Michal Čihař
8de01e61c0 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 17:15:55 +01:00
Michal Čihař
a9b031b4aa Remove unused global 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-21 17:13:16 +01:00
Michal Čihař
9187445a9f Display results for all queries returning data 
This is limited to 50 queries, and removes detection based on query
string. It rather passes all (up to 50) queries to sql.php, which can
properly handle any query returing results.

Fixes #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 15:07:23 +01:00
Michal Čihař
01d96f8bf4 Fix parameter to detect DROP/CREATE 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 15:05:02 +01:00
Michal Čihař
a786952213 Remove unused variable 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:53:26 +01:00
Michal Čihař
085761fe5f Simplify query execution 
We get most information as parameters.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:52:46 +01:00
Michal Čihař
135077bbc0 Fold updateSqlData into new function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:45:32 +01:00
Michal Čihař
189f893677 Split out actual query execution to separate function 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-16 14:44:54 +01:00
Michal Čihař
0a20708533 Update sql data array in place 
There is no need to create a copy here.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 10:11:00 +01:00
Michal Čihař
6b9d93a270 Do not try to catch USE when runing through sql.php 
In this case it's properly handled there, we should not do any database
changes at this point.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-15 09:40:52 +01:00
Michal Čihař
4d74053e3f Remove not used controluser support from PMA_importRunQuery 
This code was never executed.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:29:51 +01:00
Michal Čihař
18cfc24743 Display results of execute statement 
Issue #11741

Signed-off-by: Michal Čihař <michal@cihar.com>
 2015-12-14 16:22:34 +01:00
Hugues Peccatte
f9d582bd09 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-11-08 15:58:48 +01: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
42c0ebac85 Merge branch 'master' into useNamespaces_master 2015-09-09 22:05:00 +02: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
Hugues Peccatte
0761fb1801 Rename classes files. 
Rename classes.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-09-01 21:30:21 +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
7af0fcf918 Make PHPCS happy. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2015-08-24 19:43:19 +02:00
Dan Ungureanu
f8a019512f Remove unnecessary code. 
Signed-off-by: Dan Ungureanu <udan1107@gmail.com>
 2015-08-13 00:10:00 +03: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