Revert "改名"

This reverts commit fdf58326

ActiveQuery.php

@@ -135,7 +135,7 @@ class ActiveQuery extends Component implements ISqlBuilder
             $name = explode(',', $name);
         }
         foreach ($name as $val) {
-            array_push($this->with, $val);
+	        $this->with[] = $val;
         }
         return $this;
     }

Annotation/Get.php

@@ -13,7 +13,7 @@ use Exception;
  * Class Get
  * @package Annotation\Model
  */
-#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Annotation\Attribute
+#[Attribute(Attribute::TARGET_METHOD)] class Get extends \Kiri\Annotation\Attribute
 {
 
 

Base/Model.php

@@ -27,7 +27,7 @@ use Database\Traits\HasBase;
 use Exception;
 use Kiri\Abstracts\Component;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use Kiri\ToArray;
 use ReflectionException;
 use ReturnTypeWillChange;

Collection.php

@@ -82,10 +82,10 @@ class Collection extends AbstractCollection
 	 */
 	#[Pure] public function slice(int $start = 0, int $length = 20): array
 	{
-		if (empty($this->_item) || !is_array($this->_item)) {
+		if (empty($this->_item)) {
 			return [];
 		}
-		if (count($this->_item) < $length) {
+		if (\count($this->_item) < $length) {
 			return $this->_item;
 		} else {
 			return array_slice($this->_item, $start, $length);
@@ -138,7 +138,7 @@ class Collection extends AbstractCollection
 	 */
 	#[Pure] public function size(): int
 	{
-		return (int)count($this->_item);
+		return count($this->_item);
 	}
 
 	/**
@@ -166,15 +166,12 @@ class Collection extends AbstractCollection
 	public function delete(): bool
 	{
 		$model = $this->getModel();
-		if (!$model->hasPrimary()) return false;
-		$ids = [];
-		foreach ($this as $item) {
-			$id = $item->getPrimaryValue();
-			if (!empty($id)) {
-				$ids[] = $id;
+		if ($model->hasPrimary()) {
+			$key = $model->getPrimary();
+
+			return $model::query()->whereIn($key, $this->column($key))->delete();
 		}
-		}
-		return $model::query()->whereIn($model->getPrimary(), $ids)->delete();
+		throw new Exception('Must set primary key. if you wante delete');
 	}
 
 	/**

Condition/Condition.php

@@ -18,7 +18,7 @@ abstract class Condition extends Component
 	protected string $opera = '=';
 
 	/** @var array|mixed */
-	protected $value;
+	protected mixed $value;
 
 	const INT_TYPE = ['bit', 'bool', 'tinyint', 'smallint', 'mediumint', 'int', 'bigint', 'float', 'double', 'decimal', 'timestamp'];
 

Connection.php

@@ -17,15 +17,15 @@ use Database\Affair\Rollback;
 use Database\Mysql\PDO;
 use Database\Mysql\Schema;
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Component;
 use Kiri\Abstracts\Config;
-use Kiri\Events\EventProvider;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
-use Kiri\Annotation\Inject;
+use Kiri\Server\Events\OnWorkerExit;
+use Kiri\Server\Events\OnWorkerStop;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionException;
-use Server\Events\OnWorkerExit;
-use Server\Events\OnWorkerStop;
 
 /**
  * Class Connection
@@ -72,16 +72,17 @@ class Connection extends Component
 
 
 	/**
-	 * execute by __construct
-	 * @throws Exception
+	 * @return void
+	 * @throws ContainerExceptionInterface
+	 * @throws NotFoundExceptionInterface
 	 */
 	public function init()
 	{
-		$this->eventProvider->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
-		$this->eventProvider->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
-		$this->eventProvider->on(Rollback::class, [$this, 'rollback'], 0);
-		$this->eventProvider->on(Commit::class, [$this, 'commit'], 0);
+		$this->getEventProvider()->on(OnWorkerStop::class, [$this, 'clear_connection'], 0);
+		$this->getEventProvider()->on(OnWorkerExit::class, [$this, 'clear_connection'], 0);
+		$this->getEventProvider()->on(BeginTransaction::class, [$this, 'beginTransaction'], 0);
+		$this->getEventProvider()->on(Rollback::class, [$this, 'rollback'], 0);
+		$this->getEventProvider()->on(Commit::class, [$this, 'commit'], 0);
 	}
 
 
@@ -108,6 +109,43 @@ class Connection extends Component
 		if (!empty($this->slaveConfig) && $this->cds != $this->slaveConfig['cds']) {
 			$connections->initConnections('Mysql:' . $this->slaveConfig['cds'], false, $pool);
 		}
+//		$name = $connections->name('Mysql:' . $this->cds, true);
+//
+//		$config = $this->_config();
+//		for ($i = 0; $i < $pool; $i++) {
+//			$connections->addItem($name, $connections->create($name, $config)());
+//		}
+//
+//		if (empty($this->slaveConfig)) {
+//			return;
+//		}
+//
+//		$config['cds'] = $this->slaveConfig['cds'];
+//		$config['username'] = $this->slaveConfig['username'];
+//		$config['password'] = $this->slaveConfig['password'];
+//
+//		$name = $connections->name('Mysql:' . $config['cds'], false);
+//		for ($i = 0; $i < $pool; $i++) {
+//			$connections->addItem($name, $connections->create($name, $config)());
+//		}
+	}
+
+
+	/**
+	 * @return array
+	 */
+	private function _config(): array
+	{
+		return [
+			'cds'             => $this->cds,
+			'username'        => $this->username,
+			'password'        => $this->password,
+			'attributes'      => $this->attributes,
+			'connect_timeout' => $this->connect_timeout,
+			'read_timeout'    => $this->read_timeout,
+			'dbname'          => $this->database,
+			'pool'            => $this->pool
+		];
 	}
 
 
@@ -290,8 +328,13 @@ class Connection extends Component
 			return;
 		}
 		$connections = $this->connections();
-		$connections->release($this->cds, true);
-		$connections->release($this->slaveConfig['cds'], false);
+		$connections->release($this->cds, true, $config = $this->_config());
+
+		$config['cds'] = $this->slaveConfig['cds'];
+		$config['username'] = $this->slaveConfig['username'];
+		$config['password'] = $this->slaveConfig['password'];
+
+		$connections->release($this->slaveConfig['cds'], false, $config);
 	}
 
 
@@ -302,8 +345,13 @@ class Connection extends Component
 	{
 		$connections = $this->connections();
 
-		$connections->release($this->cds, true);
-		$connections->release($this->slaveConfig['cds'], false);
+		$connections->release($this->cds, true, $config = $this->_config());
+
+		$config['cds'] = $this->slaveConfig['cds'];
+		$config['username'] = $this->slaveConfig['username'];
+		$config['password'] = $this->slaveConfig['password'];
+
+		$connections->release($this->slaveConfig['cds'], false, $config);
 	}
 
 	/**

DatabasesProviders.php

@@ -5,12 +5,14 @@ namespace Database;
 
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
 use Kiri\Abstracts\Providers;
 use Kiri\Application;
 use Kiri\Exception\ConfigException;
-use Kiri\Kiri;
-use Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnTaskerStart;
+use Kiri\Server\Events\OnWorkerStart;
+use Kiri\Server\Events\OnProcessStart;
 
 /**
  * Class DatabasesProviders
@@ -26,7 +28,9 @@ class DatabasesProviders extends Providers
 	 */
 	public function onImport(Application $application)
 	{
-		$this->eventProvider->on(OnWorkerStart::class, [$this, 'createPool']);
+		$this->getEventProvider()->on(OnWorkerStart::class, [$this, 'createPool']);
+		$this->getEventProvider()->on(OnProcessStart::class, [$this, 'createPool']);
+		$this->getEventProvider()->on(OnTaskerStart::class, [$this, 'createPool']);
 	}
 
 
@@ -45,7 +49,7 @@ class DatabasesProviders extends Providers
 	 * @throws ConfigException
 	 * @throws Exception
 	 */
-	public function createPool(OnWorkerStart $onWorkerStart)
+	public function createPool(OnTaskerStart|OnWorkerStart|OnProcessStart $onWorkerStart)
 	{
 		$databases = Config::get('databases.connections', []);
 		if (empty($databases)) {
@@ -56,7 +60,7 @@ class DatabasesProviders extends Providers
 		foreach ($databases as $key => $database) {
 			$database = $this->_settings($database);
 
-			$connection = Kiri::getDi()->create(Connection::class, $database);
+			$connection = Kiri::getDi()->create(Connection::class, [$database]);
 			$connection->fill();
 
 			$app->set($key, $connection);

Db.php

@@ -43,7 +43,8 @@ class Db implements ISqlBuilder
 	public static function beginTransaction()
 	{
 		if (!static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new BeginTransaction());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new BeginTransaction());
 		}
 		static::$_inTransaction = true;
 	}
@@ -55,7 +56,8 @@ class Db implements ISqlBuilder
 	public static function commit()
 	{
 		if (static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new Commit());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new Commit());
 		}
 		static::$_inTransaction = false;
 	}
@@ -67,7 +69,8 @@ class Db implements ISqlBuilder
 	public static function rollback()
 	{
 		if (static::transactionsActive()) {
-			di(EventDispatch::class)->dispatch(new Rollback());
+			$event = \Kiri::getDi()->get(EventDispatch::class);
+			$event->dispatch(new Rollback());
 		}
 		static::$_inTransaction = false;
 	}

HasCount.php

@@ -3,8 +3,8 @@ declare(strict_types=1);
 
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasCount
@@ -17,15 +17,15 @@ class HasCount extends HasBase
 	 * @param $name
 	 * @param $arguments
 	 * @return ActiveQuery
-	 * @throws Exception
+	 * @throws ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
-		if (method_exists($this, $name)) {
-			return call_user_func([$this, $name], ...$arguments);
-		}
+		if (!method_exists($this, $name)) {
 			return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
 		}
+		return call_user_func([$this, $name], ...$arguments);
+	}
 
 	/**
 	 * @return array|null|ModelInterface

HasMany.php

@@ -6,10 +6,11 @@
  * Time: 13:58
  */
 declare(strict_types=1);
