diff --git a/Database/ActiveQuery.php b/Database/ActiveQuery.php
index 38fb85fb..22b27dc7 100644
--- a/Database/ActiveQuery.php
+++ b/Database/ActiveQuery.php
@@ -309,10 +309,11 @@ class ActiveQuery extends Component implements ISqlBuilder
     }
 
 
-    /**
-     * @return bool
-     * @throws Exception
-     */
+	/**
+	 * @param bool $getSql
+	 * @return string|bool
+	 * @throws Exception
+	 */
     public function delete($getSql = false): string|bool
     {
         $sql = $this->builder->delete();
diff --git a/Database/SqlBuilder.php b/Database/SqlBuilder.php
index bdbe595d..37289f92 100644
--- a/Database/SqlBuilder.php
+++ b/Database/SqlBuilder.php
@@ -17,315 +17,319 @@ use Snowflake\Abstracts\Component;
 class SqlBuilder extends Component
 {
 
-    use Builder;
+	use Builder;
 
 
-    public ActiveQuery|Query|null $query;
+	public ActiveQuery|Query|null $query;
 
 
-    /**
-     * @param $query
-     * @return $this
-     */
-    public static function builder(ISqlBuilder|null $query): static
-    {
-        return new static(['query' => $query]);
-    }
+	/**
+	 * @param $query
+	 * @return $this
+	 */
+	public static function builder(ISqlBuilder|null $query): static
+	{
+		return new static(['query' => $query]);
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function getCondition(): string
-    {
-        return $this->conditionToString();
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function getCondition(): string
+	{
+		return $this->conditionToString();
+	}
 
 
-    /**
-     * @param array $attributes
-     * @return bool|array
-     * @throws Exception
-     */
-    public function update(array $attributes): bool|array
-    {
-        [$string, $array] = $this->builderParams($attributes);
-        if (empty($string) || empty($array)) {
-            return $this->addError('None data update.');
-        }
+	/**
+	 * @param array $attributes
+	 * @return bool|array
+	 * @throws Exception
+	 */
+	public function update(array $attributes): bool|array
+	{
+		[$string, $array] = $this->builderParams($attributes);
+		if (empty($string) || empty($array)) {
+			return $this->addError('None data update.');
+		}
 
-        $condition = $this->conditionToString();
-        if (!empty($condition)) {
-            $condition = ' WHERE ' . $condition;
-        }
+		$condition = $this->conditionToString();
+		if (!empty($condition)) {
+			$condition = ' WHERE ' . $condition;
+		}
 
-        $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
-        $update .= $this->builderLimit($this->query);
+		$update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
+		$update .= $this->builderLimit($this->query);
 
-        return [$update, $array];
-    }
+		return [$update, $array];
+	}
 
 
-    /**
-     * @param array $attributes
-     * @param string $opera
-     * @return bool|array
-     * @throws Exception
-     */
-    public function mathematics(array $attributes, $opera = '+'): bool|array
-    {
-        $string = $array = [];
+	/**
+	 * @param array $attributes
+	 * @param string $opera
+	 * @return bool|array
+	 * @throws Exception
+	 */
+	public function mathematics(array $attributes, $opera = '+'): bool|array
+	{
+		$string = $array = [];
 
-        foreach ($attributes as $attribute => $value) {
-            $string[] = $attribute . '=' . $attribute . $opera . $value;
-        }
+		foreach ($attributes as $attribute => $value) {
+			$string[] = $attribute . '=' . $attribute . $opera . $value;
+		}
 
-        if (empty($string)) {
-            return $this->addError('None data update.');
-        }
+		if (empty($string)) {
+			return $this->addError('None data update.');
+		}
 
-        $condition = $this->conditionToString();
-        if (!empty($condition)) {
-            $condition = ' WHERE ' . $condition;
-        }
+		$condition = $this->conditionToString();
+		if (!empty($condition)) {
+			$condition = ' WHERE ' . $condition;
+		}
 
-        $update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
-        $update .= $this->builderLimit($this->query);
+		$update = 'UPDATE ' . $this->tableName() . ' SET ' . implode(',', $string) . $condition;
+		$update .= $this->builderLimit($this->query);
 
-        return [$update, []];
-    }
+		return [$update, []];
+	}
 
 
-    /**
-     * @param array $attributes
-     * @param false $isBatch
-     * @return array
-     * @throws Exception
-     */
-    public function insert(array $attributes, $isBatch = false): array
-    {
-        $update = sprintf('INSERT INTO %s', $this->tableName());
-        if ($isBatch === false) {
-            $attributes = [$attributes];
-        }
-        $update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
+	/**
+	 * @param array $attributes
+	 * @param false $isBatch
+	 * @return array
+	 * @throws Exception
+	 */
+	public function insert(array $attributes, $isBatch = false): array
+	{
+		$update = sprintf('INSERT INTO %s', $this->tableName());
+		if ($isBatch === false) {
+			$attributes = [$attributes];
+		}
+		$update .= '(' . implode(',', $this->getFields($attributes)) . ') VALUES ';
 
-        $order = 0;
-        $keys = $params = [];
-        foreach ($attributes as $attribute) {
-            [$_keys, $params] = $this->builderParams($attribute, true, $params, $order);
+		$order = 0;
+		$keys = $params = [];
+		foreach ($attributes as $attribute) {
+			[$_keys, $params] = $this->builderParams($attribute, true, $params, $order);
 
-            $keys[] = implode(',', $_keys);
-            $order++;
-        }
-        return [$update . '(' . implode('),(', $keys) . ')', $params];
-    }
+			$keys[] = implode(',', $_keys);
+			$order++;
+		}
+		return [$update . '(' . implode('),(', $keys) . ')', $params];
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function delete()
-    {
-        $delete = sprintf('DELETE FROM %s ', $this->query->modelClass::getTable());
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function delete(): string
+	{
+		$delete = sprintf('DELETE FROM %s ', $this->query->modelClass::getTable());
 
-        $this->query->from = null;
+		$this->query->from = null;
 
-        return $delete . ' WHERE ' . $this->_prefix(true);
-    }
+		return $delete . ' WHERE ' . $this->_prefix(true);
+	}
 
 
-    /**
-     * @param $attributes
-     * @return array
-     */
-    #[Pure] private function getFields($attributes): array
-    {
-        return array_keys(current($attributes));
-    }
+	/**
+	 * @param $attributes
+	 * @return array
+	 */
+	#[Pure] private function getFields($attributes): array
+	{
+		return array_keys(current($attributes));
+	}
 
 
-    /**
-     * @param array $attributes
-     * @param bool $isInsert
-     * @param array $params
-     * @param int $order
-     * @return array[]
-     * a=:b,
-     */
-    private function builderParams(array $attributes, bool $isInsert = false, $params = [], $order = 0): array
-    {
-        $keys = [];
-        foreach ($attributes as $key => $value) {
-            if ($isInsert === true) {
-                $keys[] = ':' . $key . $order;
-            } else {
-                $keys[] = $key . '=:' . $key . $order;
-            }
-            $params[$key . $order] = $value;
-        }
-        return [$keys, $params];
-    }
+	/**
+	 * @param array $attributes
+	 * @param bool $isInsert
+	 * @param array $params
+	 * @param int $order
+	 * @return array[]
+	 * a=:b,
+	 */
+	private function builderParams(array $attributes, bool $isInsert = false, $params = [], $order = 0): array
+	{
+		$keys = [];
+		foreach ($attributes as $key => $value) {
+			if ($isInsert === true) {
+				$keys[] = ':' . $key . $order;
+			} else {
+				$keys[] = $key . '=:' . $key . $order;
+			}
+			$params[$key . $order] = $value;
+		}
+		return [$keys, $params];
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function one(): string
-    {
-        $this->query->limit(0, 1);
-        if (empty($this->query->from) && !empty($this->query->modelClass)) {
-            $this->query->from($this->query->getTable());
-        }
-        return $this->_prefix(true);
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function one(): string
+	{
+		$this->query->limit(0, 1);
+		if (empty($this->query->from) && !empty($this->query->modelClass)) {
+			$this->query->from($this->query->getTable());
+		}
+		return $this->_prefix(true);
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function all(): string
-    {
-        if (empty($this->query->from) && !empty($this->query->modelClass)) {
-            $this->query->from($this->query->getTable());
-        }
-        return $this->_prefix(true);
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function all(): string
+	{
+		if (empty($this->query->from) && !empty($this->query->modelClass)) {
+			$this->query->from($this->query->getTable());
+		}
+		return $this->_prefix(true);
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function count(): string
-    {
-        if (empty($this->query->from) && !empty($this->query->modelClass)) {
-            $this->query->from($this->query->getTable());
-        }
-        return $this->_prefix();
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function count(): string
+	{
+		if (empty($this->query->from) && !empty($this->query->modelClass)) {
+			$this->query->from($this->query->getTable());
+		}
+		return $this->_prefix();
+	}
 
 
-    /**
-     * @param $table
-     * @return string
-     */
-    public function columns($table): string
-    {
-        return 'SHOW FULL FIELDS FROM ' . $table;
-    }
+	/**
+	 * @param $table
+	 * @return string
+	 */
+	public function columns($table): string
+	{
+		return 'SHOW FULL FIELDS FROM ' . $table;
+	}
 
 
-    /**
-     * @param bool $hasOrder
-     * @return string
-     * @throws Exception
-     */
-    private function _prefix($hasOrder = false): string
-    {
-        $select = '';
-        if (!empty($this->query->from)) {
-            $select = $this->_selectPrefix();
-        }
-        $select = $this->_wherePrefix($select);
-        if (!empty($this->query->group)) {
-            $select .= $this->builderGroup($this->query->group);
-        }
-        if ($hasOrder === true && !empty($this->query->order)) {
-            $select .= $this->builderOrder($this->query->order);
-        }
-        return $select . $this->builderLimit($this->query);
-    }
+	/**
+	 * @param bool $hasOrder
+	 * @return string
+	 * @throws Exception
+	 */
+	private function _prefix($hasOrder = false): string
+	{
+		$select = '';
+		if (!empty($this->query->from)) {
+			$select = $this->_selectPrefix();
+		}
+		$select = $this->_wherePrefix($select);
+		if (!empty($this->query->attributes) && is_array($this->query->attributes)) {
+			$select = strtr($select, $this->query->attributes);
+		}
+
+		if (!empty($this->query->group)) {
+			$select .= $this->builderGroup($this->query->group);
+		}
+		if ($hasOrder === true && !empty($this->query->order)) {
+			$select .= $this->builderOrder($this->query->order);
+		}
+		return $select . $this->builderLimit($this->query);
+	}
 
 
-    /**
-     * @param $select
-     * @return string
-     * @throws Exception
-     */
-    private function _wherePrefix($select): string
-    {
-        $condition = $this->conditionToString();
-        if (empty($condition)) {
-            return $select;
-        } else if (empty($select)) {
-            return $condition;
-        }
-        return sprintf('%s WHERE %s', $select, $condition);
-    }
+	/**
+	 * @param $select
+	 * @return string
+	 * @throws Exception
+	 */
+	private function _wherePrefix($select): string
+	{
+		$condition = $this->conditionToString();
+		if (empty($condition)) {
+			return $select;
+		} else if (empty($select)) {
+			return $condition;
+		}
+		return sprintf('%s WHERE %s', $select, $condition);
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    private function _selectPrefix(): string
-    {
-        $select = $this->builderSelect($this->query->select) . ' FROM ' . $this->tableName();
-        if (!empty($this->query->alias)) {
-            $select .= $this->builderAlias($this->query->alias);
-        }
-        if (!empty($this->query->join)) {
-            $select .= $this->builderJoin($this->query->join);
-        }
-        return $select;
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	private function _selectPrefix(): string
+	{
+		$select = $this->builderSelect($this->query->select) . ' FROM ' . $this->tableName();
+		if (!empty($this->query->alias)) {
+			$select .= $this->builderAlias($this->query->alias);
+		}
+		if (!empty($this->query->join)) {
+			$select .= $this->builderJoin($this->query->join);
+		}
+		return $select;
+	}
 
 
-    /**
-     * @param false $isCount
-     * @return string
-     * @throws Exception
-     */
-    public function get($isCount = false): string
-    {
-        if ($isCount === false) {
-            return $this->all();
-        }
-        return $this->count();
-    }
+	/**
+	 * @param false $isCount
+	 * @return string
+	 * @throws Exception
+	 */
+	public function get($isCount = false): string
+	{
+		if ($isCount === false) {
+			return $this->all();
+		}
+		return $this->count();
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function truncate(): string
-    {
-        return sprintf('TRUNCATE %s', $this->tableName());
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function truncate(): string
+	{
+		return sprintf('TRUNCATE %s', $this->tableName());
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    private function conditionToString(): string
-    {
-        return $this->where($this->query->where);
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	private function conditionToString(): string
+	{
+		return $this->where($this->query->where);
+	}
 
 
-    /**
-     * @return string
-     * @throws Exception
-     */
-    public function tableName(): string
-    {
-        if ($this->query->from instanceof \Closure) {
-            $this->query->from = sprintf('(%s)', $this->query->makeClosureFunction($this->query->from));
-        }
-        if ($this->query->from instanceof ActiveQuery) {
-            $this->query->from = sprintf('%s', SqlBuilder::builder($this->query->from)->get($this->query->from));
-        }
-        if (empty($this->query->from)) {
-            return $this->query->modelClass::getTable();
-        }
-        return $this->query->from;
-    }
+	/**
+	 * @return string
+	 * @throws Exception
+	 */
+	public function tableName(): string
+	{
+		if ($this->query->from instanceof \Closure) {
+			$this->query->from = sprintf('(%s)', $this->query->makeClosureFunction($this->query->from));
+		}
+		if ($this->query->from instanceof ActiveQuery) {
+			$this->query->from = sprintf('%s', SqlBuilder::builder($this->query->from)->get($this->query->from));
+		}
+		if (empty($this->query->from)) {
+			return $this->query->modelClass::getTable();
+		}
+		return $this->query->from;
+	}
 
 }