qqq

ActiveQuery.php

@@ -263,11 +263,7 @@ class ActiveQuery extends Component implements ISqlBuilder
 	 */
 	public function count(): int
 	{
-		$data = $this->execute($this->builder->count(), $this->attributes)->one();
+		return $this->execute($this->builder->count(), $this->attributes)->one()['row_count'] ?? 0;
-		if ($data && is_array($data)) {
-			return (int)array_shift($data);
-		}
-		return 0;
 	}
 
 

Connection.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 namespace Database;
 
 
+use Closure;
 use Database\Affair\BeginTransaction;
 use Database\Affair\Commit;
 use Database\Affair\Rollback;
@@ -96,9 +97,9 @@ class Connection extends Component
 
     /**
      * @param array $config
-     * @return \Closure
+     * @return Closure
      */
-    public function gender(array $config): \Closure
+    public function gender(array $config): Closure
     {
         return static function () use ($config) {
             $options = [

DatabasesProviders.php

@@ -32,7 +32,7 @@ class DatabasesProviders extends Providers
 			return;
 		}
 		foreach ($databases as $key => $database) {
-			$application->set('db.' . $key, Kiri::createObject($this->_settings($database)));
+			$application->set($key, Kiri::createObject($this->_settings($database)));
 		}
 	}
 
@@ -44,7 +44,7 @@ class DatabasesProviders extends Providers
 	 */
 	public function get($name): Connection
 	{
-		return Kiri::service()->get('db.' . $name);
+		return Kiri::service()->get($name);
 	}
 
 

Db.php

@@ -15,9 +15,11 @@ use Database\Affair\Commit;
 use Database\Affair\Rollback;
 use Database\Traits\QueryTrait;
 use Exception;
+use Kiri;
 use Kiri\Exception\ConfigException;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use Throwable;
 
 /**
  * Class Db
@@ -30,8 +32,31 @@ class Db implements ISqlBuilder
 
     private static bool $_inTransaction = false;
 
+
+    /**
+     * @var Connection|null
+     */
+    private ?Connection $connection = null;
+
+
+    /**
+     * @param string|Connection $dbname
+     * @return Db
+     * @throws \Exception
+     */
+    public static function connect(string|Connection $dbname): Db
+    {
+        $db = new Db();
+        if (is_string($dbname)) {
+            $dbname = Kiri::service()->get($dbname);
+        }
+        $db->connection = $dbname;
+        return $db;
+    }
+
     /**
      * @return void
+     * @throws Exception
      */
     public static function beginTransaction(): void
     {
@@ -52,7 +77,7 @@ class Db implements ISqlBuilder
         static::beginTransaction();
         try {
             $result = call_user_func($closure, ...$params);
-		} catch (\Throwable $throwable) {
+        } catch (Throwable $throwable) {
             error($throwable);
             $result = addError($throwable->getMessage(), 'mysql');
         } finally {
@@ -92,6 +117,7 @@ class Db implements ISqlBuilder
     public static function table($table): Db|static
     {
         $connection = new Db();
+        $connection->connection = current(\config('databases.connections'));
         $connection->from($table);
         return $connection;
     }
@@ -112,231 +138,85 @@ class Db implements ISqlBuilder
 
 
     /**
-	 * @param string $column
+     * @return array|bool
-	 * @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 $connection
-	 * @return mixed
      * @throws Exception
      */
-	public function get(Connection $connection = NULL): mixed
+    public function get(): array|bool
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand(SqlBuilder::builder($this)->all())->all();
-
-		return $connection->createCommand(SqlBuilder::builder($this)->one())
-			->all();
     }
 
     /**
-	 * @param $column
-	 * @return string
-	 */
-	public static function raw($column): string
-	{
-		return '`' . $column . '`';
-	}
-
-	/**
-	 * @param Connection|null $connection
      * @return array|bool|null
      * @throws Exception
      */
-	public function find(Connection $connection = NULL): array|bool|null
+    public function first(): array|bool|null
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand(SqlBuilder::builder($this)->all())->one();
-
-		return $connection->createCommand(SqlBuilder::builder($this)->all())
-			->one();
     }
 
     /**
-	 * @param Connection|NULL $connection
      * @return bool|int
      * @throws Exception
      */
-	public function count(Connection $connection = NULL): bool|int
+    public function count(): bool|int
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand(SqlBuilder::builder($this)->count())->one()['row_count'];
-
-		return $connection->createCommand(SqlBuilder::builder($this)->count())
-			->exec();
     }
 
     /**
-	 * @param Connection|NULL $connection
      * @return bool|int
      * @throws Exception
      */
-	public function exists(Connection $connection = NULL): bool|int
+    public function exists(): bool|int
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand(SqlBuilder::builder($this)->one())->fetchColumn();
-
-		return $connection->createCommand(SqlBuilder::builder($this)->one())
-			->fetchColumn();
     }
 
     /**
      * @param string $sql
      * @param array $attributes
-	 * @param Connection|null $connection
      * @return array|bool|int|string|null
      * @throws Exception
      */
