You can set an expression to model parameters, but it is not standard…

…ized. (#6556)


Co-authored-by: 李铭昕 <715557344@qq.com>

src/Model/Concerns/HasAttributes.php

@@ -26,6 +26,7 @@
 use Hyperf\Database\Model\EnumCollector;
 use Hyperf\Database\Model\JsonEncodingException;
 use Hyperf\Database\Model\Relations\Relation;
+use Hyperf\Database\Query\Expression;
 use Hyperf\Stringable\Str;
 use Hyperf\Stringable\StrCache;
 use LogicException;
@@ -629,6 +630,14 @@ public function originalIsEquivalent(string $key, mixed $current): bool
             return false;
         }
 
+        // The model parameters should not be set with an expression,
+        // Because after saving the expression, the parameters of the model will not receive the latest results,
+        // When the model be used again, It will cause some problems.
+        // So you must do something by yourself, the framework shouldn't be modified in any way.
+        if ($current instanceof Expression) {
+            return false;
+        }
+
         if ($this->isDateAttribute($key)) {
             return $this->fromDateTime($current) ===
                 $this->fromDateTime($original);

tests/ModelRealBuilderTest.php

@@ -635,6 +635,51 @@ public function testSaveBitValue()
         $this->assertTrue($model->save());
     }
 
+    public function testSaveExpression()
+    {
+        $container = $this->getContainer();
+        $container->shouldReceive('get')->with(Db::class)->andReturn(new Db($container));
+
+        /** @var UserExt $ext */
+        $ext = UserExt::query()->find(1);
+        $ext->timestamps = false;
+
+        $this->assertFalse($ext->isDirty());
+        $ext->count = Db::raw('`count` + 1');
+        $this->assertTrue($ext->isDirty('count'));
+        $this->assertTrue($ext->save());
+
+        $this->assertFalse($ext->isDirty());
+        $ext->float_num = Db::raw('`float_num` + 0.1');
+        $this->assertTrue($ext->isDirty('float_num'));
+        $this->assertTrue($ext->save());
+
+        $this->assertFalse($ext->isDirty());
+        $ext->str = Db::raw('concat(`str`, \'t\')');
+        $this->assertTrue($ext->isDirty('str'));
+        $this->assertTrue($ext->save());
+
+        $this->assertFalse($ext->isDirty());
+        $ext->count = Db::raw('`count` + 1');
+        $ext->float_num = Db::raw('`float_num` + 0.1');
+        $ext->str = Db::raw('concat(`str`, \'e\')');
+        $this->assertTrue($ext->isDirty());
+        $this->assertTrue($ext->save());
+
+        $sqls = [
+            'select * from `user_ext` where `user_ext`.`id` = ? limit 1',
+            'update `user_ext` set `count` = `count` + 1 where `id` = ?',
+            'update `user_ext` set `float_num` = `float_num` + 0.1 where `id` = ?',
+            'update `user_ext` set `str` = concat(`str`, \'t\') where `id` = ?',
+            'update `user_ext` set `count` = `count` + 1, `float_num` = `float_num` + 0.1, `str` = concat(`str`, \'e\') where `id` = ?',
+        ];
+        while ($event = $this->channel->pop(0.001)) {
+            if ($event instanceof QueryExecuted) {
+                $this->assertSame($event->sql, array_shift($sqls));
+            }
+        }
+    }
+
     public function testSelectForBindingIntegerWhenUsingVarcharIndex()
     {
         $container = $this->getContainer();