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

Compare commits

merge into: mirzaev:stable
Branches Tags
mirzaev:stable
mirzaev:2.1.x
mirzaev:2.1.2
mirzaev:2.1.1
mirzaev:2.1.0
mirzaev:2.0.5
mirzaev:2.0.4
mirzaev:2.0.3
mirzaev:2.0.2
mirzaev:2.0.1
mirzaev:2.0.0
mirzaev:1.0.1
mirzaev:1.0.0
...
pull from: mirzaev:2.1.x
Branches Tags
mirzaev:stable
mirzaev:2.1.x
mirzaev:2.1.2
mirzaev:2.1.1
mirzaev:2.1.0
mirzaev:2.0.5
mirzaev:2.0.4
mirzaev:2.0.3
mirzaev:2.0.2
mirzaev:2.0.1
mirzaev:2.0.0
mirzaev:1.0.1
mirzaev:1.0.0

9 Commits
stable ... 2.1.x

Author SHA1 Message Date
Arsen Mirzaev Tatyano-Muradovich 8c8d34f5b2 Исправление версии пакета (без изменений) 2021-07-26 05:29:30 +10:00
Arsen Mirzaev Tatyano-Muradovich 96c80c1a77 Возможность создавать бесконечное количество FOR (foreach) 2021-07-26 05:27:33 +10:00
Arsen Mirzaev Tatyano-Muradovich 03bff66b62 Тест доступа к репозиторию 2021-06-30 14:44:54 +10:00
Arsen Mirzaev Tatyano-Muradovich b92e8792f0 Добавление фильтра STARTS_WIDTH для регистронезависимого поиска 2021-06-29 09:07:43 +10:00
Arsen Mirzaev Tatyano-Muradovich cbc26916ea Исправления 2021-04-12 05:27:43 +10:00
Arsen Mirzaev Tatyano-Muradovich b3a5b7b51f Исправление ошибок 2021-04-11 11:51:59 +10:00
Arsen Mirzaev Tatyano-Muradovich 778513b3bb Исправление ошибок и обработка for 2021-04-11 11:48:55 +10:00
Arsen Mirzaev Tatyano-Muradovich eb5e18dfd6 Исправление ошибки в genQuery() 2021-04-11 03:30:56 +10:00
Arsen Mirzaev Tatyano-Muradovich bb7b1b8f8e Улучшение логики запросов 2021-04-11 02:39:51 +10:00
4 changed files with 127 additions and 48 deletions
Show Stats Expand all files Collapse all files

2
composer.json
View File

@ -42,4 +42,4 @@
"mirzaev\\yii2\\arangodb\\tests\\": "mirzaev/yii2/arangodb/tests"
}
}
}
}

2
mirzaev/yii2/arangodb/ActiveQuery.php
View File

