Commitc38c3e7

authored and

committed

fix(auth): selecting database before auth caused error

1 parent7e03f6e commitc38c3e7Copy full SHA for c38c3e7

File tree

-3

lines changed

-3

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public static function prefix($namespace)`
`151`	`151`	`* DSN-supplied value will be used instead and this parameter is ignored.`
`152`	`152`	`* @param object $client Optional Credis_Cluster or Credis_Client instance instantiated by you`
`153`	`153`	`*/`
`154`		`-publicfunction__construct($server,$database =null,$client =null)`
	`154`	`+publicfunction__construct($server,$database =null,$client =null,$auth =null)`
`155`	`155`	`{`
`156`	`156`	`try {`
`157`	`157`	`if (is_object($client)) {`
`@@ -172,7 +172,7 @@ public function __construct($server, $database = null, $client = null)`
`172`	`172`	`$this->driver =newCredis_Client($host,$port,$timeout,$persistent);`
`173`	`173`	`$this->driver->setMaxConnectRetries($maxRetries);`
`174`	`174`	`if ($password) {`
`175`		`-$this->driver->auth($password);`
	`175`	`+$auth =$password;`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	// If we have found a database in our DSN, use it instead of the `$database`
`@@ -182,6 +182,10 @@ public function __construct($server, $database = null, $client = null)`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`
	`185`	`+if ($auth !==null) {`
	`186`	`+$this->driver->auth($auth);`
	`187`	`+}`
	`188`	`+`
`185`	`189`	`if ($database !==null) {`
`186`	`190`	`$this->driver->select($database);`
`187`	`191`	`}`

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)