Commit5bbe8f2

authored and

committed

fix(auth): selecting database before auth caused error

1 parentb3131f2 commit5bbe8f2Copy full SHA for 5bbe8f2

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static function prefix($namespace)`
`125`	`125`	`* DSN-supplied value will be used instead and this parameter is ignored.`
`126`	`126`	`* @param object $client Optional Credis_Cluster or Credis_Client instance instantiated by you`
`127`	`127`	`*/`
`128`		`-publicfunction__construct($server,$database =null,$client =null)`
	`128`	`+publicfunction__construct($server,$database =null,$client =null,$auth =null)`
`129`	`129`	`{`
`130`	`130`	`try {`
`131`	`131`	`if (is_object($client)) {`
`@@ -146,7 +146,7 @@ public function __construct($server, $database = null, $client = null)`
`146`	`146`	`$this->driver =newCredis_Client($host,$port,$timeout,$persistent);`
`147`	`147`	`$this->driver->setMaxConnectRetries($maxRetries);`
`148`	`148`	`if ($password) {`
`149`		`-$this->driver->auth($password);`
	`149`	`+$auth =$password;`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	// If we have found a database in our DSN, use it instead of the `$database`
`@@ -156,6 +156,10 @@ public function __construct($server, $database = null, $client = null)`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`
	`159`	`+if ($auth !==null) {`
	`160`	`+$this->driver->auth($auth);`
	`161`	`+}`
	`162`	`+`
`159`	`163`	`if ($database !==null) {`
`160`	`164`	`$this->driver->select($database);`
`161`	`165`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public static function redis()`
`72`	`72`	`if (is_callable(self::$redisServer)) {`
`73`	`73`	`self::$redis =call_user_func(self::$redisServer,self::$redisDatabase);`
`74`	`74`	`}else {`
`75`		`-self::$redis =newRedis(self::$redisServer,self::$redisDatabase);`
	`75`	`+self::$redis =newRedis(self::$redisServer,self::$redisDatabase,null,self::$auth);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`if (!empty(self::$auth)) {`

Comments

(0)