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

Misc fixes for compatibility with existing XML queries and schemas

Browse source
This commit is contained in:
Kijin Sung 2020-06-30 14:43:42 +09:00
parent fa220fb1e1
commit 85df901924
7 changed files with 68 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

28
common/framework/parsers/dbqueryparser.php
View file

@ -105,15 +105,16 @@ class DBQueryParser extends BaseParser
}
else
{
$attribs = self::_getAttributes($tag);
$column = new DBQuery\ColumnWrite;
$column->name = trim($tag['name']);
$column->operation = trim($tag['operation']) ?: 'equal';
$column->var = trim($tag['var']) ?: null;
$column->default = trim($tag['default']) ?: null;
$column->not_null = self::_getAttributes($tag)['notnull'] ? true : false;
$column->filter = trim($tag['filter']) ?: null;
$column->minlength = intval(trim($tag['minlength']), 10);
$column->maxlength = intval(trim($tag['maxlength']), 10);
$column->name = $attribs['name'];
$column->operation = $attribs['operation'] ?: 'equal';
$column->var = $attribs['var'] ?? null;
$column->default = $attribs['default'] ?? null;
$column->not_null = $attribs['notnull'] ? true : false;
$column->filter = $attribs['filter'] ?? null;
$column->minlength = intval($attribs['minlength'], 10);
$column->maxlength = intval($attribs['maxlength'], 10);
$query->columns[] = $column;
}
}
@ -215,8 +216,15 @@ class DBQueryParser extends BaseParser
$cond = new DBQuery\Condition;
$cond->operation = $attribs['operation'];
$cond->column = $attribs['column'];
$cond->var = $attribs['var'] ?? null;
$cond->default = $attribs['default'] ?? null;
if (isset($attribs['var']) && !isset($attribs['default']) && preg_match('/^\w+\.\w+$/', $attribs['var']))
{
$cond->default = $attribs['var'];
}
else
{
$cond->var = $attribs['var'] ?? null;
$cond->default = $attribs['default'] ?? null;
}
$cond->not_null = $attribs['notnull'] ? true : false;
$cond->filter = $attribs['filter'] ?? null;
$cond->minlength = intval($attribs['minlength'], 10);