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

@@ -120,17 +120,18 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	}
 
 
-	/**
+    /**
-	 * @param string $name
+     * @param string $name
-	 * @param mixed $value
+     * @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,10 +527,10 @@ 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;
+        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;
 	}
 
 
@@ -609,7 +612,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 	 */
 	public function save($data = NULL): static|bool
 	{
-		if (!is_null($data)) {
+        if (!is_null($data)) {
 			$this->_attributes = merge($this->_attributes, $data);
 		}
 		if (!$this->validator($this->rules()) || !$this->beforeSave($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;
 		}
@@ -806,8 +822,8 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
 			throw new Exception('You need add static method `tableName` and return table name.');
 		}
 		$table = trim($this->table, '{{%}}');
-		if (!empty($tablePrefix) && !str_starts_with($this->table, $tablePrefix)) {
+		if (!empty($tablePrefix) && !str_starts_with($table, $tablePrefix)) {
-			$table = $tablePrefix . $this->table;
+			$table = $tablePrefix . $table;
 		}
 		return '`' . $connection->database . '`.' . $table;
 	}
@@ -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

@@ -32,10 +32,11 @@ interface ModelInterface
 	public static function find(string|int $param): mixed;
 
 
-	/**
+    /**
-	 * @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;
@@ -16,122 +16,122 @@ use Swoole\Timer;
 class PDO implements StopHeartbeatCheck
 {
 
-    const DB_ERROR_MESSAGE = 'The system is busy, please try again later.';
+	const DB_ERROR_MESSAGE = 'The system is busy, please try again later.';
 
 
-    private ?\PDO $pdo = null;
+	private ?\PDO $pdo = null;
 
 
-    private int $_transaction = 0;
+	private int $_transaction = 0;
 
 
-    private int $_timer = -1;
+	private int $_timer = -1;
 
-    private int $_last = 0;
+	private int $_last = 0;
 
 
-    /**
+	/**
-     * @param string $dbname
+	 * @param string $dbname
-     * @param string $cds
+	 * @param string $cds
-     * @param string $username
+	 * @param string $username
-     * @param string $password
+	 * @param string $password
-     * @param string $chatset
+	 * @param string $chatset
-     * @throws
+	 * @throws
-     */
+	 */
-    public function __construct(public string $dbname, public string $cds,
+	public function __construct(public string $dbname, public string $cds,
-                                public string $username, public string $password, public string $chatset = 'utf8mb4')
+	                            public string $username, public string $password, public string $chatset = 'utf8mb4')
-    {
+	{
-    }
+	}
 
 
-    public function init()
+	public function init()
-    {
+	{
-        $this->heartbeat_check();
+		$this->heartbeat_check();
-    }
+	}
 
 
-    /**
+	/**
-     * @return bool
+	 * @return bool
-     */
+	 */
-    public function inTransaction(): bool
+	public function inTransaction(): bool
-    {
+	{
-        return $this->_transaction > 0;
+		return $this->_transaction > 0;
-    }
+	}
 
 
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    public function heartbeat_check(): void
+	public function heartbeat_check(): void
-    {
+	{
-        if (env('state', 'start') == 'exit') {
+		if (env('state', 'start') == 'exit') {
-            return;
+			return;
-        }
+		}
-        if ($this->_timer === -1 && Context::inCoroutine()) {
+		if ($this->_timer === -1 && Context::inCoroutine()) {
-            $this->_timer = Timer::tick(1000, function () {
+			$this->_timer = Timer::tick(1000, function () {
-                try {
+				try {
-                    if (env('state', 'start') == 'exit') {
+					if (env('state', 'start') == 'exit') {
-                        Kiri::getDi()->get(Logger::class)->critical('timer end');
+						Kiri::getDi()->get(Logger::class)->critical('timer end');
-                        $this->stopHeartbeatCheck();
+						$this->stopHeartbeatCheck();
-                    }
+					}
-                    if (time() - $this->_last > 10 * 60) {
+					if (time() - $this->_last > 10 * 60) {
-                        $this->stopHeartbeatCheck();
+						$this->stopHeartbeatCheck();
-                        $this->pdo = null;
+						$this->pdo = null;
-                    }
+					}
-                } catch (\Throwable $throwable) {
+				} catch (\Throwable $throwable) {
-                    error($throwable);
+					error($throwable);
-                }
+				}
-            });
+			});
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    public function stopHeartbeatCheck(): void
+	public function stopHeartbeatCheck(): void
-    {
+	{
-        if ($this->_timer > -1) {
+		if ($this->_timer > -1) {
-            Timer::clear($this->_timer);
+			Timer::clear($this->_timer);
-        }
+		}
-        $this->_timer = -1;
+		$this->_timer = -1;
-    }
+	}
 
 
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    public function beginTransaction()
+	public function beginTransaction()
-    {
+	{
-        if ($this->_transaction == 0) {
+		if ($this->_transaction == 0) {
-            $this->_pdo()->beginTransaction();
+			$this->_pdo()->beginTransaction();
-        }
+		}
-        $this->_transaction++;
+		$this->_transaction++;
-    }
+	}
 
 
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    public function commit()
+	public function commit()
-    {
+	{
-        if ($this->_transaction == 0) {
+		if ($this->_transaction == 0) {
-            $this->_pdo()->commit();
+			$this->_pdo()->commit();
-        }
+		}
-        $this->_transaction--;
+		$this->_transaction--;
-    }
+	}
 
 
-    /**
+	/**
-     *
+	 *
-     */
+	 */
-    public function rollback()
+	public function rollback()
-    {
+	{
-        if ($this->_transaction == 0) {
+		if ($this->_transaction == 0) {
-            $this->_pdo()->rollBack();
+			$this->_pdo()->rollBack();
-        }
+		}
-        $this->_transaction--;
+		$this->_transaction--;
-    }
+	}
 
 
 	/**
@@ -140,14 +140,14 @@ class PDO implements StopHeartbeatCheck
 	 * @return bool|array|null
 	 * @throws Exception
 	 */
-    public function fetchAll(string $sql, array $params = []): bool|null|array
+	public function fetchAll(string $sql, array $params = []): bool|null|array
-    {
+	{
-        $pdo = $this->queryPrev($sql, $params);
+		$pdo = $this->queryPrev($sql, $params);
 
-        $result = $pdo->fetchAll(\PDO::FETCH_ASSOC);
+		$result = $pdo->fetchAll(\PDO::FETCH_ASSOC);
-        $pdo->closeCursor();
+		$pdo->closeCursor();
-        return $result;
+		return $result;
-    }
+	}
 
 
 	/**
@@ -156,146 +156,144 @@ class PDO implements StopHeartbeatCheck
 	 * @return bool|array|null
 	 * @throws Exception
 	 */
-    public function fetch(string $sql, array $params = []): bool|null|array
+	public function fetch(string $sql, array $params = []): bool|null|array
-    {
+	{
-        $pdo = $this->queryPrev($sql, $params);
+		$pdo = $this->queryPrev($sql, $params);
 
-        $result = $pdo->fetch(\PDO::FETCH_ASSOC);
+		$result = $pdo->fetch(\PDO::FETCH_ASSOC);
-        $pdo->closeCursor();
+		$pdo->closeCursor();
-        return $result;
+		return $result;
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $sql
+	 * @param string $sql
-     * @param array $params
+	 * @param array $params
-     * @return bool|array|null
+	 * @return bool|array|null
-     * @throws \Exception
+	 * @throws \Exception
-     */
+	 */
-    public function fetchColumn(string $sql, array $params = []): bool|null|array
+	public function fetchColumn(string $sql, array $params = []): bool|null|array
-    {
+	{
-        $pdo = $this->queryPrev($sql, $params);
+		$pdo = $this->queryPrev($sql, $params);
 
-        $result = $pdo->fetchColumn(\PDO::FETCH_ASSOC);
+		$result = $pdo->fetchColumn(\PDO::FETCH_ASSOC);
-        $pdo->closeCursor();
+		$pdo->closeCursor();
-        return $result;
+		return $result;
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $sql
+	 * @param string $sql
-     * @param array $params
+	 * @param array $params
-     * @return int
+	 * @return int
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    public function count(string $sql, array $params = []): int
+	public function count(string $sql, array $params = []): int
-    {
+	{
-        $pdo = $this->queryPrev($sql, $params);
+		$pdo = $this->queryPrev($sql, $params);
 
-        $result = $pdo->rowCount();
+		$result = $pdo->rowCount();
-        $pdo->closeCursor();
+		$pdo->closeCursor();
-        return $result;
+		return $result;
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $sql
+	 * @param string $sql
-     * @param array $params
+	 * @param array $params
-     * @return PDOStatement
+	 * @return PDOStatement
-     * @throws Exception
+	 * @throws Exception
-     */
+	 */
-    private function queryPrev(string $sql, array $params = []): PDOStatement
+	private function queryPrev(string $sql, array $params = []): PDOStatement
-    {
+	{
-        $this->_last = time();
+		$this->_last = time();
-        try {
+		try {
-            if (($statement = $this->_pdo()->query($sql)) === false) {
+			if (($statement = $this->_pdo()->query($sql)) === false) {
-                throw new Exception($this->_pdo()->errorInfo()[1]);
+				throw new Exception($this->_pdo()->errorInfo()[1]);
-            }
+			}
-            return $this->bindValue($statement, $params);
+			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;
 
-            if (str_contains($throwable->getMessage(), 'MySQL server has gone away')) {
+				return $this->queryPrev($sql, $params);
-                $this->pdo = null;
+			}
-
+			throw new Exception($throwable->getMessage());
-                return $this->queryPrev($sql, $params);
+		}
-            }
+	}
-
-            throw new Exception($throwable->getMessage());
-        }
-    }
 
 
-    /**
+	/**
-     * @param PDOStatement $statement
+	 * @param PDOStatement $statement
-     * @param array $params
+	 * @param array $params
-     * @return PDOStatement
+	 * @return PDOStatement
-     */
+	 */
-    private function bindValue(PDOStatement $statement, array $params = []): PDOStatement
+	private function bindValue(PDOStatement $statement, array $params = []): PDOStatement
-    {
+	{
-        if (empty($params)) return $statement;
+		if (empty($params)) return $statement;
-        foreach ($params as $key => $param) {
+		foreach ($params as $key => $param) {
-            $statement->bindValue($key, $param);
+			$statement->bindValue($key, $param);
-        }
+		}
-        return $statement;
+		return $statement;
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $sql
+	 * @param string $sql
-     * @param $isInsert
+	 * @param array $params
-     * @param array $params
+	 * @return int
-     * @return int
+	 * @throws Exception
-     * @throws Exception
+	 */
-     */
+	public function execute(string $sql, array $params = []): int
-    public function execute(string $sql, $isInsert, array $params = []): int
+	{
-    {
+		$this->_last = time();
-        $this->_last = time();
+		$pdo = $this->_pdo();
-        if (!(($prepare = $this->_pdo()->prepare($sql)) instanceof PDOStatement)) {
+		if (!(($prepare = $pdo->prepare($sql)) instanceof PDOStatement)) {
-            throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
+			throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
-        }
+		}
-        if ($prepare->execute($params) === false) {
+		if ($prepare->execute($params) === false) {
-            throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
+			throw new Exception($prepare->errorInfo()[2] ?? static::DB_ERROR_MESSAGE);
-        }
+		}
-        $result = 1;
+		$result = (int)$pdo->lastInsertId();
-        if ($isInsert) {
+		$prepare->closeCursor();
-            $result = (int)$this->_pdo()->lastInsertId();
+		if ($result == 0) {
-        }
+			return true;
-        $prepare->closeCursor();
+		}
-        return $result;
+		return $result;
-    }
+	}
 
 
-    /**
+	/**
-     * @return \PDO
+	 * @return \PDO
-     */
+	 */
-    public function _pdo(): \PDO
+	public function _pdo(): \PDO
-    {
+	{
-        if ($this->_timer === -1) {
+		if ($this->_timer === -1) {
-            $this->heartbeat_check();
+			$this->heartbeat_check();
-        }
+		}
-        if (!($this->pdo instanceof \PDO)) {
+		if (!($this->pdo instanceof \PDO)) {
-            $this->pdo = $this->newClient();
+			$this->pdo = $this->newClient();
-        }
+		}
-        return $this->pdo;
+		return $this->pdo;
-    }
+	}
 
 
-    /**
+	/**
-     * @return \PDO
+	 * @return \PDO
-     */
+	 */
-    private function newClient(): \PDO
+	private function newClient(): \PDO
-    {
+	{
-        $link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
+		$link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
-            \PDO::ATTR_EMULATE_PREPARES         => false,
+			\PDO::ATTR_EMULATE_PREPARES         => false,
-            \PDO::ATTR_CASE                     => \PDO::CASE_NATURAL,
+			\PDO::ATTR_CASE                     => \PDO::CASE_NATURAL,
-            \PDO::ATTR_TIMEOUT                  => 60,
+			\PDO::ATTR_TIMEOUT                  => 60,
-            \PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
+			\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
-            \PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->chatset
+			\PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->chatset
-        ]);
+		]);
-        $link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+		$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-        $link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
+		$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
-        $link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
+		$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
-        return $link;
+		return $link;
-    }
+	}
 
 }

src/Traits/Builder.php

@@ -194,7 +194,7 @@ trait Builder
 			$class = $defaultConfig['class'];
 			unset($defaultConfig['class']);
 
-			$builder = Kiri::getDi()->get($class, [], $defaultConfig);
+			$builder = Kiri::getDi()->make($class, [], $defaultConfig);
 			$builder->setValue($condition[2]);
 			$builder->setColumn($condition[1]);
 		} else {

src/Traits/QueryTrait.php

@@ -522,7 +522,7 @@ trait QueryTrait
 			$conditionArray = $this->sprintf($conditionArray, $value, $opera);
 		}
 
-		$this->where = ['(' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . ')'];
+		$this->where = ['((' . implode(' AND ', $this->where) . ') OR (' . $conditionArray . '))'];
 		return $this;
 	}