-	public static function findAllBySql(string $sql, array $attributes = [], Connection $connection = NULL): int|bool|array|string|null
+    public function query(string $sql, array $attributes = []): int|bool|array|string|null
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand($sql, $attributes)->all();
-
-		return $connection->createCommand($sql, $attributes)->all();
     }
 
     /**
      * @param string $sql
      * @param array $attributes
-	 * @param Connection|NULL $connection
+     * @return array|bool|int|string|null
-	 * @return string|array|bool|int|null
      * @throws Exception
      */
-	public static function findBySql(string $sql, array $attributes = [], Connection $connection = NULL): string|array|bool|int|null
+    public function one(string $sql, array $attributes = []): int|bool|array|string|null
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand($sql, $attributes)->one();
-
-		return $connection->createCommand($sql, $attributes)->one();
     }
 
+
     /**
-	 * @param string $field
-	 * @return array|null
-	 * @throws Exception
-	 */
-	public function values(string $field): ?array
-	{
-		$data = $this->get();
-		if (empty($data) || empty($field)) {
-			return NULL;
-		}
-		$first = current($data);
-		if (!isset($first[$field])) {
-			return NULL;
-		}
-		return array_column($data, $field);
-	}
-
-	/**
-	 * @param $field
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public function value($field): mixed
-	{
-		$data = $this->find();
-		if (!empty($field) && isset($data[$field])) {
-			return $data[$field];
-		}
-		return $data;
-	}
-
-	/**
-	 * @param Connection|null $connection
      * @return bool|int
      * @throws ConfigException
      * @throws Exception
      */
-	public function delete(?Connection $connection = null): bool|int
+    public function delete(): bool|int
     {
-		$connection = static::getDefaultConnection($connection);
+        return $this->connection->createCommand(SqlBuilder::builder($this)->delete())->delete();
-
-		return $connection->createCommand($connection->getBuild()->builder($this))->delete();
     }
 
     /**
      * @param string $table
-	 * @param null $connection
-	 * @return bool|int
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public static function drop(string $table, $connection = null): bool|int
-	{
-		$connection = static::getDefaultConnection($connection);
-
-		$sprint = sprintf('DROP TABLE' . ' `%s`.`%s`', $connection->database, $table);
-		return $connection->createCommand($sprint)->delete();
-	}
-
-	/**
-	 * @param string $table
-	 * @param null $connection
-	 * @return bool|int
-	 * @throws Exception
-	 */
-	public static function truncate(string $table, $connection = null): bool|int
-	{
-		$connection = static::getDefaultConnection($connection);
-
-		$sprint = sprintf('TRUNCATE `%s`.`%s`', $connection->database, $table);
-		return $connection->createCommand($sprint)->exec();
-	}
-
-	/**
-	 * @param string $table
-	 * @param Connection|NULL $connection
-	 * @return array|bool|null
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public static function showCreateSql(string $table, Connection $connection = NULL): array|bool|null
-	{
-		$connection = static::getDefaultConnection($connection);
-
-		$sprint = sprintf('SHOW CREATE TABLE `%s`.`%s`', $connection->database, $table);
-		return $connection->createCommand($sprint)->one();
-	}
-
-	/**
-	 * @param string $table
-	 * @param Connection|NULL $connection
-	 * @return array|bool|null
-	 * @throws ConfigException
-	 * @throws Exception
-	 */
-	public static function desc(string $table, Connection $connection = NULL): array|bool
-	{
-		$connection = static::getDefaultConnection($connection);
-
-		$sprint = sprintf('SHOW FULL FIELDS FROM `%s`.`%s`', $connection->database, $table);
-		return $connection->createCommand($sprint)->all();
-	}
-
-
-	/**
-	 * @param string $table
-	 * @param Connection|NULL $connection
      * @return array|bool|null
      * @throws Exception
      */
-	public static function show(string $table, Connection $connection = NULL): array|bool|null
+    public static function show(string $table): array|bool|null
     {
         if ($table == '') {
             return null;
         }
-		$connection = static::getDefaultConnection($connection);
+        $connection = static::getDefaultConnection();
 
         $table = ['	const TABLE = \'select * from %s  where REFERENCED_TABLE_NAME=%s\';'];
         return $connection->createCommand((new Query())
@@ -353,7 +233,7 @@ class Db implements ISqlBuilder
      * @return mixed
      * @throws Exception
      */
-	public static function getDefaultConnection(?Connection $connection, string $name = 'db'): Connection
+    public static function getDefaultConnection(?Connection $connection = null, string $name = 'db'): Connection
     {
         if ($connection instanceof Connection) {
             return $connection;
@@ -362,7 +242,7 @@ class Db implements ISqlBuilder
         if (empty($databases) || !is_array($databases)) {
             throw new Exception('Please configure the database link.');
         }
-		return \Kiri::service()->get($databases[$name]);
+        return Kiri::service()->get($databases[$name]);
     }
 
 

SqlBuilder.php

@@ -229,7 +229,7 @@ class SqlBuilder extends Component
 	 */
 	public function count(): string
 	{
-		return $this->_selectPrefix(['COUNT(*)']) . $this->_prefix();
+		return $this->_selectPrefix(['COUNT(*) as row_count']) . $this->_prefix();
 	}