Skip to content

Selection: fixed bug with zero in primary key #82

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
merged 1 commit into from
Sep 14, 2015
Merged

Selection: fixed bug with zero in primary key #82

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/Database/Table/Selection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ protected function execute()
foreach ($result->getPdoStatement() as $key => $row) {
$row = $this->createRow($result->normalizeRow($row));
$primary = $row->getSignature(FALSE);
$usedPrimary = $usedPrimary && $primary;
$this->rows[$primary ?: $key] = $row;
$usedPrimary = $usedPrimary && (string) $primary !== '';
$this->rows[$usedPrimary ? $primary : $key] = $row;
}
$this->data = $this->rows;

Expand Down
36 changes: 36 additions & 0 deletions tests/Database/Table/bugs/ZeroPrimaryKey.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?php

/**
* Test: Zero Primary key bug
* @dataProvider? ../../databases.ini mysql
*/

use Tester\Assert;

require __DIR__ . '/../../connect.inc.php';

$context->query('CREATE DATABASE IF NOT EXISTS nette_test');
$context->query('USE nette_test');

$context->query('
CREATE TABLE ships (
id INTEGER PRIMARY KEY NOT NULL,
name TEXT NOT NULL
);
');

$context->query('
INSERT INTO ships (id, name) VALUES(2, "Enterprise");
');

$context->query('
INSERT INTO ships (id, name) VALUES(0, "Endeavour");
');

Assert::same(2, $context->table('ships')->order('id DESC')->count());

$result = $context->table('ships')->order('id DESC')->fetchAll(); // SELECT * FROM `ships` ORDER BY id DESC

Assert::same("Enterprise", $result[2]->name);

Assert::same("Endeavour", $result[0]->name);