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

Issue #2976493 by tstoeckler, daffie: Creating a table with an explicitly empty primary key is broken on PostgreSQL

merge-requests/1654/head
Alex Pott 2018-06-08 11:15:08 +01:00
parent 0cc5879a8a
commit c4923ea2a2
No known key found for this signature in database
GPG Key ID: 31905460D4A69276
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
View File

@ -249,7 +249,7 @@ EOD;
} }
$sql_keys = []; $sql_keys = [];
if (isset($table['primary key']) && is_array($table['primary key'])) { if (!empty($table['primary key']) && is_array($table['primary key'])) {
$sql_keys[] = 'CONSTRAINT ' . $this->ensureIdentifiersLength($name, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($table['primary key']) . ')'; $sql_keys[] = 'CONSTRAINT ' . $this->ensureIdentifiersLength($name, '', 'pkey') . ' PRIMARY KEY (' . $this->createPrimaryKeySql($table['primary key']) . ')';
} }
if (isset($table['unique keys']) && is_array($table['unique keys'])) { if (isset($table['unique keys']) && is_array($table['unique keys'])) {

21
core/tests/Drupal/KernelTests/Core/Database/SchemaTest.php
View File

@ -1009,7 +1009,7 @@ class SchemaTest extends KernelTestBase {
$this->assertSame(['id3', 'test_field_2', 'id4'], $method->invoke($schema, 'table_with_pk_3')); $this->assertSame(['id3', 'test_field_2', 'id4'], $method->invoke($schema, 'table_with_pk_3'));
// Test with table without a primary key. // Test with table without a primary key.
$schema->createTable('table_without_pk', [ $schema->createTable('table_without_pk_1', [
'description' => 'Table without primary key.', 'description' => 'Table without primary key.',
'fields' => [ 'fields' => [
'id' => [ 'id' => [
@ -1022,7 +1022,24 @@ class SchemaTest extends KernelTestBase {
], ],
], ],
]); ]);
$this->assertSame([], $method->invoke($schema, 'table_without_pk')); $this->assertSame([], $method->invoke($schema, 'table_without_pk_1'));
// Test with table with an empty primary key.
$schema->createTable('table_without_pk_2', [
'description' => 'Table without primary key.',
'fields' => [
'id' => [
'type' => 'int',
'not null' => TRUE,
],
'test_field' => [
'type' => 'int',
'not null' => TRUE,
],
],
'primary key' => [],
]);
$this->assertSame([], $method->invoke($schema, 'table_without_pk_2'));
// Test with non existing table. // Test with non existing table.
$this->assertFalse($method->invoke($schema, 'non_existing_table')); $this->assertFalse($method->invoke($schema, 'non_existing_table'));