Merge pull request kvnZero#22 from kvnZero/feat/增强update

update 拆离定义

Author: kvnZero

app/ApiJson/Handle/AbstractHandle.php

@@ -68,7 +68,7 @@ protected function subTableQuery(array $data): QueryInterface
         $conditionEntity = $tableEntity->getConditionEntity();
         $conditionEntity->setLimit(0);
         $handle = new Handle($conditionEntity, $tableEntity);
-        $handle->build();
+        $handle->buildQuery();
         /** @var QueryInterface $query */
         return new (ApplicationContext::getContainer()->get(ConfigInterface::class)->get(QueryInterface::class))($tableEntity->getRealTableName(), $tableEntity->getConditionEntity());
     }

app/ApiJson/Method/GetMethod.php

@@ -24,7 +24,7 @@ protected function process()
         }
 
         $handle = new Handle($this->tableEntity->getConditionEntity(), $this->tableEntity);
-        $handle->build();
+        $handle->buildQuery();
 
         //该事件鼓励是做语句缓存或者事件触发 不赞成修改语句做法 修改语句应在更上层的QueryHandle事件
         $event = new QueryExecuteBefore($this->query->toSql(), $this->method);

app/ApiJson/Method/HeadMethod.php

@@ -18,7 +18,7 @@ protected function validateCondition(): bool
     protected function process()
     {
         $handle = new Handle($this->tableEntity->getConditionEntity(), $this->tableEntity);
-        $handle->build();
+        $handle->buildQuery();
 
         $event = new QueryExecuteBefore($this->query->toSql(), $this->method);
         ApplicationContext::getContainer()->get(EventDispatcherInterface::class)->dispatch($event);

app/ApiJson/Model/MysqlQuery.php

@@ -9,6 +9,16 @@
 
 class MysqlQuery implements QueryInterface
 {
+    /** @var int 查询行为 */
+    const ACTION_QUERY = 1;
+
+    /** @var int 修改行为 */
+    const ACTION_UPDATE = 2;
+
+    /** @var int 插入行为 */
+    const ACTION_INSERT = 4;
+
+
     /** @var string $primaryKey */
     protected string $primaryKey = 'id';
 
@@ -71,7 +81,7 @@ public function insert(array $values, $sequence = null): int
     public function update(array $values): bool
     {
         $this->build = true;
-        $this->buildQuery(false);
+        $this->buildQuery(self::ACTION_UPDATE);
         if (empty($this->db->getBindings()['where'])) return false; // 不允许空条件修改
         return $this->db->update($values);
     }
@@ -131,15 +141,15 @@ public function callProcedure(array $dataItem, bool $query = true): array
         ];
     }
 
-    protected function buildQuery(bool $query = true)
+    protected function buildQuery(int $actionType = self::ACTION_QUERY)
     {
         if ($this->build) return;
         $this->build = true;
         $queryWhere = $this->conditionEntity->getQueryWhere();
         foreach ($queryWhere as $itemWhere) {
             $this->db->whereRaw($itemWhere['sql'], $itemWhere['bind']);
         }
-        if (!$query) return; //下面不再非查询操作
+        if ($actionType != self::ACTION_QUERY) return; //下面不再非查询操作
 
         $this->db->select(Db::raw($this->conditionEntity->getColumn()));
         $limit = $this->conditionEntity->getLimit();

app/ApiJson/Parse/Handle.php

@@ -39,55 +39,74 @@
 
 class Handle
 {
+
     /**
      * 替换规则
      * @var AbstractReplace[]
      */
     protected array $replaceRules = [
-        KeywordCountReplace::class,
-        KeywordPageReplace::class,
-        QuoteReplace::class,
+        'query' => [
+            KeywordCountReplace::class,
+            KeywordPageReplace::class,
+            QuoteReplace::class,
+        ],
+        'update' => []
     ];
 
 
     /**
      * 匹配规则 根据从上自下优先先匹先出
      * @var AbstractHandle[]
      */
-    protected array $methodRules = [
-        FunctionProcedureHandle::class,
-        FunctionColumnHandle::class,
-        FunctionHavingHandle::class,
-        FunctionOffsetHandle::class,
-        FunctionLimitHandle::class,
-        FunctionGroupHandle::class,
-        FunctionOrderHandle::class,
-        WhereJsonContainsHandle::class,
-        WhereBetweenHandle::class,
-        WhereExistsHandle::class,
-        WhereRegexpHandle::class,
-        WhereNotInHandle::class,
-        WhereLikeHandle::class,
-        WhereRawHandle::class,
-        WhereInHandle::class,
-        WhereSubQueryHandle::class,
-        WhereOpHandle::class,
-        WhereHandle::class,
-        FunctionCombineHandle::class
+    protected array $queryMethodRules = [
+        'query' => [
+            FunctionProcedureHandle::class,
+            FunctionColumnHandle::class,
+            FunctionHavingHandle::class,
+            FunctionOffsetHandle::class,
+            FunctionLimitHandle::class,
+            FunctionGroupHandle::class,
+            FunctionOrderHandle::class,
+            WhereJsonContainsHandle::class,
+            WhereBetweenHandle::class,
+            WhereExistsHandle::class,
+            WhereRegexpHandle::class,
+            WhereNotInHandle::class,
+            WhereLikeHandle::class,
+            WhereRawHandle::class,
+            WhereInHandle::class,
+            WhereSubQueryHandle::class,
+            WhereOpHandle::class,
+            WhereHandle::class,
+            FunctionCombineHandle::class
+        ],
+        'update' => [
+
+        ]
     ];
 
     public function __construct(protected ConditionEntity $conditionEntity, protected TableEntity $tableEntity)
     {
     }
 
-    public function build()
+    public function buildQuery()
+    {
+        $this->build('query');
+    }
+
+    public function buildUpdate()
+    {
+        $this->build('update');
+    }
+
+    protected function build(string $action)
     {
-        foreach ($this->replaceRules as $replaceRuleClass) {
+        foreach ($this->replaceRules[$action] ?? [] as $replaceRuleClass) {
             /** @var AbstractReplace $replaceRule */
             $replaceRule = new $replaceRuleClass($this->conditionEntity);
             $replaceRule->handle();
         }
-        foreach ($this->methodRules as $methodRuleClass) {
+        foreach ($this->queryMethodRules[$action] ?? [] as $methodRuleClass) {
             /** @var AbstractHandle $methodRule */
             $methodRule = new $methodRuleClass($this->conditionEntity);
             $methodRule->handle();