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

101 Commits

Author SHA1 Message Date
Michal Čihař
ddac366fd6 Merge remote-tracking branch 'origin/QA_4_2' 
Conflicts:
	libraries/DatabaseInterface.class.php
 2014-06-12 13:37:35 +02:00
Chirayu Chiripal
2bd9544878 bug-4454: PMA_DatabaseInterface::getColumnsFull() when called with no database or table parameter gives incorrectly nested keys 
Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
 2014-06-12 16:55:27 +05:30
Michal Čihař
4c328aaf03 Remove workaround for older MySQL versions 
Remove workaround originally implemented for MySQL < 5.0.2, but also
useful in 5.1.x times for listing tables within database when
permissions on one of database directories are wrong.

I've tested this with several MySQL versions and it does not seem to be
needed now, the INFORMATION SCHEMA works correctly even if some of the
database directories have wrong permissions.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 11:57:14 +02:00
Michal Čihař
dbd18940be Remove explicit unsetting of local variables 
This was useful in global scope, but makes no sense when used inside
method as all it's variables are cleaned up anyway.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
697cbf22d5 Simplify code 
foreach on empty list does nothing, so we can skip the initial
condition.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:50:02 +02:00
Michal Čihař
ecfcba84f1 Correct parameter types 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-10 09:26:08 +02:00
Michal Čihař
54564305b6 Query options are integer (and are so handled in other methods) 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 14:59:22 +02:00
Madhura Jayaratne
3c21181678 Remove extra empty line 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-06-06 18:19:30 +05:30
Michal Čihař
d6a3abcf81 Fix method call 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 12:54:21 +02:00
Michal Čihař
cbac30c99a Document that fetchResult can take array 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:34:38 +02:00
Michal Čihař
de7255f120 Share code for generating JOIN query for Drizlle 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:32:17 +02:00
Michal Čihař
7bc9eba9bc One place to generate KILL query 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-06 11:08:40 +02:00
Michal Čihař
1beb22fddc Merge pull request #1205 from duncan3dc/amazon_rds 
Allow processes to be killed on Amazon RDS
 2014-06-05 22:36:35 +02:00
Craig Duncan
17fd6b576a Dynamically detect an amazon rds instance 
This is to avoid more configuration options

Signed-off-by: Craig Duncan <git@duncanc.co.uk>
 2014-06-05 19:38:57 +01:00
Michal Čihař
1ca50ed73e Adjust comment as this returns bool 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-06-04 10:15:20 +02:00
Madhura Jayaratne
839094612a Fix typo 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
 2014-05-10 13:00:26 +02:00
Michal Čihař
b1915bade0 The storeResult needs mysqli lin parameter to operate 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 16:29:56 +02:00
Michal Čihař
cb6b37f19d Remove extra spaces 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:57:45 +02:00
Michal Čihař
38febf6daf Pass correct parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 15:47:44 +02:00
Michal Čihař
53eca3b2cb Share code for backtrace formatting 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:44:41 +02:00
Michal Čihař
b3700d3450 Remove unused code 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:18:06 +02:00
Michal Čihař
a2d5c59a72 Correct type annontation for DBI 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 14:08:58 +02:00
Michal Čihař
09e15add26 Move getting link to the wrapper class so that the drivers always get right link parameter 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 12:36:59 +02:00
Michal Čihař
5f4c3b841e Share code in DBI->fetchResult 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 12:16:00 +02:00
Michal Čihař
67965902ad Let getLink detect when userlink is null 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:30:03 +02:00
Michal Čihař
3690415c70 Share code for getting mysql link object 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:09:39 +02:00
Michal Čihař
c249246e10 Share code for caching affected rows 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 11:03:12 +02:00
Michal Čihař
2f312320f7 Move require to the correct place 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:42:59 +02:00
Michal Čihař
e2f9431501 Pass correct parameter to postConnect 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:23:45 +02:00
Michal Čihař
1273c3349c Return null for not set socket 
This is correct value for unset socket.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:19:03 +02:00
Michal Čihař
d9f44a64bf Oops, another typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:16:01 +02:00
Michal Čihař
79bc9ea150 Fix typo 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:15:09 +02:00
Michal Čihař
b82e706dcb Share post connect code between DBIs 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:12:55 +02:00
Michal Čihař
9e8505ff5e Factor out socket/port parsing for connecting database 
Almost same code was used in three DBIs, so let's share it.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 10:01:35 +02:00
Michal Čihař
4443209707 Do not call DBI->postConnect for control link 
It used to just return, so there is no sense in calling it at all.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:41:56 +02:00
Michal Čihař
69a9cb1e58 Share logic for calling postConnect method 
This should be called on success, when we're creating primary
connection.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:41:56 +02:00
Michal Čihař
510825c97e Share implementation of insertId among DBIs 
There is no need to have the method implemented three times.

Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-09 09:21:11 +02:00
Hugues Peccatte
5306fcc9c6 Minor coding style fixes. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-05-08 21:51:24 +02:00
Michal Čihař
eb29ddeba8 Remove never used parameter of cacheSet 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
283ee59316 Remove never used parameter of cacheExists 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
79bcd54610 Remove never used parameter of cacheGet 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
8a731a80cb Do not hardcode mysqli in the interface library 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:37:40 +02:00
Michal Čihař
dc0905a0c4 Check whether we got valid result before trying to use it 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 17:03:40 +02:00
Michal Čihař
c869983f11 Remove unused support for fetchResult getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:28:49 +02:00
Michal Čihař
98c7ac94db Remove unused support for fetchSingleRow getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:27:07 +02:00
Michal Čihař
862541d000 Remove unused support for fetchValue getting MySQL result 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:24:27 +02:00
Michal Čihař
e47566f9fd Fix code docblocks 
Signed-off-by: Michal Čihař <michal@cihar.com>
 2014-05-08 15:22:21 +02:00
Hugues Peccatte
9d059ee7a8 Minor PHPCS corrections. 
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
 2014-02-01 17:30:13 +01:00
Marc Delisle
964ea23fa0 Unused parameter 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-27 09:17:36 -05:00
Marc Delisle
2df3184d3a Fix coding style 
Signed-off-by: Marc Delisle <marc@infomarc.info>
 2014-01-26 09:25:31 -05:00