update 不对column做处理 用raw防止被格式化 导致无法运行自带方法(如：count,min,max等)

kvnZero · kvnZero · commit d0ca14cfcea9 · 2021-11-16T16:10:47.000+08:00
diff --git a/app/ApiJson/Entity/ConditionEntity.php b/app/ApiJson/Entity/ConditionEntity.php
@@ -13,7 +13,7 @@ class ConditionEntity
 
     protected int $limit = 10;
     protected int $offset = 0;
-    protected array $column = ['*'];
+    protected string $column = '*';
     protected array $group = [];
     protected array $order = [];
     protected array $having = [];
@@ -60,9 +60,9 @@ public function addQueryWhere(string $key, string $sql, array $bindArgs = [])
     }
 
     /**
-     * @param array|string[] $column
+     * @param string $column
      */
-    public function setColumn(array $column): void
+    public function setColumn(string $column): void
     {
         $this->column = $column;
     }
@@ -108,9 +108,9 @@ public function setOrder(array $order): void
     }
 
     /**
-     * @return array
+     * @return string
      */
-    public function getColumn(): array
+    public function getColumn(): string
     {
         return $this->column;
     }
diff --git a/app/ApiJson/Handle/FunctionColumnHandle.php b/app/ApiJson/Handle/FunctionColumnHandle.php
@@ -16,7 +16,7 @@ public function buildModel()
         }, ARRAY_FILTER_USE_KEY) as $key => $value)
         {
             $value = str_replace([';',':'], [',', ' AS '], $value);
-            $this->condition->setColumn(explode(',', $value));
+            $this->condition->setColumn($value);
             $this->unsetKey[] = $this->keyWord;
         }
     }
diff --git a/app/ApiJson/Model/MysqlQuery.php b/app/ApiJson/Model/MysqlQuery.php
@@ -102,7 +102,7 @@ protected function buildQuery(bool $query = true)
         }
         if (!$query) return; //下面不再非查询操作
 
-        $this->db->select($this->conditionEntity->getColumn());
+        $this->db->select(Db::raw($this->conditionEntity->getColumn()));
         $limit = $this->conditionEntity->getLimit();
         if ($limit > 0) {
             $this->db->limit($limit);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class ConditionEntity`
`13`	`13`
`14`	`14`	`protected int $limit = 10;`
`15`	`15`	`protected int $offset = 0;`
`16`		`- protected array $column = ['*'];`
	`16`	`+ protected string $column = '*';`
`17`	`17`	`protected array $group = [];`
`18`	`18`	`protected array $order = [];`
`19`	`19`	`protected array $having = [];`
`@@ -60,9 +60,9 @@ public function addQueryWhere(string $key, string $sql, array $bindArgs = [])`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`
`63`		`- * @param array\|string[] $column`
	`63`	`+ * @param string $column`
`64`	`64`	`*/`
`65`		`- public function setColumn(array $column): void`
	`65`	`+ public function setColumn(string $column): void`
`66`	`66`	`{`
`67`	`67`	`$this->column = $column;`
`68`	`68`	`}`
`@@ -108,9 +108,9 @@ public function setOrder(array $order): void`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`
`111`		`- * @return array`
	`111`	`+ * @return string`
`112`	`112`	`*/`
`113`		`- public function getColumn(): array`
	`113`	`+ public function getColumn(): string`
`114`	`114`	`{`
`115`	`115`	`return $this->column;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public function buildModel()`
`16`	`16`	`}, ARRAY_FILTER_USE_KEY) as $key => $value)`
`17`	`17`	`{`
`18`	`18`	`$value = str_replace([';',':'], [',', ' AS '], $value);`
`19`		`- $this->condition->setColumn(explode(',', $value));`
	`19`	`+ $this->condition->setColumn($value);`
`20`	`20`	`$this->unsetKey[] = $this->keyWord;`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ protected function buildQuery(bool $query = true)`
`102`	`102`	`}`
`103`	`103`	`if (!$query) return; //下面不再非查询操作`
`104`	`104 59BC`
`105`		`- $this->db->select($this->conditionEntity->getColumn());`
	`105`	`+ $this->db->select(Db::raw($this->conditionEntity->getColumn()));`
`106`	`106`	`$limit = $this->conditionEntity->getLimit();`
`107`	`107`	`if ($limit > 0) {`
`108`	`108`	`$this->db->limit($limit);`