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

Fix #1339 function in default value not working in new DB

Browse source
This commit is contained in:
Kijin Sung 2020-07-04 17:41:20 +09:00
parent b0eb42c2f9
commit aab715f9e5
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
common/framework/parsers/dbquery/variablebase.php
View file

@ -82,6 +82,12 @@ class VariableBase
$value = explode(',', preg_replace('/[\s\']/', '', $value));
}
// Restrict operators for write queries.
if ($this instanceof ColumnWrite && $this->operation && !in_array($this->operation, ['equal', 'plus', 'minus', 'multiply']))
{
throw new \Rhymix\Framework\Exceptions\QueryError('Operation ' . $this->operation . ' is not valid for column in an INSERT or UPDATE query');
}
// Apply the operator.
switch ($this->operation)
{
@ -298,12 +304,15 @@ class VariableBase
*/
public function getDefaultValue()
{
// Get the current column name.
$column = $this instanceof ColumnWrite ? $this->name : $this->column;
// If the default value is a column name, escape it.
if (strpos($this->default, '.') !== false && Query::isValidColumnName($this->default))
{
return [true, Query::quoteName($this->default)];
}
elseif (isset($this->column) && preg_match('/_srl$/', $this->column) && !is_numeric($this->default))
elseif (isset($column) && preg_match('/_srl$/', $column) && !is_numeric($this->default))
{
return [true, Query::quoteName($this->default)];
}
@ -329,16 +338,16 @@ class VariableBase
}
// If the default value is a calculation based on the current value, return a query string.
if (isset($this->column) && preg_match('/^(plus|minus|multiply)\(([0-9]+)\)$/', $this->default, $matches))
if (isset($column) && preg_match('/^(plus|minus|multiply)\(([0-9]+)\)$/', $this->default, $matches))
{
switch ($matches[1])
{
case 'plus':
return [true, sprintf('%s + %d', Query::quoteName($this->column), $matches[2])];
return [true, sprintf('%s + %d', Query::quoteName($column), $matches[2])];
case 'minus':
return [true, sprintf('%s - %d', Query::quoteName($this->column), $matches[2])];
return [true, sprintf('%s - %d', Query::quoteName($column), $matches[2])];
case 'multiply':
return [true, sprintf('%s * %d', Query::quoteName($this->column), $matches[2])];
return [true, sprintf('%s * %d', Query::quoteName($column), $matches[2])];
}
}
@ -355,7 +364,7 @@ class VariableBase
public function filterValue($value)
{
// Don't apply a filter if there is no variable.
$column = isset($this->column) ? $this->column : $this->name;
$column = $this instanceof ColumnWrite ? $this->name : $this->column;
$filter = isset($this->filter) ? $this->filter : '';
if (strval($value) === '')
{