add db unit

src/db/src/Connection/Connection.php

@@ -331,6 +331,8 @@ public function setTablePrefix($prefix): self
      * @return Expression
      * @throws ContainerException
      * @throws ReflectionException
+     *
+     * @deprecated This method unsafe, This connection unreleased
      */
     public function raw($value): Expression
     {
@@ -446,6 +448,7 @@ public function cursor(string $query, array $bindings = [], bool $useReadPdo = t
             return $statement;
         });
 
+        /** @var PDOStatement $statement */
         while ($record = $statement->fetch()) {
             yield $record;
         }

src/db/src/Connection/ConnectionManager.php

@@ -215,6 +215,7 @@ public function release(bool $final = false): void
         $tsKey  = sprintf('%d.transaction.%d', Co::tid(), Co::id());
 
         $ordConnections = $this->get($ordKey, []);
+
         foreach ($ordConnections as $poolName => $ordPoolConnection) {
             foreach ($ordPoolConnection as $ordConId => $ordConnection) {
                 if (!$ordConnection instanceof Connection) {

src/db/src/Eloquent/Builder.php

@@ -291,21 +291,23 @@ public function whereProp($column, $operator = null, $value = null, string $bool
         // Get `@Column` Prop Mapping
         $props = EntityRegister::getProps($this->model->getClassName());
 
-        if (is_string($column)) {
-            $column = $props[$column] ?? $column;
-        } elseif (is_array($column)) {
-            $newColumns = [];
-            foreach ($column as $k => $v) {
-                $k = $props[$k] ?? $k;
-
-                if (isset($v[0]) && is_scalar($v[0])) {
-                    $kv   = $v[0];
-                    $v[0] = $props[$kv] ?? $kv;
+        if ($props) {
+            if (is_string($column)) {
+                $column = $props[$column] ?? $column;
+            } elseif (is_array($column)) {
+                $newColumns = [];
+                foreach ($column as $k => $v) {
+                    $k = $props[$k] ?? $k;
+
+                    if (isset($v[0]) && is_scalar($v[0])) {
+                        $kv   = $v[0];
+                        $v[0] = $props[$kv] ?? $kv;
+                    }
+
+                    $newColumns[$k] = $v;
                 }
-
-                $newColumns[$k] = $v;
+                $column = $newColumns;
             }
-            $column = $newColumns;
         }
 
         $this->where($column, $operator, $value, $boolean);

src/db/src/Query/Builder.php

@@ -3121,7 +3121,9 @@ public function updateAllCounters(array $where, array $counters, array $extra =
     {
         // Convert counters to expression
         foreach ($counters as $column => $value) {
-            $counters[$column] = Expression::new("$column + $value");
+            $wrapped = $this->grammar->wrap($column);
+
+            $counters[$column] = $this->raw("$wrapped + $value");
         }
 
         if (!empty($where)) {
@@ -3269,12 +3271,11 @@ protected function forSubQuery(): self
      *
      * @return Expression
      * @throws ContainerException
-     * @throws DbException
      * @throws ReflectionException
      */
-    public function raw($value)
+    public function raw($value): Expression
     {
-        return $this->getConnection()->raw($value);
+        return Expression::new($value);
     }
 
     /**

src/db/src/Query/Processor/Processor.php

@@ -47,7 +47,7 @@ public function processSelect(Builder $query, $results): array
     public function processInsertGetId(Builder $query, $sql, $values, string $sequence = null): string
     {
         $id = $query->getConnection()->insertGetId($sql, $values, $sequence);
-        return (string)$id;
+        return $id;
     }
 
     /**

src/db/test/testing/Entity/User.php

@@ -89,6 +89,30 @@ public function setHahh(?int $hahh): void
      */
     private $testJson;
 
+    /**
+     *
+     *
+     * @Column()
+     * @var float|null
+     */
+    private $amount;
+
+    /**
+     * @return float|null
+     */
+    public function getAmount(): ?float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @param float|null $amount
+     */
+    public function setAmount(?float $amount): void
+    {
+        $this->amount = $amount;
+    }
+
     /**
      * @return null|array
      */

src/db/test/unit/Eloquent/ModelTest.php

@@ -7,6 +7,7 @@
 use ReflectionException;
 use Swoft\Bean\Exception\ContainerException;
 use Swoft\Db\DB;
+use Swoft\Db\Eloquent\Builder;
 use Swoft\Db\Eloquent\Collection;
 use Swoft\Db\Exception\DbException;
 use Swoft\Db\Query\Expression;
@@ -838,10 +839,30 @@ public function testWhereProp()
 
         $where      = [
             'pwd' => md5(uniqid()),
-            ['udesc', 'like', 'swoft%']
+            ['udesc', 'like', 'swoft%'],
+            [
+                function (\Swoft\Db\Query\Builder $builder) {
+                    echo $builder->toSql();
+                }
+            ],
+            ['whereIn', 'id', [1]]
         ];
-        $expectSql2 = 'select * from `user` where (`password` = ? and `user_desc` like ?)';
+        $expectSql2 = 'select * from `user` where (`password` = ? and `user_desc` like ? and `id` in (?))';
         $resSql2    = User::whereProp($where)->toSql();
         $this->assertEquals($expectSql2, $resSql2);
     }
+
+    public function testWhereCall()
+    {
+        $toSql = 'select * from `user` where (`id` in (?) or `id` = ? or `status` > ? and `age` between ? and ?)';
+        $where = [
+            ['whereIn', 'id', [1]],
+            ['orWhere', 'id', 2],
+            ['orWhere', 'status', '>', -1],
+            ['whereBetween', 'age', [18, 25]]
+        ];
+        $sql   = User::where($where)->toSql();
+
+        $this->assertEquals($sql, $toSql);
+    }
 }