1

src/ActiveQuery.php

@@ -269,7 +269,7 @@ class ActiveQuery extends Component implements ISqlBuilder
 		[$sql, $params] = $this->builder->insert($data, true);
 
 
-		return $this->execute($sql, $params)->exec(null, true);
+		return $this->execute($sql, $params)->exec();
 	}
 
 	/**
@@ -295,10 +295,10 @@ class ActiveQuery extends Component implements ISqlBuilder
 
 	/**
 	 * @param bool $getSql
-	 * @return string|bool
+	 * @return int|bool|string|null
 	 * @throws Exception
 	 */
-	public function delete(bool $getSql = false): string|bool
+	public function delete(bool $getSql = false): int|bool|string|null
 	{
 		$sql = $this->builder->delete();
 		if ($getSql === false) {

src/Base/AbstractCollection.php

@@ -134,7 +134,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
             return NULL;
         }
         if (!($this->_item[$offset] instanceof ModelInterface)) {
-            return $this->model->setAttributes($this->_item[$offset]);
+            return $this->model->populates($this->_item[$offset]);
         }
         return $this->_item[$offset];
     }

src/Base/CollectionIterator.php

@@ -56,7 +56,7 @@ class CollectionIterator extends \ArrayIterator
 	 */
 	protected function newModel($current): ModelInterface
 	{
-		return $this->model->setAttributes($current);
+		return $this->model->populates($current);
 	}
 
 

src/Base/Model.php

@@ -123,14 +123,15 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
     /**
      * @param string $name
      * @param mixed $value
+     * @return mixed
      */
-	private function _setter(string $name, mixed $value): void
+	private function _setter(string $name, mixed $value): mixed
 	{
 		$method = di(Setter::class)->getSetter(static::class, $name);
 		if (!empty($method)) {
 			$value = $this->{$method}($value);
 		}
-		$this->_attributes[$name] = $value;
+		return $value;
 	}
 
 
@@ -454,13 +455,13 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			if (!$if_condition_is_null) {
 				return false;
 			}
-			return static::query()->delete();
+			return (bool)static::query()->delete();
 		}
 		$model = static::query()->ifNotWhere($if_condition_is_null)->where($condition);
 		if (!empty($attributes)) {
 			$model->bindParams($attributes);
 		}
-		return $model->delete();
+		return (bool)$model->delete();
 	}
 
 
@@ -488,7 +489,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function setAttribute($name, $value): mixed
 	{
-		return $this->_attributes[$name] = $value;
+		return $this->_attributes[$name] = $this->_setter($name, $value);
 	}
 
 	/**
@@ -498,7 +499,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function setOldAttribute($name, $value): mixed
 	{
-		return $this->_oldAttributes[$name] = $value;
+		return $this->_oldAttributes[$name] = $this->_setter($name, $value);
 	}
 
 	/**
@@ -511,7 +512,9 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($param)) {
 			return $this;
 		}
-		$this->_attributes = array_merge($this->_attributes, $param);
+        foreach ($param as $key => $attribute) {
+            $this->setAttribute($key, $attribute);
+        }
 		return $this;
 	}
 
@@ -524,8 +527,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($param) || !is_array($param)) {
 			return $this;
 		}
-		foreach ($param as $key => $val) {
+        foreach ($param as $key => $attribute) {
-			$this->setOldAttribute($key, $val);
+            $this->setOldAttribute($key, $attribute);
         }
         return $this;
 	}
@@ -540,10 +543,10 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	{
 		[$sql, $param] = SqlBuilder::builder(static::query())->insert($param);
 		$dbConnection = $this->getConnection()->createCommand($sql, $param);
-		if (!($lastId = (int)$dbConnection->save(true, $this))) {
+
-			throw new Exception('保存失败.');
+		$lastId = $dbConnection->save(true);
-		}
+
-		$lastId = $this->setPrimary($lastId, $param);
+		$lastId = $this->setPrimary((int)$lastId, $param);
 
 		$this->refresh()->afterSave($attributes, $param);
 
@@ -572,7 +575,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (!isset($param[$primary]) || empty($param[$primary])) {
 			$this->setAttribute($primary, (int)$lastId);
 		}
-		return $this->setAttributes($param);
+		return $this;
 	}
 
 
@@ -623,6 +626,19 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	}
 
 
+    /**
+     * @param $value
+     * @return $this
+     */
+    public function populates($value): static
+    {
+        $this->_attributes = $value;
+        $this->_oldAttributes = $value;
+        $this->setIsCreate(FALSE);
+        return $this;
+    }
+
+
 	/**
 	 * @param array|null $rule
 	 * @return bool
@@ -633,7 +649,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (empty($rule)) return true;
 		$validate = $this->resolve($rule);
 		if (!$validate->validation()) {
-			return $this->addError($validate->getError(), 'mysql');
+			return $this->addError('$validate->getError()', 'mysql');
 		} else {
 			return TRUE;
 		}
@@ -854,7 +870,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 		if (method_exists($this, 'set' . ucfirst($name))) {
 			$this->{'set' . ucfirst($name)}($value);
 		} else {
-			$this->_setter($name, $value);
+			$this->_attributes[$name] = $this->_setter($name, $value);
 		}
 	}
 

src/Command.php

@@ -60,7 +60,7 @@ class Command extends Component
 	 */
 	public function save(bool $isInsert = TRUE, mixed $hasAutoIncrement = null): int|bool|array|string|null
 	{
-		return $this->execute(static::EXECUTE, $isInsert, $hasAutoIncrement);
+		return $this->execute(static::EXECUTE);
 	}
 
 
