改名

Database/Db.php

@@ -11,7 +11,6 @@ namespace Database;
 
 use Database\Traits\QueryTrait;
 use Exception;
-use HttpServer\Http\Context;
 use Snowflake\Event;
 use Snowflake\Snowflake;
 
@@ -93,6 +92,27 @@ class Db implements ISqlBuilder
 		return 'ANY_VALUE(' . $column . ') as ' . $alias;
 	}
 
+
+	/**
+	 * @param string $column
+	 * @return string
+	 */
+	public static function increment(string $column): string
+	{
+		return '+ ' . $column;
+	}
+
+
+	/**
+	 * @param string $column
+	 * @return string
+	 */
+	public static function decrement(string $column): string
+	{
+		return '- ' . $column;
+	}
+
+
 	/**
 	 * @param Connection|null $db
 	 * @return mixed
@@ -167,19 +187,19 @@ class Db implements ISqlBuilder
 	 */
 	public static function findAllBySql(string $sql, array $attributes = [], Connection $db = NULL): int|bool|array|string|null
 	{
-        return $db->createCommand($sql, $attributes)->all();
+		return $db->createCommand($sql, $db?->database, $attributes)->all();
 	}
 
 	/**
 	 * @param string $sql
 	 * @param array $attributes
 	 * @param Connection|NULL $db
-     * @return array|mixed
+	 * @return string|array|bool|int|null
 	 * @throws Exception
 	 */
-    public static function findBySql(string $sql, array $attributes = [], Connection $db = NULL): mixed
+	public static function findBySql(string $sql, array $attributes = [], Connection $db = NULL): string|array|bool|int|null
 	{
-        return $db->createCommand($sql, $attributes)->one();
+		return $db->createCommand($sql, $db?->database, $attributes)->one();
 	}
 
 	/**

Database/SqlBuilder.php

@@ -52,19 +52,8 @@ class SqlBuilder extends Component
 	public function update(array $attributes): bool|array
 	{
 		[$string, $array] = $this->builderParams($attributes);
-		if (empty($string) || empty($array)) {
-			return $this->addError('None data update.');
-		}
 
-		$condition = $this->conditionToString();
-		if (!empty($condition)) {
-			$condition = ' WHERE ' . $condition;
-		}
-
-		$update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
-		$update .= $this->builderLimit($this->query);
-
-		return [$update, $array];
+		return $this->__updateBuilder($string, $array);
 	}
 
 
@@ -76,12 +65,22 @@ class SqlBuilder extends Component
 	 */
 	public function mathematics(array $attributes, string $opera = '+'): bool|array
 	{
-		$string = $array = [];
-
+		$string = [];
 		foreach ($attributes as $attribute => $value) {
 			$string[] = $attribute . '=' . $attribute . $opera . $value;
 		}
+		return $this->__updateBuilder($string, []);
+	}
 
+
+	/**
+	 * @param array $string
+	 * @param array $params
+	 * @return array|bool
+	 * @throws Exception
+	 */
+	private function __updateBuilder(array $string, array $params): array|bool
+	{
 		if (empty($string)) {
 			return $this->addError('None data update.');
 		}
@@ -92,9 +91,9 @@ class SqlBuilder extends Component
 		}
 
 		$update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
-		$update .= $this->builderLimit($this->query);
+		$update .= $this->builderLimit($this->query, false);
 
-		return [$update, []];
+		return [$update, $params];
 	}
 
 
@@ -185,7 +184,7 @@ class SqlBuilder extends Component
 			str_starts_with($value, '+ ') ||
 			str_starts_with($value, '- ')
 		) {
-			$keys[] = $key . '=' . $key . $value;
+			$keys[] = $key . '=' . $key . ' ' . $value;
 		} else {
 			$params[$key . $order] = $value;
 			$keys[] = $key . '=:' . $key . $order;

Database/Traits/Builder.php

@@ -104,14 +104,15 @@ trait Builder
 
 	/**
 	 * @param ActiveQuery|Query $query
+	 * @param bool $hasLimit
 	 * @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) {
 			return "";
 		}
-		if ($query->offset !== null) {
+		if ($query->offset !== null && $hasLimit) {
 			return ' LIMIT ' . $query->offset . ',' . $query->limit;
 		}
 		return ' LIMIT ' . $query->limit;