php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-26 14:26:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed query and schema caching renamings.

Browse Source
This commit is contained in:
Qiang Xue
2013-01-05 17:19:08 -05:00
parent 9d75714b46
commit 9cd67bb6b4
4 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
framework/caching/DbCache.php
View File

@ -106,12 +106,11 @@ class DbCache extends Cache
->from($this->cacheTableName)
->where('id = :id AND (expire = 0 OR expire > :time)', array(':id' => $key, ':time' => time()));
$db = $this->getDbConnection();
if ($db->queryCachingDuration >= 0) {
if ($db->enableQueryCache) {
// temporarily disable and re-enable query caching
$duration = $db->queryCachingDuration;
$db->queryCachingDuration = -1;
$db->enableQueryCache = false;
$result = $query->createCommand($db)->queryScalar();
$db->queryCachingDuration = $duration;
$db->enableQueryCache = true;
return $result;
} else {
return $query->createCommand($db)->queryScalar();
@ -135,11 +134,10 @@ class DbCache extends Cache
->andWhere("expire = 0 OR expire > " . time() . ")");
$db = $this->getDbConnection();
if ($db->queryCachingDuration >= 0) {
$duration = $db->queryCachingDuration;
$db->queryCachingDuration = -1;
if ($db->enableQueryCache) {
$db->enableQueryCache = false;
$rows = $query->createCommand($db)->queryAll();
$db->queryCachingDuration = $duration;
$db->enableQueryCache = true;
} else {
$rows = $query->createCommand($db)->queryAll();
}

7
framework/caching/DbDependency.php
View File

@ -69,12 +69,11 @@ class DbDependency extends Dependency
{
$db = $this->getDbConnection();
$command = $this->query->createCommand($db);
if ($db->queryCachingDuration >= 0) {
if ($db->enableQueryCache) {
// temporarily disable and re-enable query caching
$duration = $db->queryCachingDuration;
$db->queryCachingDuration = -1;
$db->enableQueryCache = false;
$result = $command->queryRow();
$db->queryCachingDuration = $duration;
$db->enableQueryCache = true;
} else {
$result = $command->queryRow();
}

2
framework/db/Command.php
View File

@ -405,7 +405,7 @@ class Command extends \yii\base\Component
}
if (isset($cache)) {
$cache->set($cacheKey, $result, $db->queryCachingDuration, $db->queryCachingDependency);
$cache->set($cacheKey, $result, $db->queryCacheDuration, $db->queryCacheDependency);
\Yii::trace('Saved query result in cache', __CLASS__);
}

18
framework/db/Driver.php
View File

@ -95,18 +95,13 @@ abstract class Driver extends \yii\base\Object
$realName = $db->expandTablePrefix($name);
// temporarily disable query caching
if ($db->queryCachingDuration >= 0) {
$qcDuration = $db->queryCachingDuration;
$db->queryCachingDuration = -1;
}
if (!in_array($name, $db->schemaCachingExclude, true) && $db->schemaCachingDuration >= 0 && ($cache = \Yii::$application->getComponent($db->schemaCacheID)) !== null) {
/** @var $cache \yii\caching\Cache */
if ($db->enableSchemaCache && ($cache = \Yii::$application->getComponent($db->schemaCacheID)) !== null && !in_array($name, $db->schemaCacheExclude, true)) {
$key = $this->getCacheKey($name);
if ($refresh || ($table = $cache->get($key)) === false) {
$table = $this->loadTableSchema($realName);
if ($table !== null) {
$cache->set($key, $table, $db->schemaCachingDuration);
$cache->set($key, $table, $db->schemaCacheDuration);
}
}
$this->_tables[$name] = $table;
@ -114,10 +109,6 @@ abstract class Driver extends \yii\base\Object
$this->_tables[$name] = $table = $this->loadTableSchema($realName);
}
if (isset($qcDuration)) { // re-enable query caching
$db->queryCachingDuration = $qcDuration;
}
return $table;
}
@ -185,7 +176,8 @@ abstract class Driver extends \yii\base\Object
public function refresh($tableName = null)
{
$db = $this->connection;
if ($db->schemaCachingDuration >= 0 && ($cache = \Yii::$application->getComponent($db->schemaCacheID)) !== null) {
/** @var $cache \yii\caching\Cache */
if ($db->enableSchemaCache && ($cache = \Yii::$application->getComponent($db->schemaCacheID)) !== null) {
if ($tableName === null) {
foreach ($this->_tables as $name => $table) {
$cache->delete($this->getCacheKey($name));