php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 13:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

Browse Source
This commit is contained in:
Alexander Makarov
2013-02-08 01:37:49 +04:00
parent 80e29130dc 54c539dd51
commit 066734ccf4
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
framework/db/QueryBuilder.php
View File

@@ -592,21 +592,19 @@ class QueryBuilder extends \yii\base\Object
return $operator === 'IN' ? '0=1' : ''; return $operator === 'IN' ? '0=1' : '';
} }
if (is_array($column)) { if (count($column) > 1) {
if (count($column) > 1) { return $this->buildCompositeInCondition($operator, $column, $values);
return $this->buildCompositeInCondition($operator, $column, $values); } elseif (is_array($column)) {
$column = reset($column);
}
foreach ($values as $i => $value) {
if (is_array($value)) {
$value = isset($value[$column]) ? $value[$column] : null;
}
if ($value === null) {
$values[$i] = 'NULL';
} else { } else {
$column = reset($column); $values[$i] = is_string($value) ? $this->db->quoteValue($value) : (string)$value;
foreach ($values as $i => $value) {
if (is_array($value)) {
$value = isset($value[$column]) ? $value[$column] : null;
}
if ($value === null) {
$values[$i] = 'NULL';
} else {
$values[$i] = is_string($value) ? $this->db->quoteValue($value) : (string)$value;
}
}
} }
} }
if (strpos($column, '(') === false) { if (strpos($column, '(') === false) {