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

Fix duplicate condition when joined subquery contains <conditions>

Browse source 
https://xetown.com/questions/1795994
This commit is contained in:
Kijin Sung 2023-11-21 22:13:17 +09:00
parent e9be06ef6b
commit ad5c3c0f5c
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
common/framework/parsers/DBQueryParser.php
View file

@ -59,6 +59,7 @@ class DBQueryParser extends BaseParser
if (trim($tag['query'] ?? '') === 'true')
{
$table = self::_parseQuery($tag);
$table_type = 'subquery';
$query->tables[$table->alias] = $table;
}
else
@ -67,12 +68,13 @@ class DBQueryParser extends BaseParser
$table->name = trim($tag['name']);
$table->alias = trim($tag['alias'] ?? '') ?: null;
$table->ifvar = trim($tag['if'] ?? '') ?: null;
$table_type = 'default';
}
$table_type = trim($tag['type'] ?? '');
if (stripos($table_type, 'join') !== false)
$join_type = trim($tag['type'] ?? '');
if ($table_type !== 'subquery' && stripos($join_type, 'join') !== false)
{
$table->join_type = strtoupper($table_type);
$table->join_type = strtoupper($join_type);
if ($tag->conditions)
{
$table->join_conditions = self::_parseConditions($tag->conditions);