Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3416525 by smustgrave, cmlara, NikolaAt, alexpott: DatabaseStorage, readMultiple throws error when receive empty array

merge-requests/8936/merge
catch 2024-08-10 09:41:08 +09:00
parent b8aa161ca0
commit a52980995a
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Drupal/Core/Config/DatabaseStorage.php
View File

@ -105,6 +105,10 @@ class DatabaseStorage implements StorageInterface {
* {@inheritdoc} * {@inheritdoc}
*/ */
public function readMultiple(array $names) { public function readMultiple(array $names) {
if (empty($names)) {
return [];
}
$list = []; $list = [];
try { try {
$list = $this->connection->query('SELECT [name], [data] FROM {' . $this->connection->escapeTable($this->table) . '} WHERE [collection] = :collection AND [name] IN ( :names[] )', [':collection' => $this->collection, ':names[]' => $names], $this->options)->fetchAllKeyed(); $list = $this->connection->query('SELECT [name], [data] FROM {' . $this->connection->escapeTable($this->table) . '} WHERE [collection] = :collection AND [name] IN ( :names[] )', [':collection' => $this->collection, ':names[]' => $names], $this->options)->fetchAllKeyed();

3
core/tests/Drupal/KernelTests/Core/Config/Storage/ConfigStorageTestBase.php
View File

@ -44,6 +44,9 @@ abstract class ConfigStorageTestBase extends KernelTestBase {
// Checking whether readMultiple() works with empty storage. // Checking whether readMultiple() works with empty storage.
$this->assertEmpty($this->storage->readMultiple([$name])); $this->assertEmpty($this->storage->readMultiple([$name]));
// readMultiple() accepts an empty array.
$this->assertSame([], $this->storage->readMultiple([]), 'Empty query should return empty array');
// Reading a non-existing name returns FALSE. // Reading a non-existing name returns FALSE.
$data = $this->storage->read($name); $data = $this->storage->read($name);
$this->assertFalse($data); $this->assertFalse($data);