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

Fix inconsistent handling of empty string in INSERT/UPDATE queries

Browse source
This commit is contained in:
Kijin Sung 2020-07-02 16:04:05 +09:00
parent 54375d16ad
commit 945c09059a
4 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
common/framework/parsers/dbquery/emptystring.php Normal file
View file

@ -0,0 +1,14 @@
<?php
namespace Rhymix\Framework\Parsers\DBQuery;
/**
* Empty string class.
*/
class EmptyString
{
public function __toString(): string
{
return "''";
}
}

14
common/framework/parsers/dbquery/nullvalue.php Normal file
View file

@ -0,0 +1,14 @@
<?php
namespace Rhymix\Framework\Parsers\DBQuery;
/**
* Null value class.
*/
class NullValue
{
public function __toString(): string
{
return 'NULL';
}
}

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

@ -603,11 +603,12 @@ class Query extends VariableBase
* Check if a variable is considered valid for XE compatibility.
*
* @param mixed $var
* @param bool $allow_empty_string
* @return bool
*/
public static function isValidVariable($var): bool
public static function isValidVariable($var, $allow_empty_string = true): bool
{
if ($var === null || $var === '')
if ($var === null || ($var === '' && !$allow_empty_string))
{
return false;
}

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

@ -39,11 +39,19 @@ class VariableBase
$value = '(' . $this->getQueryString($prefix, $args) . ')';
$params = $this->getQueryParams();
}
elseif ($this->var && Query::isValidVariable($args[$this->var]))
elseif ($this->var && Query::isValidVariable($args[$this->var], $this instanceof ColumnWrite))
{
$this->filterValue($args[$this->var]);
$is_expression = false;
$value = $args[$this->var];
if ($args[$this->var] instanceof EmptyString || $args[$this->var] instanceof NullValue)
{
$value = strval($args[$this->var]);
$is_expression = true;
}
else
{
$value = $args[$this->var];
$is_expression = false;
}
}
elseif ($this->default !== null)
{
@ -257,7 +265,7 @@ class VariableBase
*/
public function getValue(array $args)
{
if ($this->var && Query::isValidVariable($args[$this->var]))
if ($this->var && Query::isValidVariable($args[$this->var], $this instanceof ColumnWrite))
{
$is_expression = false;
$value = $args[$this->var];