Skip to content

Y
yii2
Commit e486b663 by Qiang Xue
Options

Fixed test break.

parent c8a50126
Showing with 5 additions and 1 deletion
framework/db/Connection.php
...@@ -465,7 +465,11 @@ class Connection extends Component ...@@ -465,7 +465,11 @@ class Connection extends Component
{ {
$info = end($this->_queryCacheInfo); $info = end($this->_queryCacheInfo);
if ($this->enableQueryCache) { if ($this->enableQueryCache) {
$cache = $this->queryCache instanceof Cache ? $this->queryCache : Yii::$app->get($this->queryCache, false); if (is_string($this->queryCache) && Yii::$app) {
$cache = Yii::$app->get($this->queryCache, false);
} else {
$cache = $this->queryCache;
}
if ($cache instanceof Cache) { if ($cache instanceof Cache) {
return is_array($info) ? [$cache, $info[0], $info[1]] : [$cache, null, null]; return is_array($info) ? [$cache, $info[0], $info[1]] : [$cache, null, null];
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment