as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2021-03-26 19:22:11 +08:00
parent 0825725abe
commit f8e2ae5b40
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/SqlBuilder.php
+1 -2
View File
@@ -294,8 +294,7 @@ class SqlBuilder extends Component
public function tableName(): string public function tableName(): string
{ {
if ($this->query->from instanceof \Closure) { if ($this->query->from instanceof \Closure) {
call_user_func($this->query->from, $activeQuery = new Sql()); $this->query->from = '(' . $this->query->makeClosureFunction($this->query->from) . ')';
$this->query->from = '(' . $activeQuery->getSql() . ')';
} }
if ($this->query->from instanceof ActiveQuery) { if ($this->query->from instanceof ActiveQuery) {
$this->query->from = '(' . SqlBuilder::builder($this->query->from)->get($this->query->from) . ')'; $this->query->from = '(' . SqlBuilder::builder($this->query->from)->get($this->query->from) . ')';
Database/Traits/QueryTrait.php
+3 -3
View File
@@ -813,7 +813,7 @@ trait QueryTrait
public function where(callable|array|string $conditions): static public function where(callable|array|string $conditions): static
{ {
if ($conditions instanceof Closure) { if ($conditions instanceof Closure) {
$conditions = '(' . $this->makeClosureFunction($conditions) . ')'; $conditions = $this->makeClosureFunction($conditions);
} }
$this->where[] = $conditions; $this->where[] = $conditions;
return $this; return $this;
@@ -828,7 +828,7 @@ trait QueryTrait
* @throws ReflectionException * @throws ReflectionException
* @throws Exception * @throws Exception
*/ */
private function makeClosureFunction(Closure|array $closure, $onlyWhere = false): string public function makeClosureFunction(Closure|array $closure, $onlyWhere = false): string
{ {
$generate = $this->makeNewSqlGenerate(); $generate = $this->makeNewSqlGenerate();
if ($closure instanceof Closure) { if ($closure instanceof Closure) {
@@ -839,7 +839,7 @@ trait QueryTrait
if ($onlyWhere === true) { if ($onlyWhere === true) {
return $generate->getCondition(); return $generate->getCondition();
} }
return $generate->getSql(); return '(' . $generate->getSql() . ')';
} }