Browse Source

Fixed typo in query builder and reverted changes to DbCache.php

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
commit
15b9f97ca4
  1. 2
      framework/caching/DbCache.php
  2. 2
      framework/db/QueryBuilder.php

2
framework/caching/DbCache.php

@ -124,7 +124,7 @@ class DbCache extends Cache
$query = new Query;
$query->select(array('id', 'data'))
->from($this->cacheTable)
->where(array('in', 'id', (array)$keys))
->where(array('id' => $keys))
->andWhere('([[expire]] = 0 OR [[expire]] > ' . time() . ')');
if ($this->db->enableQueryCache) {

2
framework/db/QueryBuilder.php

@ -744,7 +744,7 @@ class QueryBuilder extends \yii\base\Object
$parts = array();
foreach ($condition as $column => $value) {
if (is_array($value)) { // IN condition
$parts[] = $this->buildInCondition('in', array($column, $value), $query);
$parts[] = $this->buildInCondition('in', array($column, $value), $params);
} else {
if (strpos($column, '(') === false) {
$column = $this->db->quoteColumnName($column);

Loading…
Cancel
Save