Query->where() 条件的值支持传原始 SQL

doc/base/version/2.0-2.1.md

@@ -16,6 +16,8 @@ v2.1.0 版本相比 v2.0.0 版本不会出现非常大的不兼容更改，可
 
 * [枚举类增加 validate() 和 assert()](/components/struct/enum.html)
 
+* [Query->where() 条件的值支持传原始 SQL](/components/db/index.html)
+
 ### v2.1.1
 
 * [定时任务的最小、最大延迟执行秒数](/components/task/cron.html)

doc/components/db/index.md

@@ -563,6 +563,9 @@ Db::query()->where('id', '=', 1);
 // id > 1
 Db::query()->where('id', '>', 1);
 
+// 使用 Raw 原样代入值，例：value = 1 + 2
+Db::query()->where('value', '=', new \Imi\Db\Query\Raw('1 + 2'));
+
 // title like '%test%'
 Db::query()->where('title', 'like', '%test%');
 

src/Db/Query/Where/Where.php

@@ -7,6 +7,7 @@ namespace Imi\Db\Query\Where;
 use Imi\Db\Mysql\Consts\LogicalOperator;
 use Imi\Db\Query\Interfaces\IQuery;
 use Imi\Db\Query\Interfaces\IWhere;
+use Imi\Db\Query\Raw;
 use Imi\Db\Query\Traits\TRaw;
 
 class Where extends BaseWhere implements IWhere
@@ -138,6 +139,10 @@ class Where extends BaseWhere implements IWhere
         {
             case 'between':
             case 'not between':
+                if (!\is_array($thisValues) || !isset($thisValues[0],$thisValues[1]))
+                {
+                    throw new \RuntimeException(sprintf('where %s value must be [beginValue, endValue]', $operation));
+                }
                 $begin = $query->getAutoParamName();
                 $end = $query->getAutoParamName();
                 $result .= "{$begin} and {$end}";
@@ -148,18 +153,36 @@ class Where extends BaseWhere implements IWhere
             case 'not in':
                 $result .= '(';
                 $valueNames = [];
-                foreach ($thisValues as $value)
+                if (\is_array($thisValues))
+                {
+                    foreach ($thisValues as $value)
+                    {
+                        $paramName = $query->getAutoParamName();
+                        $valueNames[] = $paramName;
+                        $binds[$paramName] = $value;
+                    }
+                    $result .= implode(',', $valueNames) . ')';
+                }
+                elseif ($thisValues instanceof Raw)
+                {
+                    $result .= $thisValues->toString($query) . ')';
+                }
+                else
                 {
-                    $paramName = $query->getAutoParamName();
-                    $valueNames[] = $paramName;
-                    $binds[$paramName] = $value;
+                    throw new \RuntimeException(sprintf('Invalid value type %s of where %s', \gettype($thisValues), $operation));
                 }
-                $result .= implode(',', $valueNames) . ')';
                 break;
             default:
-                $value = $query->getAutoParamName();
-                $result .= $value;
-                $binds[$value] = $thisValues;
+                if ($thisValues instanceof Raw)
+                {
+                    $result .= $thisValues->toString($query);
+                }
+                else
+                {
+                    $value = $query->getAutoParamName();
+                    $result .= $value;
+                    $binds[$value] = $thisValues;
+                }
                 break;
         }
 

tests/unit/Component/Tests/Db/QueryCurdBaseTest.php

@@ -6,6 +6,7 @@ namespace Imi\Test\Component\Tests\Db;
 
 use Imi\Db\Db;
 use Imi\Db\Mysql\Query\Lock\MysqlLock;
+use Imi\Db\Query\Raw;
 use Imi\Test\BaseTest;
 use PHPUnit\Framework\Assert;
 
@@ -421,4 +422,17 @@ abstract class QueryCurdBaseTest extends BaseTest
             'json_data' => '{"a": "1", "uid": "' . $uid . '", "name": "bbb", "list1": [{"id": "2"}], "list2": [1, 2, 3]}',
         ], $result->get());
     }
+
+    /**
+     * @depends testInsert
+     */
+    public function testRaw(array $args): void
+    {
+        ['ids' => $ids] = $args;
+        $id = $ids[0];
+        $query = Db::query($this->poolName);
+
+        $record = $query->from($this->tableArticle)->where('id', '=', new Raw((string) $id))->select()->get();
+        Assert::assertEquals($id, $record['id']);
+    }
 }