+
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasMany
@@ -23,15 +24,15 @@ class HasMany extends HasBase
 	/**
 	 * @param $name
 	 * @param $arguments
-	 * @return ActiveQuery
+	 * @return ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
-		if (method_exists($this, $name)) {
-			return call_user_func([$this, $name], ...$arguments);
-		}
+		if (!method_exists($this, $name)) {
 			return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
 		}
+		return call_user_func([$this, $name], ...$arguments);
+	}
 
 	/**
 	 * @return array|null|ModelInterface

HasOne.php

@@ -9,8 +9,8 @@ declare(strict_types=1);
 
 namespace Database;
 
-use Exception;
 use Database\Traits\HasBase;
+use Exception;
 
 /**
  * Class HasOne
@@ -23,15 +23,14 @@ class HasOne extends HasBase
 	/**
 	 * @param $name
 	 * @param $arguments
-	 * @return ActiveQuery
+	 * @return ActiveQuery|static
 	 */
-	public function __call($name, $arguments): mixed
+	public function __call($name, $arguments)
 	{
-		if (method_exists($this, $name)) {
-			return call_user_func([$this, $name], ...$arguments);
+		if (!method_exists($this, $name)) {
+			return $this->_relation->getQuery($this->model::className())->$name(...$arguments);
 		}
-		$this->_relation->getQuery($this->model::className())->$name(...$arguments);
-		return $this;
+		return call_user_func([$this, $name], ...$arguments);
 	}
 
 	/**

Model.php

@@ -13,8 +13,8 @@ namespace Database;
 use Database\Base\Getter;
 use Database\Traits\HasBase;
 use Exception;
+use Kiri;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
 use Kiri\ToArray;
 use ReflectionException;
 use Swoole\Coroutine;
@@ -112,19 +112,15 @@ class Model extends Base\Model
 		if (empty($attributes)) {
 			return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
 		}
-		Db::beginTransaction();
 		/** @var static $select */
 		$select = static::query()->where($condition)->first();
 		if (empty($select)) {
 			$select = duplicate(static::class);
 			$select->attributes = $attributes;
-			$select->setIsNowExample(true);
 			if (!$select->save()) {
-				Db::rollback();
-				return $logger->addError($select->getLastError(), 'mysql');
+				throw new Exception($select->getLastError());
 			}
 		}
-		Db::commit();
 		return $select;
 	}
 
