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

#1517 보완: 유닛 테스트 결과를 동일하게 유지하면서 일부 로직 최적화

Browse source
This commit is contained in:
Kijin Sung 2021-01-02 23:01:27 +09:00
parent 09456462f4
commit 74d2575db7
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -452,10 +452,18 @@ class VariableBase
$value = str_replace('"', '"', $value); $value = str_replace('"', '"', $value);
$keywords = preg_split('/(\([^\)]*?\))|(\-?\"[^\"]*?\")|[\s,]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE); $keywords = preg_split('/(\([^\)]*?\))|(\-?\"[^\"]*?\")|[\s,]+/', trim($value), 10, \PREG_SPLIT_NO_EMPTY | \PREG_SPLIT_DELIM_CAPTURE);
$conditions = array(); $conditions = array();
$operators = array('AND', 'OR', '|'); $operators = array('AND' => 'AND', 'OR' => 'OR', '|' => 'OR');
// loop the parsed keywords or operators // loop the parsed keywords or operators
foreach ($keywords as $item) foreach ($keywords as $item)
{ {
// Skip empty items
$item = trim($item);
if ($item === '')
{
continue;
}
// treat parenthesis // treat parenthesis
if (substr($item, 0, 1) === '(' && substr($item, -1) === ')') if (substr($item, 0, 1) === '(' && substr($item, -1) === ')')
{ {
@ -471,20 +479,14 @@ class VariableBase
} }
// process 'AND' or 'OR' operator // process 'AND' or 'OR' operator
if (in_array($item, $operators)) if (isset($operators[$item]))
{ {
if ($item === '|')
{
$item = 'OR';
}
// remove the last point (would be an operator) // remove the last point (would be an operator)
array_pop($conditions); array_pop($conditions);
$conditions[] = $item; $conditions[] = $operators[$item];
} }
else else
{ {
$item = str_replace('"', '"', $item);
if (substr($item, 0, 1) === '-') if (substr($item, 0, 1) === '-')
{ {
$conditions[] = sprintf('%s NOT LIKE ?', $column); $conditions[] = sprintf('%s NOT LIKE ?', $column);
@ -496,23 +498,19 @@ class VariableBase
} }
// trim quotation mark // trim quotation mark
if (substr($item, 0, 6) === substr($item, -6) && substr($item, -6) === '"') if (preg_match('/^"(.*)"$/', $item, $matches))
{ {
$item = substr($item, 6, -6); $item = $matches[1];
} }
// pass blank text // Escape and add to parameter list
if (trim($item) === "") $params[] = '%' . str_replace(['"', '\\', '_', '%'], ['"', '\\\\', '\_', '\%'], $item) . '%';
{
array_pop($conditions);
continue;
}
$params[] = '%' . str_replace(['\\', '_', '%'], ['\\\\', '\_', '\%'], $item) . '%';
// if there is no operator, assume 'AND' // if there is no operator, assume 'AND'
$conditions[] = 'AND'; $conditions[] = 'AND';
} }
} }
// remove the last point (would be an operator) // remove the last point (would be an operator)
array_pop($conditions); array_pop($conditions);
$conditions = implode(' ', $conditions); $conditions = implode(' ', $conditions);