@ -103,9 +103,11 @@ class ActiveQuery extends Query implements ActiveQueryInterface
public function all($db = null)
{
$statement = $this->createCommand($db);
$token = $this->getRawAql($statement);
Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try {
Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute();

2
mirzaev/yii2/arangodb/Migration.php
View File

@ -23,7 +23,7 @@ abstract class Migration extends Component implements MigrationInterface
{
parent::init();
$this->db = Instance::ensure($this->db, Connection::class;
$this->db = Instance::ensure($this->db, Connection::class);
}
public function execute($aql, $bindValues = [], $params = [])

169
mirzaev/yii2/arangodb/Query.php
View File

@ -81,6 +81,18 @@ class Query extends Component implements QueryInterface
*/
public string $searchType = 'START';
/**
* Поиск
*
* [свойство => его значение]
*/
public array $filter;
/**
* Тип поиска
*/
public string $filterType = 'START';
public $orderBy;
public $indexBy;
@ -229,14 +241,21 @@ class Query extends Component implements QueryInterface
return $this;
}
/**
*/
public function filter(array $text, string $type = 'START'): self
{
$this->filter = $text;
$this->filterType = $type;
return $this;
}
/**
* Обойти коллекцию вершин по направлению
*
* Генерация AQL выражения
*
* @see https://www.arangodb.com/docs/3.7/aql/operations-let.html
*
* @param mixed $vertex Коллекция вершин из которой требуется обход
* @param string $direction Направление ('INBOUND', 'OUTBOUND', 'ANY')
*/
@ -253,24 +272,43 @@ class Query extends Component implements QueryInterface
return $this;
}
/**
* Проверка типа и конвертация
*/
protected static function checkArrayAndConvert(string|array $text): string
{
if (is_array($text)) {
return self::convertArrayToString($text);
}
return $text;
}
/**
* Конвертация в строку
*/
protected static function convertArrayToString(array $text): string
{
// Очистка
array_walk($text, 'trim');
// Конвертация
return implode(", ", $text);
}
/**
* Генерация AQL конструкции "FOR"
*
* Примеры:
* 1. "FOR account"
* 2. "FOR account, account_edge_supply"
*
*/
protected static function genFor(string|array $for): string
{
if (is_array($for)) {
// Если передан массив, то конвертировать в строку
// Очистка элементов через trim()
array_walk($for, 'trim');
// Конвертация
$for = implode(", ", $for);
$for = self::convertArrayToString($for);
}
// Генерация
@ -368,19 +406,17 @@ class Query extends Component implements QueryInterface
foreach ($conditions as $condition) {
// Перебор выражений
genForeach_recursion:
foreach ($condition as $FOR => $IN) {
// Инициализация операндов
if (is_int($FOR) && is_array($IN)) {
// Вложенный массив (неожиданные входные данные)
// Реинициализация
$condition = $IN;
// !!! Вход в рекурсию !!!
// Обработка вложенного массива
$aql .= ' ' . $this->genForeach([$IN]);
// Перебор вложенного массива
goto genForeach_recursion;
continue;
}
$aql .= "FOR $FOR IN $IN ";
@ -819,23 +855,24 @@ class Query extends Component implements QueryInterface
protected function genQuery($query = null, array $params = [])
{
// Инициализация
isset($query) ? $query : $query = $this;
$this->in ?? (isset($this->collection) ? $this->in = $this->collection : throw new Exception('Не найдена коллекция'));
$this->for ?? $this->for = $this->in;
$this->collection ?? $this->collection = $this->in;
$query ?? $query = $this;
$query->in ?? $query->in = $query->collection ?? throw new Exception('Не найдена коллекция');
$query->for ?? $query->for = $query->in;
$query->collection ?? $query->collection = self::checkArrayAndConvert($query->for);
$params = array_merge($params, $query->params);
$clauses = [
static::genFor($query->for ?? $query->collection),
static::genIn($query->in ?? $query->collection, $query->traversals),
static::genLet($query->lets),
$this->genForeach($query->foreach),
$this->genWhere($query->where, $params),
isset($this->search) ? $this->genSearch($this->search, $this->searchType) : null,
$this->genOrderBy($query->orderBy, $params),
$this->genLimit($query->limit, $query->offset, $params),
$this->genSelect($query->select, $params),
$query::genFor($query->for),
$query::genIn($query->in, $query->traversals),
$query::genLet($query->lets),
$query->genForeach($query->foreach),
$query->genWhere($query->where, $params),
isset($query->search) ? $query->genSearch($query->search, $query->searchType) : null,
isset($query->filter) ? $query->genFilter($query->filter, $query->filterType) : null,
$query->genOrderBy($query->orderBy, $params),
$query->genLimit($query->limit, $query->offset, $params),
$query->genSelect($query->select, $params),
];
$aql = implode($query->separator, array_filter($clauses));
@ -874,9 +911,11 @@ class Query extends Component implements QueryInterface
public function all($db = null)
{
$statement = $this->createCommand($db);
$token = $this->getRawAql($statement);
Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try {
Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute();
@ -885,6 +924,7 @@ class Query extends Component implements QueryInterface
Yii::endProfile($token, 'mirzaev\yii2\arangodb\Query::query');
throw new Exception($ex->getMessage(), (int) $ex->getCode(), $ex);
}
return $this->prepareResult($cursor->getAll());
}
@ -894,10 +934,13 @@ class Query extends Component implements QueryInterface
public function one($db = null)
{
$this->limit(1);
$statement = $this->createCommand($db);
$token = $this->getRawAql($statement);
Yii::info($token, 'mirzaev\yii2\arangodb\Query::query');
try {
Yii::beginProfile($token, 'mirzaev\yii2\arangodb\Query::query');
$cursor = $statement->execute();
@ -922,13 +965,13 @@ class Query extends Component implements QueryInterface
public function insert($columns, $params = [], $db = null)
{
// Инициализация
$this->in ?? (isset($this->collection) ? $this->in = $this->collection : throw new Exception('Не найдена коллекция'));
$this->in ?? $this->in = $this->collection ?? throw new Exception('Не найдена коллекция');
$this->collection ?? $this->collection = $this->in;
$data = Serializer::encode($columns);
$clauses = [
"INSERT $data IN {$this->quoteCollectionName($this->in ?? $this->collection)}",
"INSERT $data IN {$this->quoteCollectionName($this->collection)}",
$this->genOptions(),
];
@ -968,15 +1011,15 @@ class Query extends Component implements QueryInterface
public function update($columns, $params = [], $db = null)
{
// Инициализация
$this->in ?? (isset($this->collection) ? $this->in = $this->collection : throw new Exception('Не найдена коллекция'));
$this->in ?? $this->in = $this->collection ?? throw new Exception('Не найдена коллекция');
$this->for ?? $this->for = $this->in;
$this->collection ?? $this->collection = $this->in;
$this->collection ?? $this->collection = self::checkArrayAndConvert($this->for);
$clauses = [
static::genFor($this->for ?? $this->collection),
static::genIn($this->in ?? $this->collection, $this->traversals),
static::genFor($this->for),
static::genIn($this->in, $this->traversals),
$this->genWhere($this->where, $params),
$this->genUpdate($this->collection, $columns),
$this->genUpdate($this->in, $columns),
$this->genOptions(),
];
@ -1020,15 +1063,15 @@ class Query extends Component implements QueryInterface
public function remove($params = [], $db = null)
{
// Инициализация
$this->in ?? (isset($this->collection) ? $this->in = $this->collection : throw new Exception('Не найдена коллекция'));
$this->in ?? $this->in = $this->collection ?? throw new Exception('Не найдена коллекция');
$this->for ?? $this->for = $this->in;
$this->collection ?? $this->collection = $this->in;
$this->collection ?? $this->collection = self::checkArrayAndConvert($this->for);
$clauses = [
static::genFor($this->for ?? $this->collection),
static::genIn($this->in ?? $this->collection, $this->traversals),
static::genFor($this->for),
static::genIn($this->in, $this->traversals),
$this->genWhere($this->where, $params),
$this->genRemove($this->in ?? $this->collection),
$this->genRemove($this->in),
$this->genOptions(),
];
@ -1091,6 +1134,24 @@ class Query extends Component implements QueryInterface
return match (strtoupper($type)) {
'START', 'STARTS', 'STARTS_WITH' => $query . $this->filterStartsWith($expression),
'START_SENSETIVE' => $query . $this->filterStartsWith($expression, sensetive: true),
'CONTAINS', 'LIKE' => $query . $this->filterContains($expression),
default => $query . Serializer::encode($expression)
};
}
/**
* @param $collection
* @param $columns
* @return string
*/
protected function genFilter(array $expression, string $type = 'START'): string
{
$query = 'FILTER ';
return match (strtoupper($type)) {
'START', 'STARTS', 'STARTS_WITH' => $query . $this->filterStartsWith($expression),
'START_SENSETIVE' => $query . $this->filterStartsWith($expression, sensetive: true),
'CONTAINS', 'LIKE' => $query . $this->filterContains($expression),
default => $query . Serializer::encode($expression)
};
@ -1133,8 +1194,6 @@ class Query extends Component implements QueryInterface
*
* Генерация AQL выражения
*
* @see https://www.arangodb.com/docs/3.7/aql/operations-let.html
*
* @param string $direction Направление
* @param mixed $vertex Коллекция вершин из которой требуется обход
*/
@ -1279,7 +1338,7 @@ class Query extends Component implements QueryInterface
{
$this->foreach = match (true) {
empty($this->foreach) => [$expression],
default => $this->foreach []= [$expression]
default => $this->foreach[] = [$expression]
};
return $this;
@ -1375,20 +1434,38 @@ class Query extends Component implements QueryInterface
return $this;
}
public function filterStartsWith(array $expression): string
public function filterStartsWith(array $expression, bool $sensetive = false): string
{
// Генерация
foreach ($expression as $key => $value) {
if (isset($return)) {
$return .= ' OR STARTS_WITH(' . $this->quoteCollectionName($this->collection) . ".$key, \"$value\")";
if ($sensetive) {
if (isset($return)) {
$return .= ' OR STARTS_WITH(' . $this->filterLower($this->quoteCollectionName($this->collection) . ".$key") . ", " . $this->filterLower("\"$value\"") . ")";
} else {
$return = 'STARTS_WITH(' . $this->filterLower($this->quoteCollectionName($this->collection) . ".$key") . ", " . $this->filterLower("\"$value\"") . ")";
}
} else {
$return = 'STARTS_WITH(' . $this->quoteCollectionName($this->collection) . ".$key, \"$value\")";
if (isset($return)) {
$return .= ' OR STARTS_WITH(' . $this->quoteCollectionName($this->collection) . ".$key, \"$value\")";
} else {
$return = 'STARTS_WITH(' . $this->quoteCollectionName($this->collection) . ".$key, \"$value\")";
}
}
}
return $return;
}
public function filterUpper(string $target): string
{
return "UPPER($target)";
}
public function filterLower(string $target): string
{
return "LOWER($target)";
}
public function filterContains(array $expression): string
{
// Инициализация