as2252258/kiri-databases
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
向林
2021-11-09 13:58:08 +08:00
parent f8718fa4de
commit 8c98ce8c7f
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SqlBuilder.php
+7 -5
View File
@@ -240,7 +240,7 @@ class SqlBuilder extends Component
if (empty($this->query->from) && !empty($this->query->modelClass)) {
$this->query->from($this->query->getTable());
}
return $this->_prefix();
return $this->_prefix(false, true);
}
@@ -256,14 +256,15 @@ class SqlBuilder extends Component
/**
* @param bool $hasOrder
* @param bool $isCount
* @return string
* @throws Exception
*/
private function _prefix(bool $hasOrder = false): string
private function _prefix(bool $hasOrder = false, bool $isCount = false): string
{
$select = '';
if (!empty($this->query->from)) {
$select = $this->_selectPrefix();
$select = $this->_selectPrefix($isCount);
}
$select = $this->_wherePrefix($select);
if (!empty($this->query->attributes) && is_array($this->query->attributes)) {
@@ -302,12 +303,13 @@ class SqlBuilder extends Component
/**
* @param bool $isCount
* @return string
* @throws Exception
*/
private function _selectPrefix(): string
private function _selectPrefix(bool $isCount): string
{
$select = $this->builderSelect($this->query->select) . ' FROM ' . $this->tableName();
$select = $this->builderSelect($this->query->select, $isCount) . ' FROM ' . $this->tableName();
if (!empty($this->query->alias)) {
$select .= $this->builderAlias($this->query->alias);
}