Skip to content

fix: hidden() now strips columns whose value is NULL #43

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
mychidarko merged 1 commit into from
Oct 16, 2026
Merged

fix: hidden() now strips columns whose value is NULL #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Db/Core.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@ public function fetchAssoc()

if (count($hidden)) {
foreach ($hidden as $item) {
if (isset($result[$item])) {
if (array_key_exists($item, $result)) {
unset($result[$item]);
} elseif (strpos($item, '.') !== false) {
$hiddenEagerFields[] = explode('.', $item);
Expand Down Expand Up @@ -727,7 +727,7 @@ public function fetchAll($type = 'assoc')

if (count($hidden)) {
foreach ($hidden as $item) {
if (isset($result[$item])) {
if (array_key_exists($item, $result)) {
unset($result[$item]);
} elseif (strpos($item, '.') !== false) {
$hiddenEagerFields[] = explode('.', $item);
Expand Down
22 changes: 22 additions & 0 deletions tests/db.test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,3 +250,25 @@
->and($db->select('users')->orderBy('name')->count())->toBe(3)
->and($db->select('users')->orderBy('name')->limit(2)->count())->toBe(2);
});

test('hidden removes fields whose value is null', function () {
// https://github.com/leafsphp/db/issues/42
$db = testDb();
$db->query('CREATE TABLE tokens (
id INTEGER PRIMARY KEY AUTOINCREMENT,
email TEXT NOT NULL,
reset_token TEXT NULL
)')->execute();
$db->insert('tokens')->params(['email' => 'mika@leafphp.dev', 'reset_token' => null])->execute();
$db->insert('tokens')->params(['email' => 'jane@leafphp.dev', 'reset_token' => null])->execute();

$row = $db->select('tokens')->where('email', 'mika@leafphp.dev')->hidden('reset_token')->first();
expect($row)->not->toHaveKey('reset_token')
->and($row)->toHaveKey('email');

$rows = $db->select('tokens')->hidden('reset_token')->all();
expect($rows)->toHaveCount(2);
foreach ($rows as $r) {
expect($r)->not->toHaveKey('reset_token');
}
});
Loading