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

Add notnull property to <group> tag in conditions

Browse source
This commit is contained in:
Kijin Sung 2025-05-29 23:08:05 +09:00
parent fda92b368d
commit 6e325526c8
5 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -286,6 +286,7 @@ class DBQueryParser extends BaseParser
$group->conditions = self::_parseConditions($tag);
$group->pipe = strtoupper($attribs['pipe'] ?? '') ?: 'AND';
$group->ifvar = $attribs['if'] ?? null;
$group->not_null = ($attribs['notnull'] ?? false) ? true : false;
$result[] = $group;
}
elseif ($name === 'query')

1
common/framework/parsers/dbquery/ConditionGroup.php
View file

@ -10,4 +10,5 @@ class ConditionGroup
public $conditions = array();
public $pipe = 'AND';
public $ifvar;
public $not_null;
}

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

@ -580,6 +580,10 @@ class Query extends VariableBase
{
$result .= ($result === '' ? '' : (' ' . $condition->pipe . ' ')) . '(' . $condition_string . ')';
}
elseif ($condition->not_null)
{
throw new \Rhymix\Framework\Exceptions\QueryError('Condition group marked as NOT NULL must contain at least one valid condition');
}
}
// Simple condition