eee

Command.php

@@ -148,8 +148,7 @@ class Command extends Component
 			}
 		}
 
-		$errorMsg = 'Max retry exceeded for SQL: ' . $this->sql;
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
-		return $this->getLogger()->logCategory($errorMsg, 'mysql');
 	}
 
 
@@ -213,8 +212,7 @@ class Command extends Component
 			}
 		}
 
-		$errorMsg = 'Max retry exceeded for SQL: ' . $this->sql;
+		return $this->getLogger()->logCategory('Max retry exceeded for SQL: ' . $this->sql, 'mysql');
-		return $this->getLogger()->logCategory($errorMsg, 'mysql');
 	}
 
 

Connection.php

@@ -154,7 +154,7 @@ class Connection extends Component
     /**
      * @return string
      */
-    private function getName(): string
+    public function getName(): string
     {
         return strtolower($this->driver) . '.' . $this->cds;
     }

DatabasesProviders.php

@@ -35,7 +35,7 @@ class DatabasesProviders extends Providers
             return;
         }
         foreach ($databases as $key => $database) {
-            $this->set($key, $this->_settings($database));
+            $this->set($key, $this->_settings($key, $database));
         }
     }
 
@@ -63,15 +63,16 @@ class DatabasesProviders extends Providers
     }
 
 
