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-07-07 14:07:27 +08:00
parent 0e0caaf8a9
commit b554b53cfd
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Database/SqlBuilder.php
+3 -4
View File
@@ -66,7 +66,6 @@ class SqlBuilder extends Component
public function mathematics(array $attributes, string $opera = '+'): bool|array public function mathematics(array $attributes, string $opera = '+'): bool|array
{ {
$string = []; $string = [];
foreach ($attributes as $attribute => $value) { foreach ($attributes as $attribute => $value) {
$string[] = $attribute . '=' . $attribute . $opera . $value; $string[] = $attribute . '=' . $attribute . $opera . $value;
} }
@@ -80,7 +79,7 @@ class SqlBuilder extends Component
* @return array|bool * @return array|bool
* @throws Exception * @throws Exception
*/ */
private function __updateBuilder(array $string,array $params): array|bool private function __updateBuilder(array $string, array $params): array|bool
{ {
if (empty($string)) { if (empty($string)) {
return $this->addError('None data update.'); return $this->addError('None data update.');
@@ -92,7 +91,7 @@ class SqlBuilder extends Component
} }
$update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition; $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
$update .= $this->builderLimit($this->query); $update .= $this->builderLimit($this->query, false);
return [$update, $params]; return [$update, $params];
} }
@@ -185,7 +184,7 @@ class SqlBuilder extends Component
str_starts_with($value, '+ ') || str_starts_with($value, '+ ') ||
str_starts_with($value, '- ') str_starts_with($value, '- ')
) { ) {
$keys[] = $key . '=' . $key . $value; $keys[] = $key . '=' . $key . ' ' . $value;
} else { } else {
$params[$key . $order] = $value; $params[$key . $order] = $value;
$keys[] = $key . '=:' . $key . $order; $keys[] = $key . '=:' . $key . $order;
Database/Traits/Builder.php
+3 -2
View File
@@ -104,14 +104,15 @@ trait Builder
/** /**
* @param ActiveQuery|Query $query * @param ActiveQuery|Query $query
* @param bool $hasLimit
* @return string * @return string
*/ */
#[Pure] private function builderLimit(ActiveQuery|Query $query): string #[Pure] private function builderLimit(ActiveQuery|Query $query, bool $hasLimit = true): string
{ {
if (!is_numeric($query->limit) || $query->limit < 1) { if (!is_numeric($query->limit) || $query->limit < 1) {
return ""; return "";
} }
if ($query->offset !== null) { if ($query->offset !== null && $hasLimit) {
return ' LIMIT ' . $query->offset . ',' . $query->limit; return ' LIMIT ' . $query->offset . ',' . $query->limit;
} }
return ' LIMIT ' . $query->limit; return ' LIMIT ' . $query->limit;