Skip to content

Commit e4abb78

Browse files
committed
Nested convert queries
1 parent fb5d523 commit e4abb78

2 files changed

Lines changed: 3 additions & 46 deletions

File tree

src/Database/Database.php

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6756,15 +6756,15 @@ public function getLimitForIndexes(): int
67566756
*/
67576757
public static function convertQueries(Document $collection, array $queries): array
67586758
{
6759-
foreach ($queries as $i => $query) {
6759+
foreach ($queries as $index => $query) {
67606760
if ($query->isNested()) {
67616761
$values = self::convertQueries($collection, $query->getValues());
67626762
$query->setValues($values);
67636763
}
67646764

67656765
$query = self::convertQuery($collection, $query);
67666766

6767-
$queries[$i] = $query;
6767+
$queries[$index] = $query;
67686768
}
67696769

67706770
return $queries;
@@ -6811,49 +6811,6 @@ public static function convertQuery(Document $collection, Query $query): Query
68116811
return $query;
68126812
}
68136813

6814-
// /**
6815-
// * @param Document $collection
6816-
// * @param array<Query> $queries
6817-
// * @return array<Query>
6818-
// * @throws QueryException
6819-
// * @throws Exception
6820-
// */
6821-
// public function convertQueries2(Document $collection, array $queries): array
6822-
// {
6823-
// $attributes = $collection->getAttribute('attributes', []);
6824-
//
6825-
// foreach (Database::INTERNAL_ATTRIBUTES as $attribute) {
6826-
// $attributes[] = new Document($attribute);
6827-
// }
6828-
//
6829-
// foreach ($attributes as $attribute) {
6830-
// foreach ($queries as $query) {
6831-
// if ($query->getAttribute() === $attribute->getId()) {
6832-
// $query->setOnArray($attribute->getAttribute('array', false));
6833-
// }
6834-
// }
6835-
//
6836-
// if ($attribute->getAttribute('type') == Database::VAR_DATETIME) {
6837-
// foreach ($queries as $index => $query) {
6838-
// if ($query->getAttribute() === $attribute->getId()) {
6839-
// $values = $query->getValues();
6840-
// foreach ($values as $valueIndex => $value) {
6841-
// try {
6842-
// $values[$valueIndex] = DateTime::setTimezone($value);
6843-
// } catch (\Throwable $e) {
6844-
// throw new QueryException($e->getMessage(), $e->getCode(), $e);
6845-
// }
6846-
// }
6847-
// $query->setValues($values);
6848-
// $queries[$index] = $query;
6849-
// }
6850-
// }
6851-
// }
6852-
// }
6853-
//
6854-
// return $queries;
6855-
// }
6856-
68576814
/**
68586815
* @return array<array<string, mixed>>
68596816
*/

tests/e2e/Adapter/Scopes/AttributeTests.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1689,7 +1689,7 @@ public function testCreateDatetime(): void
16891689
]),
16901690
]);
16911691

1692-
$this->assertEquals(999,111);
1692+
$this->assertEquals(999, 111);
16931693

16941694
}
16951695
}

0 commit comments

Comments
 (0)