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

Fix #18010: Allow upper or lower case operators in InCondition and LikeCondition

Browse Source
This commit is contained in:
Alex
2020-05-02 11:28:06 +01:00
committed by GitHub
parent 3bc919bcbd
commit 37fc929285
4 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -19,6 +19,7 @@ Yii Framework 2 Change Log
- Enh #17993: Added `yii\i18n\Formatter::$currencyDecimalSeparator` to allow setting custom symbols for currency decimal in IntlNumberFormatter (XPOHOC269)
- Bug #18000: PK value of Oracle ActiveRecord is missing after save (mankwok)
- Enh #18006: Allow SameSite cookie pre PHP 7.3 (scottix)
- Bug #18010: Allow upper or lower case operators in `InCondition` and `LikeCondition` (alex-code)
2.0.34 March 26, 2020

2
framework/db/conditions/InConditionBuilder.php
View File

@ -33,7 +33,7 @@ class InConditionBuilder implements ExpressionBuilderInterface
*/
public function build(ExpressionInterface $expression, array &$params = [])
{
$operator = $expression->getOperator();
$operator = strtoupper($expression->getOperator());
$column = $expression->getColumn();
$values = $expression->getValues();

2
framework/db/conditions/LikeConditionBuilder.php
View File

@ -48,7 +48,7 @@ class LikeConditionBuilder implements ExpressionBuilderInterface
*/
public function build(ExpressionInterface $expression, array &$params = [])
{
$operator = $expression->getOperator();
$operator = strtoupper($expression->getOperator());
$column = $expression->getColumn();
$values = $expression->getValue();
$escape = $expression->getEscapingReplacements();

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

@ -9,6 +9,8 @@ namespace yiiunit\framework\db;
use yii\db\ColumnSchemaBuilder;
use yii\db\conditions\BetweenColumnsCondition;
use yii\db\conditions\LikeCondition;
use yii\db\conditions\InCondition;
use yii\db\cubrid\QueryBuilder as CubridQueryBuilder;
use yii\db\Expression;
use yii\db\mssql\QueryBuilder as MssqlQueryBuilder;
@ -1198,6 +1200,15 @@ abstract class QueryBuilderTest extends DatabaseTestCase
'([[id]], [[name]]) IN ((:qp0, :qp1), (:qp2, :qp3))',
[':qp0' => 1, ':qp1' => 'oy', ':qp2' => 2, ':qp3' => 'yo'],
],
// in object conditions
[new InCondition('id', 'in', 1), '[[id]]=:qp0', [':qp0' => 1]],
[new InCondition('id', 'in', [1]), '[[id]]=:qp0', [':qp0' => 1]],
[new InCondition('id', 'not in', 1), '[[id]]<>:qp0', [':qp0' => 1]],
[new InCondition('id', 'not in', [1]), '[[id]]<>:qp0', [':qp0' => 1]],
[new InCondition('id', 'in', [1, 2]), '[[id]] IN (:qp0, :qp1)', [':qp0' => 1, ':qp1' => 2]],
[new InCondition('id', 'not in', [1, 2]), '[[id]] NOT IN (:qp0, :qp1)', [':qp0' => 1, ':qp1' => 2]],
// exists
[['exists', (new Query())->select('id')->from('users')->where(['active' => 1])], 'EXISTS (SELECT [[id]] FROM [[users]] WHERE [[active]]=:qp0)', [':qp0' => 1]],
[['not exists', (new Query())->select('id')->from('users')->where(['active' => 1])], 'NOT EXISTS (SELECT [[id]] FROM [[users]] WHERE [[active]]=:qp0)', [':qp0' => 1]],
@ -2469,6 +2480,16 @@ abstract class QueryBuilderTest extends DatabaseTestCase
'[[location]].[[title_ru]] LIKE :qp0',
[':qp0' => 'vi%'],
],
// like object conditions
[new LikeCondition('name', 'like', new Expression('CONCAT("test", name, "%")')), '[[name]] LIKE CONCAT("test", name, "%")', []],
[new LikeCondition('name', 'not like', new Expression('CONCAT("test", name, "%")')), '[[name]] NOT LIKE CONCAT("test", name, "%")', []],
[new LikeCondition('name', 'or like', new Expression('CONCAT("test", name, "%")')), '[[name]] LIKE CONCAT("test", name, "%")', []],
[new LikeCondition('name', 'or not like', new Expression('CONCAT("test", name, "%")')), '[[name]] NOT LIKE CONCAT("test", name, "%")', []],
[new LikeCondition('name', 'like', [new Expression('CONCAT("test", name, "%")'), '\ab_c']), '[[name]] LIKE CONCAT("test", name, "%") AND [[name]] LIKE :qp0', [':qp0' => '%\\\ab\_c%']],
[new LikeCondition('name', 'not like', [new Expression('CONCAT("test", name, "%")'), '\ab_c']), '[[name]] NOT LIKE CONCAT("test", name, "%") AND [[name]] NOT LIKE :qp0', [':qp0' => '%\\\ab\_c%']],
[new LikeCondition('name', 'or like', [new Expression('CONCAT("test", name, "%")'), '\ab_c']), '[[name]] LIKE CONCAT("test", name, "%") OR [[name]] LIKE :qp0', [':qp0' => '%\\\ab\_c%']],
[new LikeCondition('name', 'or not like', [new Expression('CONCAT("test", name, "%")'), '\ab_c']), '[[name]] NOT LIKE CONCAT("test", name, "%") OR [[name]] NOT LIKE :qp0', [':qp0' => '%\\\ab\_c%']],
];
// adjust dbms specific escaping