Skip to content

Commit dbe9f03

Browse files
committed
typos
1 parent 23061d1 commit dbe9f03

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

src/Database/Drivers/SqliteDriver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ public function getIndexes($table)
212212

213213
foreach ($indexes as $index => $values) {
214214
$res = $this->connection->query("PRAGMA index_info({$this->delimite($index)})");
215-
while ($row = $res->fetch(TRUE)) {
215+
while ($row = $res->fetch()) {
216216
$indexes[$index]['columns'][$row['seqno']] = $row['name'];
217217
}
218218
}

src/Database/Table/SqlBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ protected function checkUniqueTableName($tableName, $chain)
468468
if ($this->reservedTableNames[$tableName] === $chain) {
469469
return;
470470
}
471-
throw new \Nette\InvalidArgumentException("Table alias '$tableName' from chain '$chain' is already in use by chain '{$this->reservedTableNames[$tableName]}'. Please add/change alias for one of them.");
471+
throw new Nette\InvalidArgumentException("Table alias '$tableName' from chain '$chain' is already in use by chain '{$this->reservedTableNames[$tableName]}'. Please add/change alias for one of them.");
472472
}
473473
$this->reservedTableNames[$tableName] = $chain;
474474
}

tests/Database/Table/Selection.whereOr().phpt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,67 +14,67 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../files/{$driverN
1414
// without question mark
1515
test(function () use ($context) {
1616
$count = $context->table('book')->whereOr([
17-
'author_id' => 12,
18-
'title' => 'JUSH',
19-
])->count();
17+
'author_id' => 12,
18+
'title' => 'JUSH',
19+
])->count();
2020
Assert::same(3, $count);
2121
});
2222

2323

2424
// full condition
2525
test(function () use ($context) {
2626
$count = $context->table('book')->whereOr([
27-
'translator_id IS NULL',
28-
'title' => 'Dibi',
29-
])->count();
27+
'translator_id IS NULL',
28+
'title' => 'Dibi',
29+
])->count();
3030
Assert::same(2, $count);
3131
});
3232

3333

3434
// with question mark
3535
test(function () use ($context) {
3636
$count = $context->table('book')->whereOr([
37-
'id > ?' => 3,
38-
'translator_id' => 11,
39-
])->count();
37+
'id > ?' => 3,
38+
'translator_id' => 11,
39+
])->count();
4040
Assert::same(2, $count);
4141
});
4242

4343

4444
// just one condition
4545
test(function () use ($context) {
4646
$count = $context->table('book')->whereOr([
47-
'id > ?' => 3,
48-
])->count();
47+
'id > ?' => 3,
48+
])->count();
4949
Assert::same(1, $count);
5050
});
5151

5252

5353
// with question mark
5454
test(function () use ($context) {
5555
$count = $context->table('book')->whereOr([
56-
'id ?' => [3, 4],
57-
'translator_id' => 11,
58-
])->count();
56+
'id ?' => [3, 4],
57+
'translator_id' => 11,
58+
])->count();
5959
Assert::same(3, $count);
6060
});
6161

6262

6363
// multiple values for one key
6464
test(function () use ($context) {
6565
$count = $context->table('author')->whereOr([
66-
'id > ?' => 12,
67-
'ROUND(id, ?) = ?' => [5, 3],
68-
])->count();
66+
'id > ?' => 12,
67+
'ROUND(id, ?) = ?' => [5, 3],
68+
])->count();
6969
Assert::same(1, $count);
7070
});
7171

7272

7373
// nested condition
7474
test(function () use ($context) {
7575
$books = $context->table('book')->whereOr([
76-
'id = ?' => 4,
77-
'author_id = ? AND translator_id ?' => [11, null],
76+
'id = ?' => 4,
77+
'author_id = ? AND translator_id ?' => [11, null],
7878
]);
7979
Assert::same(2, $books->count());
8080
});
@@ -84,21 +84,21 @@ test(function () use ($context) {
8484
test(function () use ($context) {
8585
$f = function () use ($context) {
8686
$context->table('author')->whereOr([
87-
'id > ?' => 3,
88-
'ROUND(id, ?) = ?' => [5],
87+
'id > ?' => 3,
88+
'ROUND(id, ?) = ?' => [5],
8989
])->count();
9090
};
91-
Assert::throws($f, '\Nette\InvalidArgumentException', 'Argument count does not match placeholder count.');
91+
Assert::throws($f, Nette\InvalidArgumentException::class, 'Argument count does not match placeholder count.');
9292
});
9393

9494

9595
// invalid param count
9696
test(function () use ($context) {
9797
$f = function () use ($context) {
9898
$context->table('author')->whereOr([
99-
'id > ?' => 3,
100-
'ROUND(id, ?) = ?' => 5,
99+
'id > ?' => 3,
100+
'ROUND(id, ?) = ?' => 5,
101101
])->count();
102102
};
103-
Assert::throws($f, '\Nette\InvalidArgumentException', 'Argument count does not match placeholder count.');
103+
Assert::throws($f, Nette\InvalidArgumentException::class, 'Argument count does not match placeholder count.');
104104
});

tests/Database/Table/bugs/staticReflection.undeclaredColumn.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ use Tester\Assert;
99

1010
require __DIR__ . '/../../connect.inc.php'; // create $connection
1111

12-
$conventions = new \Nette\Database\Conventions\StaticConventions();
13-
$cacheStorage = new \Nette\Caching\Storages\MemoryStorage();
14-
$context = new \Nette\Database\Context($context->getConnection(), $context->getStructure(), $conventions, $cacheStorage);
12+
$conventions = new Nette\Database\Conventions\StaticConventions();
13+
$cacheStorage = new Nette\Caching\Storages\MemoryStorage();
14+
$context = new Nette\Database\Context($context->getConnection(), $context->getStructure(), $conventions, $cacheStorage);
1515

1616
Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../../files/{$driverName}-nette_test1.sql");
1717

0 commit comments

Comments
 (0)