@@ -141,8 +137,6 @@ class Model extends Base\Model
 		if (empty($attributes)) {
 			return $logger->addError(FIND_OR_CREATE_MESSAGE, 'mysql');
 		}
-
-		Db::beginTransaction();
 		/** @var static $select */
 		$select = static::query()->where($condition)->first();
 		if (empty($select)) {
@@ -150,10 +144,7 @@ class Model extends Base\Model
 		}
 		$select->attributes = $attributes;
 		if (!$select->save()) {
-			Db::rollback();
-			$select = $logger->addError($select->getLastError(), 'mysql');
-		} else {
-			Db::commit();
+			throw new Exception($select->getLastError());
 		}
 		return $select;
 	}

ModelInterface.php

@@ -46,6 +46,12 @@ interface ModelInterface
 	public static function query(): ActiveQuery;
 
 
+	/**
+	 * @return string
+	 */
+	public function getPrimary(): string;
+
+
 	/**
 	 * @return string
 	 */

Mysql/PDO.php

@@ -3,10 +3,11 @@
 namespace Database\Mysql;
 
 use Exception;
+use Kiri;
 use Kiri\Abstracts\Config;
-use Kiri\Abstracts\Logger;
-use Kiri\Kiri;
+use Kiri\Events\EventProvider;
 use Kiri\Pool\StopHeartbeatCheck;
