fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Wrap count query if there is a subquery column #1575

Browse source
This commit is contained in:
Kijin Sung 2021-01-24 11:00:09 +09:00
parent efcf6b1dfe
commit 9bedd75a37
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/parsers/dbquery/query.php
View file

@ -117,6 +117,7 @@ class Query extends VariableBase
{ {
// Initialize the query string. // Initialize the query string.
$result = 'SELECT'; $result = 'SELECT';
$has_subquery_columns = false;
// Compose the column list. // Compose the column list.
if ($this->_column_list) if ($this->_column_list)
@ -138,6 +139,7 @@ class Query extends VariableBase
$this->_params[] = $param; $this->_params[] = $param;
} }
$columns[] = sprintf('(%s) AS %s', $subquery, self::quoteName($column->alias)); $columns[] = sprintf('(%s) AS %s', $subquery, self::quoteName($column->alias));
$has_subquery_columns = true;
} }
elseif ($column->is_expression && !$column->is_wildcard) elseif ($column->is_expression && !$column->is_wildcard)
{ {
@ -154,7 +156,7 @@ class Query extends VariableBase
// Replace the column list if this is a count-only query. // Replace the column list if this is a count-only query.
if ($count_only) if ($count_only)
{ {
$count_wrap = ($this->groupby || $this->select_distinct || preg_match('/\bDISTINCT\b/i', $column_list)); $count_wrap = ($this->groupby || $this->select_distinct || $has_subquery_columns || preg_match('/\bDISTINCT\b/i', $column_list));
if ($count_wrap) if ($count_wrap)
{ {
if ($column_list === '*' || preg_match('/\\.\\*/', $column_list)) if ($column_list === '*' || preg_match('/\\.\\*/', $column_list))