1

.phpstorm.meta.php

@@ -4,7 +4,10 @@ namespace PHPSTORM_META {
 
     // Reflect
 	use Kiri\Di\Container;
+	use Psr\Container\ContainerInterface;
 
+	override(ContainerInterface::get(0), map('@'));
+	override(Container::make(0), map('@'));
 	override(Container::get(0), map('@'));
 	override(Container::create(0), map('@'));
 //    override(\Hyperf\Utils\Context::get(0), map('@'));

src/ActiveQuery.php

@@ -11,6 +11,7 @@ namespace Database;
 
 use Database\Traits\QueryTrait;
 use Exception;
+use JetBrains\PhpStorm\ArrayShape;
 use Kiri\Abstracts\Component;
 
 /**
@@ -20,290 +21,320 @@ use Kiri\Abstracts\Component;
 class ActiveQuery extends Component implements ISqlBuilder
 {
 
-	use QueryTrait;
+    use QueryTrait;
 
-	/** @var array */
+    /** @var array */
-	public array $with = [];
+    public array $with = [];
 
-	/** @var bool */
+    /** @var bool */
-	public bool $asArray = FALSE;
+    public bool $asArray = FALSE;
 
-	/** @var bool */
+    /** @var bool */
-	public bool $useCache = FALSE;
+    public bool $useCache = FALSE;
 
-	/**
+    /**
-	 * @var Connection|null
+     * @var Connection|null
-	 */
+     */
-	public ?Connection $db = NULL;
+    public ?Connection $db = NULL;
 
-	/**
+    /**
-	 * @var array
+     * @var array
-	 * 参数绑定
+     * 参数绑定
-	 */
+     */
-	public array $attributes = [];
+    public array $attributes = [];
 
 
-	/**
+    /**
-	 * Comply constructor.
+     * Comply constructor.
-	 * @param $model
+     * @param $model
-	 * @param array $config
+     * @param array $config
-	 * @throws
+     * @throws
-	 */
+     */
-	public function __construct($model, array $config = [])
+    public function __construct($model, array $config = [])
-	{
+    {
-		$this->modelClass = $model;
+        $this->modelClass = $model;
 
-		$this->builder = SqlBuilder::builder($this);
+        $this->builder = SqlBuilder::builder($this);
-		parent::__construct($config);
+        parent::__construct($config);
-	}
+    }
 
 
-	/**
+    /**
-	 * 清除不完整数据
+     * 清除不完整数据
-	 */
+     */
-	public function clear()
+    public function clear()
-	{
+    {
-		$this->db = null;
+        $this->db = NULL;
-		$this->useCache = false;
+        $this->useCache = FALSE;
-		$this->with = [];
+        $this->with = [];
-	}
+    }
 
-	/**
+    /**
-	 * @param $key
+     * @param $key
-	 * @param $value
+     * @param $value
-	 * @return $this
+     * @return $this
-	 */
+     */
-	public function addParam($key, $value): static
+    public function addParam($key, $value): static
-	{
+    {
-		$this->attributes[$key] = $value;
+        $this->attributes[$key] = $value;
-		return $this;
+        return $this;
-	}
+    }
-
-	/**
-	 * @param array $values
-	 * @return $this
-	 */
-	public function addParams(array $values): static
-	{
-		foreach ($values as $key => $val) {
-			$this->addParam($key, $val);
-		}
-		return $this;
-	}
-
-	/**
-	 * @param $name
-	 * @return $this
-	 */
-	public function with($name): static
-	{
-		if (empty($name)) {
-			return $this;
-		}
-		if (is_string($name)) {
-			$name = explode(',', $name);
-		}
-		foreach ($name as $val) {
-			array_push($this->with, $val);
-		}
-		return $this;
-	}
 
 
-	/**
+    /**
-	 * @param $sql
+     * @param int $size
-	 * @param array $params
+     * @param int $page
-	 * @return mixed
+     * @return array
-	 * @throws Exception
+     * @throws Exception
-	 */
+     */
-	public function execute($sql, array $params = []): Command
+    #[ArrayShape(['code' => "int", 'message' => "string", 'size' => "mixed", 'page' => "mixed", 'count' => "int", 'next' => "mixed", 'prev' => "mixed", 'param' => "array"])]
-	{
+    public function pagination(int $size = 20, int $page = 1): array
-		return $this->modelClass->getConnection()->createCommand($sql, $params);
+    {
-	}
+        $page = max(1, $page);
+        $size = max(1, $size);
+
+        $offset = ($page - 1) * $size;
+
+        $count = $this->count();
+        $lists = $this->limit($offset, $size)->get()->toArray();
+        return [
+            'code'   => 0,
+            'message'   => 'ok',
+            'size'   => $size,
+            'page'   => $page,
+            'count'  => $count,
+            'next'   => max($page + 1, 1),
+            'prev'   => max($page - 1, 1),
+            'param' => $lists,
+        ];
+    }
 
 
-	/**
+    /**
-	 * @return ModelInterface|null
+     * @param array $values
-	 * @throws Exception
+     * @return $this
-	 */
+     */
-	public function first(): ModelInterface|null
+    public function addParams(array $values): static
-	{
+    {
-		$data = $this->execute($this->builder->one())->one();
+        foreach ($values as $key => $val) {
-		if (empty($data)) {
+            $this->addParam($key, $val);
-			return NULL;
+        }
-		}
+        return $this;
-		return $this->populate($data);
+    }
-	}
+
+    /**
+     * @param $name
+     * @return $this
+     */
+    public function with($name): static
+    {
+        if (empty($name)) {
+            return $this;
+        }
+        if (is_string($name)) {
+            $name = explode(',', $name);
+        }
+        foreach ($name as $val) {
+            array_push($this->with, $val);
+        }
+        return $this;
+    }
 
 
-	/**
+    /**
-	 * @return string
+     * @param $sql
-	 * @throws Exception
+     * @param array $params
-	 */
+     * @return mixed
-	public function toSql(): string
+     * @throws Exception
-	{
+     */
-		return $this->builder->get();
+    public function execute($sql, array $params = []): Command
-	}
+    {
+        return $this->modelClass->getConnection()->createCommand($sql, $params);
+    }
 
 
-	/**
+    /**
-	 * @return array|Collection
+     * @return ModelInterface|null
-	 */
+     * @throws Exception
-	public function get(): Collection|array
+     */
-	{
+    public function first(): ModelInterface|null
-		return $this->all();
+    {
-	}
+        $data = $this->execute($this->builder->one())->one();
+        if (empty($data)) {
+            return NULL;
+        }
+        return $this->populate($data);
+    }
 
 
-	/**
+    /**
-	 * @throws Exception
+     * @return string
-	 */
+     * @throws Exception
-	public function flush(): array|bool|int|string|null
+     */
-	{
+    public function toSql(): string
-		return $this->execute($this->builder->truncate())->exec();
+    {
-	}
+        return $this->builder->get();
+    }
 
 
-	/**
+    /**
-	 * @param int $size
+     * @return array|Collection
-	 * @param callable $callback
+     */
-	 * @return Pagination
+    public function get(): Collection|array
-	 * @throws Exception
+    {
-	 */
+        return $this->all();
-	public function page(int $size, callable $callback): Pagination
+    }
-	{
-		$pagination = new Pagination($this);
-		$pagination->setOffset(0);
-		$pagination->setLimit($size);
-		$pagination->setCallback($callback);
-		return $pagination;
-	}
-
-	/**
-	 * @param string $field
-	 * @param string $setKey
-	 *
-	 * @return array|null
-	 * @throws Exception
-	 */
-	public function column(string $field, string $setKey = ''): ?array
-	{
-		return $this->all()->column($field, $setKey);
-	}
-
-	/**
-	 * @return array|Collection
-	 * @throws
-	 */
-	public function all(): Collection|array
-	{
-		$data = $this->execute($this->builder->all())->all();
-		if (!empty($this->with)){
-			$this->getWith($this->modelClass);
-		}
-		$collect = new Collection($this, $data, $this->modelClass);
-		if ($this->asArray) {
-			return $collect->toArray();
-		}
-		return $collect;
-	}
-
-	/**
-	 * @param $data
-	 * @return ModelInterface
-	 * @throws Exception
-	 */
-	public function populate($data): ModelInterface
-	{
-		return $this->getWith($this->modelClass::populate($data));
-	}
 
 
-	/**
+    /**
-	 * @param ModelInterface $model
+     * @throws Exception
-	 * @return ModelInterface
+     */
-	 */
+    public function flush(): array|bool|int|string|null
-	public function getWith(ModelInterface $model): ModelInterface
+    {
-	{
+        return $this->execute($this->builder->truncate())->exec();
-		if (empty($this->with) || !is_array($this->with)) {
+    }
-			return $model;
-		}
-		return $model->setWith($this->with);
-	}
-
-	/**
-	 * @return int
-	 * @throws Exception
-	 */
-	public function count(): int
-	{
-		$data = $this->execute($this->builder->count())->one();
-		if ($data && is_array($data)) {
-			return (int)array_shift($data);
-		}
-		return 0;
-	}
 
 
-	/**
+    /**
-	 * @param array $data
+     * @param int $size
-	 * @return array|Command|bool|int|string
+     * @param callable $callback
-	 * @throws Exception
+     * @return Pagination
-	 */
+     * @throws Exception
-	public function batchUpdate(array $data): Command|array|bool|int|string
+     */
-	{
+    public function page(int $size, callable $callback): Pagination
-		$generate = $this->builder->update($data);
+    {
-		if (is_bool($generate)) {
+        $pagination = new Pagination($this);
-			return $generate;
+        $pagination->setOffset(0);
-		}
+        $pagination->setLimit($size);
-		return $this->execute(...$generate)->exec();
+        $pagination->setCallback($callback);
-	}
+        return $pagination;
+    }
 
-	/**
+    /**
-	 * @param array $data
+     * @param string $field
-	 * @return bool
+     * @param string $setKey
-	 * @throws Exception
+     *
-	 */
+     * @return array|null
-	public function batchInsert(array $data): bool
+     * @throws Exception
-	{
+     */
-		[$sql, $params] = $this->builder->insert($data, true);
+    public function column(string $field, string $setKey = ''): ?array
+    {
+        return $this->all()->column($field, $setKey);
+    }
+
+    /**
+     * @return array|Collection
+     * @throws
+     */
+    public function all(): Collection|array
+    {
+        $data = $this->execute($this->builder->all())->all();
+        if (!empty($this->with)) {
+            $this->getWith($this->modelClass);
+        }
+        $collect = new Collection($this, $data, $this->modelClass);
+        if ($this->asArray) {
+            return $collect->toArray();
+        }
+        return $collect;
+    }
+
+    /**
+     * @param $data
+     * @return ModelInterface
+     * @throws Exception
+     */
+    public function populate($data): ModelInterface
+    {
+        return $this->getWith($this->modelClass::populate($data));
+    }
 
 
-		return $this->execute($sql, $params)->exec();
+    /**
-	}
+     * @param ModelInterface $model
+     * @return ModelInterface
+     */
+    public function getWith(ModelInterface $model): ModelInterface
+    {
+        if (empty($this->with) || !is_array($this->with)) {
+            return $model;
+        }
+        return $model->setWith($this->with);
+    }
 
-	/**
+    /**
-	 * @param $filed
+     * @return int
-	 *
+     * @throws Exception
-	 * @return null
+     */
-	 * @throws Exception
+    public function count(): int
-	 */
+    {
-	public function value($filed)
+        $data = $this->execute($this->builder->count())->one();
-	{
+        if ($data && is_array($data)) {
-		return $this->first()[$filed] ?? null;
+            return (int)array_shift($data);
-	}
+        }
-
+        return 0;
-	/**
+    }
-	 * @return bool
-	 * @throws Exception
-	 */
-	public function exists(): bool
-	{
-		return !empty($this->execute($this->builder->one())->fetchColumn());
-	}
 
 
-	/**
+    /**
-	 * @param bool $getSql
+     * @param array $data
-	 * @return int|bool|string|null
+     * @return array|Command|bool|int|string
-	 * @throws Exception
+     * @throws Exception
-	 */
+     */
-	public function delete(bool $getSql = false): int|bool|string|null
+    public function batchUpdate(array $data): Command|array|bool|int|string
-	{
+    {
-		$sql = $this->builder->delete();
+        $generate = $this->builder->update($data);
-		if ($getSql === false) {
+        if (is_bool($generate)) {
-			return $this->execute($sql)->delete();
+            return $generate;
-		}
+        }
-		return $sql;
+        return $this->execute(...$generate)->exec();
-	}
+    }
+
+    /**
+     * @param array $data
+     * @return bool
+     * @throws Exception
+     */
+    public function batchInsert(array $data): bool
+    {
+        [$sql, $params] = $this->builder->insert($data, TRUE);
+
+
+        return $this->execute($sql, $params)->exec();
+    }
+
+    /**
+     * @param $filed
+     *
+     * @return null
+     * @throws Exception
+     */
+    public function value($filed)
+    {
+        return $this->first()[$filed] ?? NULL;
+    }
+
+    /**
+     * @return bool
+     * @throws Exception
+     */
+    public function exists(): bool
+    {
+        return !empty($this->execute($this->builder->one())->fetchColumn());
+    }
+
+
+    /**
+     * @param bool $getSql
+     * @return int|bool|string|null
+     * @throws Exception
+     */
+    public function delete(bool $getSql = FALSE): int|bool|string|null
+    {
+        $sql = $this->builder->delete();
+        if ($getSql === FALSE) {
+            return $this->execute($sql)->delete();
+        }
+        return $sql;
+    }
 }

src/Base/AbstractCollection.php

@@ -17,6 +17,7 @@ use Kiri\ToArray;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Abstracts\Component;
+use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -91,7 +92,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      */
     public function addItem($item)
     {
-        array_push($this->_item, $item);
+        $this->_item[] = $item;
     }
 
     /**
@@ -143,7 +144,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
      * @param mixed $offset
      * @param mixed $value
      */
-    public function offsetSet(mixed $offset, mixed $value)
+    #[ReturnTypeWillChange] public function offsetSet(mixed $offset, mixed $value)
     {
         $this->_item[$offset] = $value;
     }
@@ -152,7 +153,7 @@ abstract class AbstractCollection extends Component implements \IteratorAggregat
     /**
      * @param mixed $offset
      */
-    public function offsetUnset(mixed $offset)
+    #[ReturnTypeWillChange] public function offsetUnset(mixed $offset)
     {
         if ($this->offsetExists($offset)) {
             unset($this->_item[$offset]);

src/Condition/Condition.php

@@ -5,14 +5,13 @@ namespace Database\Condition;
 
 
 use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\BaseObject;
+use Kiri\Abstracts\Component;
-use Kiri\Core\Str;
 
 /**
  * Class Condition
  * @package Database\Condition
  */
-abstract class Condition extends BaseObject
+abstract class Condition extends Component
 {
 
 	protected string $column = '';

src/Connection.php

@@ -11,7 +11,6 @@ declare(strict_types=1);
 namespace Database;
 
 
-use Annotation\Inject;
 use Database\Affair\BeginTransaction;
 use Database\Affair\Commit;
 use Database\Affair\Rollback;
@@ -23,6 +22,7 @@ use Kiri\Abstracts\Config;
 use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
 use Kiri\Kiri;
+use Note\Inject;
 use ReflectionException;
 use Server\Events\OnWorkerExit;
 use Server\Events\OnWorkerStop;
@@ -43,7 +43,11 @@ class Connection extends Component
 
 	public string $database = '';
 
-	public int $timeout = 1900;
+	public int $connect_timeout = 30;
+
+	public int $read_timeout = 10;
+
+	public array $pool;
 
 	/**
 	 * @var bool
@@ -61,6 +65,7 @@ class Connection extends Component
 	 * @var array
 	 */
 	public array $slaveConfig = [];
+	public array $attributes = [];
 
 
 	/**
@@ -70,24 +75,18 @@ class Connection extends Component
 	public Schema $_schema;
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * execute by __construct
 	 * @throws Exception
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
+		$eventProvider = Kiri::getDi()->get(EventProvider::class);
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
+		$eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+		$eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-		$this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+		$eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
+		$eventProvider->on(Commit::class, [$this, 'commit'], 0);
 
 		if (Db::transactionsActive()) {
 			$this->beginTransaction();
@@ -197,10 +196,14 @@ class Connection extends Component
 	public function masterInstance(): PDO
 	{
 		return $this->connections()->get([
-			'cds'      => $this->cds,
+			'cds'             => $this->cds,
-			'username' => $this->username,
+			'username'        => $this->username,
-			'password' => $this->password,
+			'password'        => $this->password,
-			'database' => $this->database
+			'attributes'      => $this->attributes,
+			'connect_timeout' => $this->connect_timeout,
+			'read_timeout'    => $this->read_timeout,
+			'dbname'          => $this->database,
+			'pool'            => $this->pool
 		], true);
 	}
 

src/DatabasesProviders.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 namespace Database;
 
 
-use Annotation\Inject;
 use Exception;
 use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Providers;
@@ -24,13 +23,6 @@ class DatabasesProviders extends Providers
 	private array $_pooLength = ['min' => 0, 'max' => 1];
 
 
-	/**
-	 * @var EventProvider
-	 */
-	#[Inject(EventProvider::class)]
-	public EventProvider $eventProvider;
-
-
 	/**
 	 * @param Application $application
 	 * @throws Exception
@@ -83,18 +75,20 @@ class DatabasesProviders extends Providers
 	 */
 	private function _settings($database): array
 	{
+		$clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
 		return [
-			'class'       => Connection::class,
+			'id'              => $database['id'],
-			'id'          => $database['id'],
+			'cds'             => $database['cds'],
-			'cds'         => $database['cds'],
+			'username'        => $database['username'],
-			'username'    => $database['username'],
+			'password'        => $database['password'],
-			'password'    => $database['password'],
+			'tablePrefix'     => $database['tablePrefix'],
-			'tablePrefix' => $database['tablePrefix'],
+			'database'        => $database['database'],
-			'database'    => $database['database'],
+			'connect_timeout' => $database['connect_timeout'] ?? 30,
-			'maxNumber'   => $this->_pooLength['max'],
+			'read_timeout'    => $database['read_timeout'] ?? 10,
-			'minNumber'   => $this->_pooLength['min'],
+			'pool'            => $clientPool,
-			'charset'     => $database['charset'] ?? 'utf8mb4',
+			'attributes'      => $database['attributes'] ?? [],
-			'slaveConfig' => $database['slaveConfig']
+			'charset'         => $database['charset'] ?? 'utf8mb4',
+			'slaveConfig'     => $database['slaveConfig']
 		];
 	}
 

src/Model.php

@@ -117,6 +117,7 @@ class Model extends Base\Model
 		if (empty($select)) {
 			$select = duplicate(static::class);
 			$select->attributes = $attributes;
+			$select->setIsNowExample(true);
 			if (!$select->save()) {
 				Db::rollback();
 				return $logger->addError($select->getLastError(), 'mysql');

src/Mysql/PDO.php

@@ -3,8 +3,8 @@
 namespace Database\Mysql;
 
 use Exception;
+use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Logger;
-use Kiri\Context;
 use Kiri\Kiri;
 use Kiri\Pool\StopHeartbeatCheck;
 use PDOStatement;
@@ -29,18 +29,31 @@ class PDO implements StopHeartbeatCheck
 
 	private int $_last = 0;
 
+	public string $dbname;
+	public string $cds;
+	public string $username;
+	public string $password;
+	public string $charset;
+	public int $connect_timeout;
+	public int $read_timeout;
+
+
+	public array $attributes = [];
+
 
 	/**
-	 * @param string $dbname
+	 * @param array $config
-	 * @param string $cds
-	 * @param string $username
-	 * @param string $password
-	 * @param string $chatset
-	 * @throws
 	 */
-	public function __construct(public string $dbname, public string $cds,
+	public function __construct(array $config)
-	                            public string $username, public string $password, public string $chatset = 'utf8mb4')
 	{
+		$this->dbname = $config['dbname'];
+		$this->cds = $config['cds'];
+		$this->username = $config['username'];
+		$this->password = $config['password'];
+		$this->connect_timeout = $config['connect_timeout'] ?? 30;
+		$this->read_timeout = $config['read_timeout'] ?? 10;
+		$this->charset = $config['charset'] ?? 'utf8mb4';
+		$this->attributes = $config['attributes'] ?? [];
 	}
 
 
@@ -67,21 +80,28 @@ class PDO implements StopHeartbeatCheck
 		if (env('state', 'start') == 'exit') {
 			return;
 		}
-		if ($this->_timer === -1 && Context::inCoroutine()) {
+		if ($this->_timer === -1) {
-			$this->_timer = Timer::tick(1000, function () {
+			$this->_timer = Timer::tick(1000, fn() => $this->waite());
-				try {
+		}
-					if (env('state', 'start') == 'exit') {
+	}
-						Kiri::getDi()->get(Logger::class)->critical('timer end');
+
-						$this->stopHeartbeatCheck();
+
-					}
+	/**
-					if (time() - $this->_last > 10 * 60) {
+	 * @throws Exception
-						$this->stopHeartbeatCheck();
+	 */
-						$this->pdo = null;
+	private function waite(): void
-					}
+	{
-				} catch (\Throwable $throwable) {
+		try {
-					error($throwable);
+			if (env('state', 'start') == 'exit') {
-				}
+				Kiri::getDi()->get(Logger::class)->critical('timer end');
-			});
+				$this->stopHeartbeatCheck();
+			}
+			if (time() - $this->_last > (int)Config::get('databases.pool.tick', 60)) {
+				$this->stopHeartbeatCheck();
+				$this->pdo = null;
+			}
+		} catch (\Throwable $throwable) {
+			error($throwable);
 		}
 	}
 
@@ -286,13 +306,18 @@ class PDO implements StopHeartbeatCheck
 		$link = new \PDO('mysql:dbname=' . $this->dbname . ';host=' . $this->cds, $this->username, $this->password, [
 			\PDO::ATTR_EMULATE_PREPARES         => false,
 			\PDO::ATTR_CASE                     => \PDO::CASE_NATURAL,
-			\PDO::ATTR_TIMEOUT                  => 60,
+			\PDO::ATTR_TIMEOUT                  => $this->connect_timeout,
 			\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => true,
-			\PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->chatset
+			\PDO::MYSQL_ATTR_INIT_COMMAND       => 'SET NAMES ' . $this->charset
 		]);
 		$link->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
 		$link->setAttribute(\PDO::ATTR_STRINGIFY_FETCHES, false);
 		$link->setAttribute(\PDO::ATTR_ORACLE_NULLS, \PDO::NULL_EMPTY_STRING);
+		if (!empty($this->attributes) && is_array($this->attributes)) {
+			foreach ($this->attributes as $key => $attribute) {
+				$link->setAttribute($key, $attribute);
+			}
+		}
 		return $link;
 	}
 

src/Note/Get.php

@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Database\Annotation;
+namespace Database\Note;
 
 
 use Attribute;
@@ -11,9 +11,9 @@ use Exception;
 
 /**
  * Class Get
- * @package Annotation\Model
+ * @package Note\Model
  */
-#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Annotation\Attribute
+#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Note\Attribute
 {
 
 

src/Note/Relation.php

@@ -1,17 +1,17 @@
 <?php
 
 
-namespace Database\Annotation;
+namespace Database\Note;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 use Database\Base\Relate;
 use Exception;
 
 
 /**
  * Class Relation
- * @package Annotation\Model
+ * @package Note\Model
  */
 #[\Attribute(\Attribute::TARGET_METHOD)] class Relation extends Attribute
 {

src/Note/Set.php

@@ -1,10 +1,10 @@
 <?php
 
 
-namespace Database\Annotation;
+namespace Database\Note;
 
 
-use Annotation\Attribute;
+use Note\Attribute;
 use Database\Base\Setter;
 use Exception;
 

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;
 	}