-    /**
+	/**
-     * @param array $database
+	 * @param string $key
-     * @return array
+	 * @param array  $database
-     */
+	 * @return array
-    private function _settings(array $database): array
+	 */
+    private function _settings(string $key, array $database): array
     {
         $clientPool = $database['pool'] ?? ['min' => 1, 'max' => 5, 'tick' => 60];
         return [
-            'id'          => $database['id'],
+            'id'          => $key,
             'cds'         => $database['cds'],
             'class'       => Connection::class,
             'username'    => $database['username'],

SqlBuilder.php

@@ -19,240 +19,244 @@ use Database\Traits\QueryTrait;
 class SqlBuilder extends Component
 {
 
-    /**
+	/**
-     * @var ActiveQuery|Query|ISqlBuilder|null
+	 * @var ActiveQuery|Query|ISqlBuilder|null
-     */
+	 */
-    public ActiveQuery|Query|ISqlBuilder|null $query;
+	public ActiveQuery|Query|ISqlBuilder|null $query;
 
 
-    /**
+	/**
-     * @param ActiveQuery|Query|ISqlBuilder|null $config
+	 * @param ActiveQuery|Query|ISqlBuilder|null $config
-     */
+	 */
-    public function __construct(ActiveQuery|Query|null|ISqlBuilder $config)
+	public function __construct(ActiveQuery|Query|null|ISqlBuilder $config)
-    {
+	{
-        parent::__construct();
+		parent::__construct();
 
-        $this->query = $config;
+		$this->query = $config;
-    }
+	}
 
 
-    /**
+	/**
-     * @param ISqlBuilder|null $query
+	 * @param ISqlBuilder|null $query
-     * @return $this
+	 * @return $this
-     * @throws
+	 * @throws
-     */
+	 */
-    public static function builder(ISqlBuilder|null $query): static
+	public static function builder(ISqlBuilder|null $query): static
-    {
+	{
-        return new static($query);
+		return new static($query);
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function getCondition(): string
+	public function getCondition(): string
-    {
+	{
-        return $this->where($this->query->where);
+		return $this->where($this->query->where);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $compiler
+	 * @param array $compiler
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function hashCompiler(array $compiler): string
+	public function hashCompiler(array $compiler): string
-    {
+	{
-        return $this->where($compiler);
+		return $this->where($compiler);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array $attributes
-     * @return bool|array
+	 * @return bool|array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function update(array $attributes): bool|string
+	public function update(array $attributes): bool|string
-    {
+	{
-        $conditions  = $this->query;
+		$params              = $this->query->params;
-        $this->query = [];
+		$this->query->params = [];
-        $data        = $this->__updateBuilder($this->makeParams($attributes));
+		$array               = $this->makeParams($attributes);
-        foreach ($conditions as $condition) {
+		foreach ($params as $name => $value) {
-            $this->query->pushParam($condition);
+			$this->query->pushParam($value);
-        }
+		}
-        return $data;
+		return $this->__updateBuilder($array);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array  $attributes
-     * @param string $opera
+	 * @param string $opera
-     * @return bool|array
+	 * @return bool|array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function mathematics(array $attributes, string $opera = '+'): bool|string
+	public function mathematics(array $attributes, string $opera = '+'): bool|string
-    {
+	{
-        $string = [];
+		$string = [];
-        foreach ($attributes as $attribute => $value) {
+		foreach ($attributes as $attribute => $value) {
-            $string[] = $attribute . '=' . $attribute . $opera . $value;
+			$string[] = $attribute . '=' . $attribute . $opera . $value;
-        }
+		}
-        return $this->__updateBuilder($string);
+		return $this->__updateBuilder($string);
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $string
+	 * @param array $string
-     * @return string|bool
+	 * @return string|bool
-     * @throws
+	 * @throws
-     */
+	 */
-    private function __updateBuilder(array $string): string|bool
+	private function __updateBuilder(array $string): string|bool
-    {
+	{
-        if (empty($string)) {
+		if (empty($string)) {
-            return Kiri::getLogger()->logCategory('None data update.');
+			return Kiri::getLogger()->logCategory('None data update.');
-        }
+		}
-        return 'UPDATE ' . $this->getFromAlias() . ' SET ' . implode(',', $string) . $this->make();
+
-    }
+		return 'UPDATE ' . $this->getFromAlias() . ' ' . 'SET' . ' ' . implode(', ', $string) . ' ' . $this->make();
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array $attributes
-     * @param false $isBatch
+	 * @param false $isBatch
-     * @return array
+	 * @return array
-     * @throws
+	 * @throws
-     */
+	 */
-    public function insert(array $attributes, bool $isBatch = false): string
+	public function insert(array $attributes, bool $isBatch = false): string
-    {
+	{
-        $update = 'INSERT INTO ' . $this->getFromAlias();
+		$update = 'INSERT INTO ' . $this->getFromAlias();
-        if ($isBatch === false) {
+		if ($isBatch === false) {
-            $attributes = [$attributes];
+			$attributes = [$attributes];
-        }
+		}
-        $update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
+		$update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
 
-        $keys = [];
+		$keys = [];
-        foreach ($attributes as $attribute) {
+		foreach ($attributes as $attribute) {
-            $_keys = $this->makeParams($attribute, true);
+			$_keys = $this->makeParams($attribute, true);
 
-            $keys[] = implode(',', $_keys);
+			$keys[] = implode(',', $_keys);
-        }
+		}
-        return $update . '(' . implode('),(', $keys) . ')';
+		return $update . '(' . implode('),(', $keys) . ')';
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function delete(): string
+	public function delete(): string
-    {
+	{
-        return 'DELETE FROM ' . $this->getFromAlias() . $this->make();
+		return 'DELETE FROM ' .
-    }
+			$this->getFromAlias() . ' ' .
+			$this->make();
+	}
 
 
-    /**
+	/**
-     * @param $attributes
+	 * @param $attributes
-     * @return array
+	 * @return array
-     */
+	 */
-    #[Pure] private function getFields(array $attributes): array
+	#[Pure]
-    {
+	private function getFields(array $attributes): array
-        return array_keys(current($attributes));
+	{
-    }
+		return array_keys(current($attributes));
+	}
 
 
-    /**
+	/**
-     * @param array $attributes
+	 * @param array $attributes
-     * @param bool $isInsert
+	 * @param bool  $isInsert
-     * @return array[]
+	 * @return array[]
-     * a=:b,
+	 * a=:b,
-     */
+	 */
-    private function makeParams(array $attributes, bool $isInsert = false): array
+	private function makeParams(array $attributes, bool $isInsert = false): array
-    {
+	{
-        $keys = [];
+		$keys = [];
-        foreach ($attributes as $key => $value) {
+		foreach ($attributes as $key => $value) {
-            if ($isInsert === true) {
+			if ($isInsert === true) {
-                $keys[] = '?';
+				$keys[] = '?';
-                $this->query->pushParam($value);
+				$this->query->pushParam($value);
-            } else {
+			} else {
-                $keys = $this->resolveParams($key, $value, $keys);
+				$keys = $this->resolveParams($key, $value, $keys);
-            }
+			}
-        }
+		}
-        return $keys;
+		return $keys;
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $key
+	 * @param string $key
-     * @param mixed $value
+	 * @param mixed  $value
-     * @param array $keys
+	 * @param array  $keys
-     * @return array
+	 * @return array
-     */
+	 */
-    private function resolveParams(string $key, mixed $value, array $keys): array
+	private function resolveParams(string $key, mixed $value, array $keys): array
-    {
+	{
-        if (is_null($value)) {
+		if (is_null($value)) {
-            return $keys;
+			return $keys;
-        }
+		}
-        if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
+		if (preg_match('/^[+|-]\s\d+$/', (string)$value)) {
-            $keys[] = $key . '=' . $key . ' ' . $value;
+			$keys[] = $key . '=' . $key . ' ' . $value;
-        } else {
+		} else {
-            $this->query->pushParam($value);
+			$this->query->pushParam($value);
-            $keys[] = $key . '= ?';
+			$keys[] = $key . '= ?';
-        }
+		}
-        return $keys;
+		return $keys;
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function one(): string
+	public function one(): string
-    {
+	{
-        $this->query->offset(0)->limit(1);
+		$this->query->offset(0)->limit(1);
-        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
+		return $this->all();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function all(): string
+	public function all(): string
-    {
+	{
-        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
+		return $this->makeSelect($this->query) . ' ' . $this->make() . ' ' . $this->makeLimit();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function count(): string
+	public function count(): string
-    {
+	{
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+		return $this->makeSelect(['COUNT(*)']) . ' ' . $this->make();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function exists(): string
+	public function exists(): string
-    {
+	{
-        return $this->makeSelect(['0']) . $this->make();
+		return $this->makeSelect(['0']) . ' ' . $this->make();
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $table
+	 * @param string $table
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function columns(string $table): string
+	public function columns(string $table): string
-    {
+	{
-        $driver = $this->getDriver();
+		$driver = $this->getDriver();
-        if (in_array($driver, ['pgsql', 'postgresql'])) {
+		if (in_array($driver, ['pgsql', 'postgresql'])) {
-            $tableName = trim($table, '"`');
+			$tableName = trim($table, '"`');
-            return "SELECT 
+			return "SELECT 
                 column_name as Field,
                 data_type as Type,
                 is_nullable as Null,
@@ -262,194 +266,191 @@ class SqlBuilder extends Component
             FROM information_schema.columns 
             WHERE table_name = '$tableName' 
             ORDER BY ordinal_position";
-        }
+		}
-        return 'SHOW FULL FIELDS FROM ' . $table;
+		return 'SHOW FULL FIELDS FROM ' . $table;
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    private function make(): string
+	private function make(): string
-    {
+	{
-        $select = $this->makeCondition();
+		return $this->makeCondition() . ' ' . $this->makeGroup() . ' ' . $this->makeOrder();
-        $select .= $this->makeGroup();
+	}
-        $select .= $this->makeOrder();
-        return $select;
-    }
 
-    /**
+	/**
-     * @param mixed $select 列名数组或 QueryTrait 对象
+	 * @param mixed $select 列名数组或 QueryTrait 对象
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeSelect(mixed $select = ['*']): string
+	private function makeSelect(mixed $select = ['*']): string
-    {
+	{
-        if (!is_array($select)) {
+		if (!is_array($select)) {
-            $select = ['*'];
+			$select = ['*'];
-        }
+		}
-        $sql = "SELECT " . implode(',', $select) . " FROM " . $this->getFromAlias();
+		$sql = 'SELECT ' . implode(',', $select) . ' FROM ' . $this->getFromAlias();
-        if ($this->query->join !== []) {
+		if ($this->query->join !== []) {
-            $sql .= ' ' . implode(' ', $this->query->join);
+			$sql .= ' ' . implode(' ', $this->query->join);
-        }
+		}
-        return $sql;
+		return $sql;
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeGroup(): string
+	private function makeGroup(): string
-    {
+	{
-        if ($this->query->group !== '' && $this->query->group !== '0') {
+		if ($this->query->group !== '' && $this->query->group !== '0') {
-            return ' GROUP BY ' . $this->query->group;
+			return 'GROUP BY ' . $this->query->group;
-        }
+		}
-        return '';
+		return '';
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeOrder(): string
+	private function makeOrder(): string
-    {
+	{
-        if (count($this->query->order) > 0) {
+		if (count($this->query->order) > 0) {
-            return ' ORDER BY ' . implode(',', $this->query->order);
+			return 'ORDER BY ' . implode(',', $this->query->order);
-        }
+		}
-        return '';
+		return '';
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     */
+	 */
-    private function makeCondition(): string
+	private function makeCondition(): string
-    {
+	{
-        $condition = $this->where($this->query->where);
+		$condition = $this->where($this->query->where);
-        if (empty($condition)) {
+		if (empty($condition)) {
-            return '';
+			return '';
-        }
+		}
-        return ' WHERE ' . $condition;
+		return 'WHERE ' . $condition;
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    private function makeLimit(): string
+	private function makeLimit(): string
-    {
+	{
-        if ($this->query->offset >= 0 && $this->query->limit >= 1) {
+		if ($this->query->offset >= 0 && $this->query->limit >= 1) {
-            $driver = $this->getDriver();
+			$driver = $this->getDriver();
-            if (in_array($driver, ['pgsql', 'postgresql'])) {
+			if (in_array($driver, ['pgsql', 'postgresql'])) {
-                return ' LIMIT ' . $this->query->limit . ' OFFSET ' . $this->query->offset;
+				return 'LIMIT ' . $this->query->limit . ' OFFSET ' . $this->query->offset;
-            }
+			}
-            return ' LIMIT ' . $this->query->offset . ',' . $this->query->limit;
+			return 'LIMIT ' . $this->query->offset . ',' . $this->query->limit;
-        }
+		}
-        return '';
+		return '';
-    }
+	}
 
 
-    /**
+	/**
-     * @param false $isCount
+	 * @param false $isCount
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function get(bool $isCount = false): string
+	public function get(bool $isCount = false): string
-    {
+	{
-        if ($isCount === false) {
+		if ($isCount === false) {
-            return $this->all();
+			return $this->all();
-        }
+		}
-        return $this->count();
+		return $this->count();
-    }
+	}
 
 
-    /**
+	/**
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    public function truncate(): string
+	public function truncate(): string
-    {
+	{
-        return sprintf('TRUNCATE %s', $this->getFromAlias());
+		return sprintf('TRUNCATE %s', $this->getFromAlias());
-    }
+	}
 
 
-    /**
+	/**
-     * @param array $where
+	 * @param array $where
-     * @return string
+	 * @return string
-     */
+	 */
-    private function where(array $where): string
+	private function where(array $where): string
-    {
+	{
-        if (count($where) < 1) {
+		if (count($where) < 1) {
-            return '';
+			return '';
-        }
+		}
-        $_tmp = [];
+		$_tmp = [];
-        foreach ($where as $key => $value) {
+		foreach ($where as $key => $value) {
-            $_tmp[] = $this->resolveCondition($key, $value);
+			$_tmp[] = $this->resolveCondition($key, $value);
-        }
+		}
-        return implode(' AND ', $_tmp);
+		return implode(' AND ', $_tmp);
-    }
+	}
 
 
-    /**
+	/**
-     * @param string $field
+	 * @param string $field
-     * @param mixed $condition
+	 * @param mixed  $condition
-     * @return string
+	 * @return string
-     */
+	 */
-    private function resolveCondition(string|int $field, mixed $condition): string
+	private function resolveCondition(string|int $field, mixed $condition): string
-    {
+	{
-        if (is_string($field)) {
+		if (is_string($field)) {
-            $this->query->pushParam($condition);
+			$this->query->pushParam($condition);
-            return $field . ' = ?';
+			return $field . ' = ?';
-        } else if (is_string($condition)) {
+		} else if (is_string($condition)) {
-            return $condition;
+			return $condition;
-        } else {
+		} else {
-            return implode(' AND ', $this->_hashMap($condition));
+			return implode(' AND ', $this->_hashMap($condition));
-        }
+		}
-    }
+	}
 
 
-    /**
+	/**
-     * @param $condition
+	 * @param $condition
-     * @return array
+	 * @return array
-     */
+	 */
-    private function _hashMap(array $condition): array
+	private function _hashMap(array $condition): array
-    {
+	{
-        $_array = [];
+		$_array = [];
-        foreach ($condition as $key => $value) {
+		foreach ($condition as $key => $value) {
-            $this->query->pushParam($value);
+			$this->query->pushParam($value);
-            $_array[] = $key . '= ?';
+			$_array[] = $key . '= ?';
-        }
+		}
-        return $_array;
+		return $_array;
-    }
+	}
 
-    /**
+	/**
-     * 获取数据库驱动类型
+	 * 获取数据库驱动类型
-     * @return string
+	 * @return string
-     * @throws
+	 * @throws
-     */
+	 */
-    private function getDriver(): string
+	private function getDriver(): string
-    {
+	{
-        try {
+		try {
-            if ($this->query instanceof ActiveQuery && $this->query->modelClass !== null) {
+			if ($this->query instanceof ActiveQuery && $this->query->modelClass !== null) {
-                if ($this->query->modelClass instanceof Model) {
+				if ($this->query->modelClass instanceof Model) {
-                    $connection = $this->query->modelClass->getConnection();
+					$connection = $this->query->modelClass->getConnection();
-                    if ($connection instanceof Connection) {
+					if ($connection instanceof Connection) {
-                        return strtolower($connection->driver ?? 'mysql');
+						return strtolower($connection->driver ?? 'mysql');
-                    }
+					}
-                }
+				}
-            }
+			}
-            if (method_exists($this->query, 'getConnection')) {
+			if (method_exists($this->query, 'getConnection')) {
-                $connection = $this->query->getConnection();
+				$connection = $this->query->getConnection();
-                if ($connection instanceof Connection) {
+				if ($connection instanceof Connection) {
-                    return strtolower($connection->driver ?? 'mysql');
+					return strtolower($connection->driver ?? 'mysql');
-                }
+				}
-            }
+			}
-        } catch (\Throwable $e) {
+		} catch (\Throwable $e) {
 			$this->getLogger()->json_log($e);
 		}
-        return 'mysql';
+		return 'mysql';
-    }
+	}
 
 
 	/**

Traits/QueryTrait.php

@@ -116,6 +116,18 @@ abstract class QueryTrait extends Component implements ActiveQueryInterface, ISq
 	}
 
 
+	public function __get(string $name)
+	{
+		if (property_exists($this, $name)) {
+			return $this->$name;
+		}
+		if (method_exists($this, $name)) {
+			return $this->$name();
+		}
+		return parent::__get($name); // TODO: Change the autogenerated stub
+	}
+
+
 	/**
 	 * Comply constructor.
 	 * @throws