mirzaev
/
yii2-arangodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

between

This commit is contained in:
evgen-d 2014-11-11 11:36:42 +03:00
parent acaf1780bc
commit aa4b83ee58
1 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Query.php
View File

@ -24,6 +24,7 @@ class Query extends Component implements QueryInterface
'OR' => 'buildAndCondition', 'OR' => 'buildAndCondition',
'IN' => 'buildInCondition', 'IN' => 'buildInCondition',
'LIKE' => 'buildLikeCondition', 'LIKE' => 'buildLikeCondition',
'BETWEEN' => 'buildBetweenCondition',
]; ];
protected $conditionMap = [ protected $conditionMap = [
@ -433,6 +434,34 @@ class Query extends Component implements QueryInterface
return '(' . implode(', ', $columns) . ") {$this->conditionMap[$operator]} [" . implode(', ', $vss) . ']'; return '(' . implode(', ', $columns) . ") {$this->conditionMap[$operator]} [" . implode(', ', $vss) . ']';
} }
/**
* Creates an SQL expressions with the `BETWEEN` operator.
* @param string $operator the operator to use
* @param array $operands the first operand is the column name. The second and third operands
* describe the interval that column value should be in.
* @param array $params the binding parameters to be populated
* @return string the generated AQL expression
* @throws InvalidParamException if wrong number of operands have been given.
*/
public function buildBetweenCondition($operator, $operands, &$params)
{
if (!isset($operands[0], $operands[1], $operands[2])) {
throw new InvalidParamException("Operator '$operator' requires three operands.");
}
list($column, $value1, $value2) = $operands;
if (strpos($column, '(') === false) {
$column = $this->quoteColumnName($column);
}
$phName1 = self::PARAM_PREFIX . count($params);
$params[$phName1] = $value1;
$phName2 = self::PARAM_PREFIX . count($params);
$params[$phName2] = $value2;
return "$column >= @$phName1 && $column <= @$phName2";
}
/** /**
* @param $operator * @param $operator
* @param $condition * @param $condition
@ -574,12 +603,12 @@ class Query extends Component implements QueryInterface
$search = []; $search = [];
$replace = []; $replace = [];
foreach ($values as $key => $value) { foreach ($values as $key => $value) {
$search[] = "@$key"; $search[] = "/@\b$key\b/";
$replace[] = is_string($value) ? "\"$value\"" : json_encode($value); $replace[] = is_string($value) ? "\"$value\"" : json_encode($value);
} }
if (count($search)) { if (count($search)) {
$query = str_replace($search, $replace, $query); $query = preg_replace($search, $replace, $query);
} }
return $query; return $query;
@ -1061,6 +1090,12 @@ class Query extends Component implements QueryInterface
return []; return [];
} }
break; break;
case 'BETWEEN':
if ((array_key_exists(1, $condition) && $this->isEmpty($condition[1]))
|| (array_key_exists(2, $condition) && $this->isEmpty($condition[2]))) {
return [];
}
break;
default: default:
throw new NotSupportedException("Operator not supported: $operator"); throw new NotSupportedException("Operator not supported: $operator");
} }