idanoo/php-resque
1
0
Fork 0
mirror of https://github.com/idanoo/php-resque.git synced 2024-11-22 08:15:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test for 'false' database value when not found in DSN

Browse Source
This commit is contained in:
Iskandar Najmuddin 2014-05-05 14:55:01 +00:00
parent 1abbad3f5e
commit d1d2b3b354
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Resque/Redis.php
View File

@ -109,7 +109,8 @@ class Resque_Redis
/** /**
* @param string|array $server A DSN or array * @param string|array $server A DSN or array
* @param int $database A database number to select * @param int $database A database number to select. However, if we find a valid database number in the DSN the
* DSN-supplied value will be used instead and this parameter is ignored.
*/ */
public function __construct($server, $database = null) public function __construct($server, $database = null)
{ {
@ -134,7 +135,7 @@ class Resque_Redis
} }
// If we have found a database in our DSN, use it instead of the `$database` // If we have found a database in our DSN, use it instead of the `$database`
// value passed into the constructor // value passed into the constructor.
if ($dsnDatabase !== false) { if ($dsnDatabase !== false) {
$database = $dsnDatabase; $database = $dsnDatabase;
$this->database = $database; $this->database = $database;

29
test/Resque/Tests/DsnTest.php
View File

@ -21,21 +21,21 @@ class Resque_Tests_DsnTest extends Resque_Tests_TestCase
array('', array( array('', array(
'localhost', 'localhost',
Resque_Redis::DEFAULT_PORT, Resque_Redis::DEFAULT_PORT,
Resque_Redis::DEFAULT_DATABASE, false,
false, false, false, false,
array(), array(),
)), )),
array('localhost', array( array('localhost', array(
'localhost', 'localhost',
Resque_Redis::DEFAULT_PORT, Resque_Redis::DEFAULT_PORT,
Resque_Redis::DEFAULT_DATABASE, false,
false, false, false, false,
array(), array(),
)), )),
array('localhost:1234', array( array('localhost:1234', array(
'localhost', 'localhost',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
false, false, false, false,
array(), array(),
)), )),
@ -49,14 +49,14 @@ class Resque_Tests_DsnTest extends Resque_Tests_TestCase
array('redis://foobar', array( array('redis://foobar', array(
'foobar', 'foobar',
Resque_Redis::DEFAULT_PORT, Resque_Redis::DEFAULT_PORT,
Resque_Redis::DEFAULT_DATABASE, false,
false, false, false, false,
array(), array(),
)), )),
array('redis://foobar:1234', array( array('redis://foobar:1234', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
false, false, false, false,
array(), array(),
)), )),
@ -67,10 +67,17 @@ class Resque_Tests_DsnTest extends Resque_Tests_TestCase
false, false, false, false,
array(), array(),
)), )),
array('redis://foobar:1234/0', array(
'foobar',
1234,
0,
false, false,
array(),
)),
array('redis://user@foobar:1234', array( array('redis://user@foobar:1234', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
'user', false, 'user', false,
array(), array(),
)), )),
@ -84,35 +91,35 @@ class Resque_Tests_DsnTest extends Resque_Tests_TestCase
array('redis://user:pass@foobar:1234', array( array('redis://user:pass@foobar:1234', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
'user', 'pass', 'user', 'pass',
array(), array(),
)), )),
array('redis://user:pass@foobar:1234?x=y&a=b', array( array('redis://user:pass@foobar:1234?x=y&a=b', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
'user', 'pass', 'user', 'pass',
array('x' => 'y', 'a' => 'b'), array('x' => 'y', 'a' => 'b'),
)), )),
array('redis://:pass@foobar:1234?x=y&a=b', array( array('redis://:pass@foobar:1234?x=y&a=b', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
false, 'pass', false, 'pass',
array('x' => 'y', 'a' => 'b'), array('x' => 'y', 'a' => 'b'),
)), )),
array('redis://user@foobar:1234?x=y&a=b', array( array('redis://user@foobar:1234?x=y&a=b', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
'user', false, 'user', false,
array('x' => 'y', 'a' => 'b'), array('x' => 'y', 'a' => 'b'),
)), )),
array('redis://foobar:1234?x=y&a=b', array( array('redis://foobar:1234?x=y&a=b', array(
'foobar', 'foobar',
1234, 1234,
Resque_Redis::DEFAULT_DATABASE, false,
false, false, false, false,
array('x' => 'y', 'a' => 'b'), array('x' => 'y', 'a' => 'b'),
)), )),