eee

Base/Model.php

@@ -487,6 +487,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, \
 			return TRUE;
 		}
 		$generate = SqlBuilder::builder($query)->update($change);
+		var_dump($generate, $query->params);
 		if ($generate === FALSE) {
 			return FALSE;
 		}

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');
 	}
 
 
@@ -180,6 +179,8 @@ class Command extends Component
 				if (($prepare = $client->prepare($this->sql)) === false) {
 					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
 				}
+
+
 				if ($prepare->execute($this->params) === false) {
 					throw new Exception('(' . $prepare->errorInfo()[0] . ')' . $prepare->errorInfo()[2]);
 				}
@@ -213,8 +214,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;
     }
@@ -372,9 +372,9 @@ class Connection extends Component
         ];
         
         // MySQL 特定的选项
-        if ($driver === 'mysql') {
+//        if ($driver === 'mysql') {
-            $options[\PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $this->charset;
+//            $options[\PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES ' . $this->charset;
-        }
+//        }
         
         $pdo = new PDO($this->database, $this->cds, $this->username, $this->password, $options, $driver);
         foreach ($this->attributes as $key => $attribute) {

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));
         }
     }
 
@@ -64,14 +64,15 @@ class DatabasesProviders extends Providers
 
 
 	/**
+	 * @param string $key
 	 * @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

@@ -75,13 +75,13 @@ class SqlBuilder extends Component
 	 */
 	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);
 	}
 
 
@@ -111,7 +111,8 @@ class SqlBuilder extends Component
 		if (empty($string)) {
 			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();
 	}
 
 
@@ -123,7 +124,7 @@ class SqlBuilder extends Component
 	 */
 	public function insert(array $attributes, bool $isBatch = false): string
 	{
-        $update = 'INSERT INTO ' . $this->getFromAlias();
+		$update = 'INSERT INTO ' . $this->getFromAlias(true);
 		if ($isBatch === false) {
 			$attributes = [$attributes];
 		}
@@ -145,7 +146,7 @@ class SqlBuilder extends Component
 	 */
 	public function delete(): string
 	{
-        return 'DELETE FROM ' . $this->getFromAlias() . $this->make();
+		return 'DELETE FROM ' . $this->getFromAlias() . ' ' . $this->make();
 	}
 
 
@@ -153,7 +154,8 @@ class SqlBuilder extends Component
 	 * @param $attributes
 	 * @return array
 	 */
-    #[Pure] private function getFields(array $attributes): array
+	#[Pure]
+	private function getFields(array $attributes): array
 	{
 		return array_keys(current($attributes));
 	}
@@ -208,7 +210,7 @@ class SqlBuilder extends Component
 	public function one(): string
 	{
 		$this->query->offset(0)->limit(1);
-        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
+		return $this->all();
 	}
 
 
@@ -218,7 +220,7 @@ class SqlBuilder extends Component
 	 */
 	public function all(): string
 	{
-        return $this->makeSelect($this->query) . $this->make() . $this->makeLimit();
+		return $this->makeSelect($this->query->select) . ' ' . $this->make() . ' ' . $this->makeLimit();
 	}
 
 
@@ -228,7 +230,7 @@ class SqlBuilder extends Component
 	 */
 	public function count(): string
 	{
-        return $this->makeSelect(['COUNT(*)']) . $this->make();
+		return $this->makeSelect(['COUNT(*)']) . ' ' . $this->make();
 	}
 
 
@@ -238,7 +240,7 @@ class SqlBuilder extends Component
 	 */
 	public function exists(): string
 	{
-        return $this->makeSelect(['0']) . $this->make();
+		return $this->makeSelect(['0']) . ' ' . $this->make();
 	}
 
 
@@ -273,10 +275,7 @@ class SqlBuilder extends Component
 	 */
 	private function make(): string
 	{
-        $select = $this->makeCondition();
+		return $this->makeCondition() . ' ' . $this->makeGroup() . ' ' . $this->makeOrder();
-        $select .= $this->makeGroup();
-        $select .= $this->makeOrder();
-        return $select;
 	}
 
 	/**
@@ -288,7 +287,7 @@ class SqlBuilder extends Component
 		if (!is_array($select)) {
 			$select = ['*'];
 		}
-        $sql = "SELECT " . implode(',', $select) . " FROM " . $this->getFromAlias();
+		$sql = 'SELECT ' . implode(',', $select) . ' FROM ' . $this->getFromAlias();
 		if ($this->query->join !== []) {
 			$sql .= ' ' . implode(' ', $this->query->join);
 		}
@@ -457,9 +456,13 @@ class SqlBuilder extends Component
 	 * QueryTrait 对象有 $from 和 $alias 属性
 	 * @return string
 	 */
-	private function getFromAlias(): string
+	private function getFromAlias(bool $insert = false): string
 	{
 		$from = $this->query->from;
+		if ($insert) {
+			return $from;
+		}
+
 		if ($this->query->alias !== '' && $this->query->alias !== '0') {
 			$from .= ' AS ' . $this->query->alias;
 		}

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