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-08-10 10:52:05 +08:00
parent 81132af603
commit c03a93ee98
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/Traits/QueryTrait.php
+2 -2
View File
@@ -496,10 +496,10 @@ trait QueryTrait
$conditionArray = $this->makeClosureFunction($conditionArray); $conditionArray = $this->makeClosureFunction($conditionArray);
} }
if (func_num_args() == 3) { if (func_num_args() > 1) {
[$conditionArray, $opera, $value] = $this->opera(...func_get_args()); [$conditionArray, $opera, $value] = $this->opera(...func_get_args());
$conditionArray = $this->sprintf($conditionArray, $opera, $value); $conditionArray = $this->sprintf($conditionArray, $value, $opera);
} }
$this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')']; $this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')'];
Database/Traits/When.php
+1 -3
View File
@@ -6,10 +6,8 @@ namespace Database\Traits;
use Database\ActiveQuery; use Database\ActiveQuery;
use Database\ISqlBuilder; use Database\ISqlBuilder;
use Database\Query;
use Exception; use Exception;
use JetBrains\PhpStorm\Pure; use JetBrains\PhpStorm\Pure;
use Snowflake\Exception\NotFindClassException;
/** /**
@@ -73,7 +71,7 @@ class When
if (!empty($this->else)) { if (!empty($this->else)) {
$prefix .= ' ELSE ' . $this->else; $prefix .= ' ELSE ' . $this->else;
} }
return $prefix . ' END'; return '(' . $prefix . ' END)';
} }
} }