diff --git a/framework/db/mysql/JsonExpressionBuilder.php b/framework/db/mysql/JsonExpressionBuilder.php index 8277753c96..18fa82474b 100644 --- a/framework/db/mysql/JsonExpressionBuilder.php +++ b/framework/db/mysql/JsonExpressionBuilder.php @@ -34,9 +34,6 @@ class JsonExpressionBuilder implements ExpressionBuilderInterface public function build(ExpressionInterface $expression, array &$params = []) { $value = $expression->getValue(); - if ($value === null) { - return 'NULL'; - } if ($value instanceof Query) { list ($sql, $params) = $this->queryBuilder->build($value, $params); diff --git a/tests/framework/db/mysql/QueryBuilderTest.php b/tests/framework/db/mysql/QueryBuilderTest.php index 9a9e2da50c..ad0edd21e1 100644 --- a/tests/framework/db/mysql/QueryBuilderTest.php +++ b/tests/framework/db/mysql/QueryBuilderTest.php @@ -205,7 +205,7 @@ class QueryBuilderTest extends \yiiunit\framework\db\QueryBuilderTest ], 'null value' => [ ['=', 'jsoncol', new JsonExpression(null)], - '[[jsoncol]] = NULL', [] + '[[jsoncol]] = CAST(:qp0 AS JSON)', [':qp0' => 'null'] ], 'null as array value' => [ ['=', 'jsoncol', new JsonExpression([null])],