@@ -111,17 +111,15 @@ class Command extends Component
 
 	/**
 	 * @param $type
-	 * @param null $isInsert
-	 * @param bool|null $hasAutoIncrement
 	 * @return int|bool|array|string|null
 	 * @throws Exception
 	 */
-	private function execute($type, $isInsert = null, mixed $hasAutoIncrement = null): int|bool|array|string|null
+	private function execute($type): int|bool|array|string|null
 	{
 		try {
 			$time = microtime(true);
 			if ($type === static::EXECUTE) {
-				$result = $this->insert_or_change($isInsert, $hasAutoIncrement);
+				$result = $this->db->getConnect($this->sql)->execute($this->sql,$this->params);
 			} else {
 				$result = $this->search($type);
 			}
@@ -158,22 +156,6 @@ class Command extends Component
 	}
 
 
-	/**
-	 * @param $isInsert
-	 * @param $hasAutoIncrement
-	 * @return bool|int
-	 * @throws Exception
-	 */
-	private function insert_or_change($isInsert, $hasAutoIncrement): bool|int
-	{
-		$pdo = $this->db->getConnect($this->sql);
-		$result = $pdo->execute($this->sql, $isInsert, $this->params);
-		if ($hasAutoIncrement && $result == 0) {
-			return false;
-		}
-		return $result;
-	}
-
 	/**
 	 * @return int|bool|array|string|null
 	 * @throws Exception
@@ -184,14 +166,12 @@ class Command extends Component
 	}
 
 	/**
-	 * @param null $scope
-	 * @param bool $insert
 	 * @return int|bool|array|string|null
 	 * @throws Exception
 	 */
-	public function exec($scope = null, bool $insert = false): int|bool|array|string|null
+	public function exec(): int|bool|array|string|null
 	{
-		return $this->execute(static::EXECUTE, $insert, $scope);
+		return $this->execute(static::EXECUTE);
 	}
 
 	/**

src/ModelInterface.php

@@ -33,9 +33,10 @@ interface ModelInterface
 
 
     /**
-	 * @return string
+     * @param array $data
+     * @return static
      */
-	public static function className(): string;
+    public static function populate(array $data): static;
 
 
 	/**

src/Mysql/PDO.php

@@ -3,8 +3,8 @@
 namespace Database\Mysql;
 
 use Exception;
-use Kiri\Context;
 use Kiri\Abstracts\Logger;
+use Kiri\Context;
 use Kiri\Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use PDOStatement;
@@ -212,14 +212,12 @@ class PDO implements StopHeartbeatCheck
 				throw new Exception($this->_pdo()->errorInfo()[1]);
 			}
 			return $this->bindValue($statement, $params);
-        } catch (\Throwable $throwable) {
+		} catch (\PDOException | \Throwable $throwable) {
-
 			if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
 				$this->pdo = null;
 
 				return $this->queryPrev($sql, $params);
 			}
-
 			throw new Exception($throwable->getMessage());
 		}
 	}
@@ -242,25 +240,25 @@ class PDO implements StopHeartbeatCheck
 
 	/**
 	 * @param string $sql
-     * @param $isInsert
 	 * @param array $params
 	 * @return int
 	 * @throws Exception
 	 */
-    public function execute(string $sql, $isInsert, array $params = []): int
+	public function execute(string $sql, array $params = []): int
 	{
 		$this->_last = time();
-        if (!(($prepare = $this->_pdo()->prepare($sql)) instanceof PDOStatement)) {
+		$pdo = $this->_pdo();
+		if (!(($prepare = $pdo->prepare($sql)) instanceof PDOStatement)) {
 			throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
 		}
 		if ($prepare->execute($params) === false) {
 			throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
 		}
-        $result = 1;
+		$result = (int)$pdo->lastInsertId();
-        if ($isInsert) {
-            $result = (int)$this->_pdo()->lastInsertId();
-        }
 		$prepare->closeCursor();
+		if ($result == 0) {
+			return true;
+		}
 		return $result;
 	}