+use Kiri\Server\Events\OnWorkerExit;
 use PDOStatement;
 use Swoole\Timer;
 
@@ -57,9 +58,14 @@ class PDO implements StopHeartbeatCheck
 	}
 
 
-	public function init()
+	/**
+	 * @return void
+	 */
+	public function init(): void
 	{
 		$this->heartbeat_check();
+		$eventProvider = Kiri::getDi()->get(EventProvider::class);
+		$eventProvider->on(OnWorkerExit::class, [$this, 'onWorkerExit']);
 	}
 
 
@@ -72,14 +78,21 @@ class PDO implements StopHeartbeatCheck
 	}
 
 
+	/**
+	 * @param Kiri\Server\Events\OnWorkerExit $exit
+	 * @return void
+	 */
+	public function onWorkerExit(OnWorkerExit $exit)
+	{
+		$this->stopHeartbeatCheck();
+	}
+
+
 	/**
 	 *
 	 */
 	public function heartbeat_check(): void
 	{
-		if (env('state', 'start') == 'exit') {
-			return;
-		}
 		if ($this->_timer === -1) {
 			$this->_timer = Timer::tick(1000, fn() => $this->waite());
 		}
@@ -92,12 +105,12 @@ class PDO implements StopHeartbeatCheck
 	private function waite(): void
 	{
 		try {
-			if (env('state', 'start') == 'exit') {
-				Kiri::getDi()->get(Logger::class)->critical('timer end');
+			if ($this->_timer == -1) {
 				$this->stopHeartbeatCheck();
 			}
 			if (time() - $this->_last > (int)Config::get('databases.pool.tick', 60)) {
 				$this->stopHeartbeatCheck();
+
 				$this->pdo = null;
 			}
 		} catch (\Throwable $throwable) {
@@ -313,7 +326,7 @@ class PDO implements StopHeartbeatCheck
 		$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)) {
+		if (!empty($this->attributes)) {
 			foreach ($this->attributes as $key => $attribute) {
 				$link->setAttribute($key, $attribute);
 			}

Traits/Builder.php

@@ -12,7 +12,7 @@ use Database\Query;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 
 

Traits/QueryTrait.php

@@ -18,7 +18,7 @@ use Database\Query;
 use Database\SqlBuilder;
 use Exception;
 use Kiri\Exception\NotFindClassException;
-use Kiri\Kiri;
+use Kiri;
 use ReflectionException;
 
 /**