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

Fix #17473: Fixed SimpleConditionBuilder::build() when column is not a string

Browse Source
This commit is contained in:
Alexander Kartavenko
2019-08-01 13:20:37 +03:00
committed by Alexander Makarov
parent e615f0f43e
commit 69cf9de56b
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -4,6 +4,7 @@ Yii Framework 2 Change Log
2.0.25 under development 2.0.25 under development
------------------------ ------------------------
- Bug #17473: Fixed `SimpleConditionBuilder::build()` when column is not a string (alexkart)
- Bug #17486: Fixed error when using `batch()` without `$db` parameter with MSSQL (alexkart) - Bug #17486: Fixed error when using `batch()` without `$db` parameter with MSSQL (alexkart)

3
framework/db/conditions/SimpleConditionBuilder.php
View File

@ -10,7 +10,6 @@ namespace yii\db\conditions;
use yii\db\ExpressionBuilderInterface; use yii\db\ExpressionBuilderInterface;
use yii\db\ExpressionBuilderTrait; use yii\db\ExpressionBuilderTrait;
use yii\db\ExpressionInterface; use yii\db\ExpressionInterface;
use yii\db\Query;
/** /**
* Class NotConditionBuilder builds objects of [[SimpleCondition]] * Class NotConditionBuilder builds objects of [[SimpleCondition]]
@ -37,7 +36,7 @@ class SimpleConditionBuilder implements ExpressionBuilderInterface
$column = $expression->getColumn(); $column = $expression->getColumn();
$value = $expression->getValue(); $value = $expression->getValue();
if (strpos($column, '(') === false) { if (is_string($column) && strpos($column, '(') === false) {
$column = $this->queryBuilder->db->quoteColumnName($column); $column = $this->queryBuilder->db->quoteColumnName($column);
} }

1
tests/framework/db/QueryBuilderTest.php
View File

@ -1201,6 +1201,7 @@ abstract class QueryBuilderTest extends DatabaseTestCase
[['>=', 'date', new Expression('DATE_SUB(NOW(), INTERVAL 1 MONTH)')], '[[date]] >= DATE_SUB(NOW(), INTERVAL 1 MONTH)', []], [['>=', 'date', new Expression('DATE_SUB(NOW(), INTERVAL 1 MONTH)')], '[[date]] >= DATE_SUB(NOW(), INTERVAL 1 MONTH)', []],
[['>=', 'date', new Expression('DATE_SUB(NOW(), INTERVAL :month MONTH)', [':month' => 2])], '[[date]] >= DATE_SUB(NOW(), INTERVAL :month MONTH)', [':month' => 2]], [['>=', 'date', new Expression('DATE_SUB(NOW(), INTERVAL :month MONTH)', [':month' => 2])], '[[date]] >= DATE_SUB(NOW(), INTERVAL :month MONTH)', [':month' => 2]],
[['=', 'date', (new Query())->select('max(date)')->from('test')->where(['id' => 5])], '[[date]] = (SELECT max(date) FROM [[test]] WHERE [[id]]=:qp0)', [':qp0' => 5]], [['=', 'date', (new Query())->select('max(date)')->from('test')->where(['id' => 5])], '[[date]] = (SELECT max(date) FROM [[test]] WHERE [[id]]=:qp0)', [':qp0' => 5]],
[['=', new Expression('date'), '2019-08-01'], 'date = :qp0', [':qp0' => '2019-08-01']], // operand1 is Expression
// hash condition // hash condition
[['a' => 1, 'b' => 2], '([[a]]=:qp0) AND ([[b]]=:qp1)', [':qp0' => 1, ':qp1' => 2]], [['a' => 1, 'b' => 2], '([[a]]=:qp0) AND ([[b]]=:qp1)', [':qp0' => 1, ':qp1' => 2]],