Skip to content

fetchAll getDocument #330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abnegate merged 9 commits into from
Oct 13, 2023
Merged

fetchAll getDocument #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e6f0e5f
Remove var_dump
fogelito Oct 4, 2023
d42a833
fetchall
fogelito Oct 8, 2023
75bddf5
lint
fogelito Oct 8, 2023
a5c66f5
Fetchall aggregations
fogelito Oct 10, 2023
12d93ff
typo
fogelito Oct 10, 2023
2547a37
closeCursor
fogelito Oct 10, 2023
a7bf3d1
Merge branch 'main' of github.com:utopia-php/database into fetchall-s…
fogelito Oct 12, 2023
9dd81c0
little big fix
fogelito Oct 12, 2023
c404815
Apply suggestions from code review
abnegate Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions src/Database/Adapter/MariaDB.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,6 +714,7 @@ public function updateDocument(string $collection, Document $document): Document
$permissionsStmt->bindValue(':_uid', $document->getId());
$permissionsStmt->execute();
$permissions = $permissionsStmt->fetchAll();
$permissionsStmt->closeCursor();

$initial = [];
foreach (Database::PERMISSIONS as $type) {
Expand Down Expand Up @@ -1098,6 +1099,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
}

$results = $stmt->fetchAll();
$stmt->closeCursor();

foreach ($results as $index => $document) {
if (\array_key_exists('_uid', $document)) {
Expand Down Expand Up @@ -1181,7 +1183,11 @@ public function count(string $collection, array $queries = [], ?int $max = null,

$stmt->execute();

$result = $stmt->fetch();
$result = $stmt->fetchAll();
$stmt->closeCursor();
if (!empty($result)) {
$result = $result[0];
}

return $result['sum'] ?? 0;
}
Expand Down Expand Up @@ -1238,7 +1244,11 @@ public function sum(string $collection, string $attribute, array $queries = [],

$stmt->execute();

$result = $stmt->fetch();
$result = $stmt->fetchAll();
$stmt->closeCursor();
if (!empty($result)) {
$result = $result[0];
}

return $result['sum'] ?? 0;
}
Expand Down
2 changes: 2 additions & 0 deletions src/Database/Adapter/Postgres.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ public function updateDocument(string $collection, Document $document): Document
$permissionsStmt->bindValue(':_uid', $document->getId());
$permissionsStmt->execute();
$permissions = $permissionsStmt->fetchAll();
$permissionsStmt->closeCursor();

$initial = [];
foreach (Database::PERMISSIONS as $type) {
Expand Down Expand Up @@ -1104,6 +1105,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
}

$results = $stmt->fetchAll();
$stmt->closeCursor();

foreach ($results as $index => $document) {
if (\array_key_exists('_uid', $document)) {
Expand Down
11 changes: 9 additions & 2 deletions src/Database/Adapter/SQL.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ public function exists(string $database, ?string $collection): bool

$stmt->execute();

$document = $stmt->fetch();
$document = $stmt->fetchAll();
$stmt->closeCursor();
if (!empty($document)) {
$document = $document[0];
}

return (($document[$select] ?? '') === $match) || // case insensitive check
(($document[strtolower($select)] ?? '') === $match);
Expand Down Expand Up @@ -121,12 +125,15 @@ public function getDocument(string $collection, string $id, array $queries = [])
$stmt->bindValue(':_uid', $id);
$stmt->execute();

$document = $stmt->fetch();
$document = $stmt->fetchAll();
$stmt->closeCursor();

if (empty($document)) {
return new Document([]);
}

$document = $document[0];

if (\array_key_exists('_id', $document)) {
$document['$internalId'] = $document['_id'];
unset($document['_id']);
Expand Down
7 changes: 6 additions & 1 deletion src/Database/Adapter/SQLite.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ public function exists(string $database, ?string $collection): bool

$stmt->execute();

$document = $stmt->fetch();
$document = $stmt->fetchAll();
$stmt->closeCursor();
if (!empty($document)) {
$document = $document[0];
}

return (($document['name'] ?? '') === "{$this->getNamespace()}_{$collection}");
}
Expand Down Expand Up @@ -495,6 +499,7 @@ public function updateDocument(string $collection, Document $document): Document
$permissionsStmt->bindValue(':_uid', $document->getId());
$permissionsStmt->execute();
$permissions = $permissionsStmt->fetchAll();
$permissionsStmt->closeCursor();

$initial = [];
foreach (Database::PERMISSIONS as $type) {
Expand Down