Issue #3315604 by mondrake, daffie: Move remaining database specific kernel... (2c7f2fb8) · Commits · project / drupal

core/modules/system/tests/src/Kernel/Scripts/DbDumpCommandTest.php→core/modules/mysql/tests/src/Kernel/mysql/Console/DbDumpCommandTest.php

+3 −9

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Tests\system\Kernel\Scripts;
		namespace Drupal\Tests\mysql\Kernel\mysql\Console;

		use Drupal\Core\Command\DbDumpCommand;
		use Drupal\Core\Database\Database;
		use Drupal\KernelTests\KernelTestBase;
		use Drupal\KernelTests\Core\Database\DriverSpecificKernelTestBase;
		use Symfony\Component\Console\Tester\CommandTester;

		/**
		@@ -12,7 +11,7 @@
		*
		* @group console
		*/
		class DbDumpCommandTest extends KernelTestBase {
		class DbDumpCommandTest extends DriverSpecificKernelTestBase {

		/**
		* {@inheritdoc}
		@@ -25,11 +24,6 @@ class DbDumpCommandTest extends KernelTestBase {
		protected function setUp(): void {
		parent::setUp();

		// Determine what database backend is running, and set the skip flag.
		if (Database::getConnection()->databaseType() !== 'mysql') {
		$this->markTestSkipped("Skipping test since the DbDumpCommand is currently only compatible with MySQL");
		}

		// Rebuild the router to ensure a routing table.
		\Drupal::service('router.builder')->rebuild();

core/tests/Drupal/KernelTests/Core/Command/DbDumpTest.php→core/modules/mysql/tests/src/Kernel/mysql/DbDumpTest.php

+3 −7

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\KernelTests\Core\Command;
		namespace Drupal\Tests\mysql\Kernel\mysql;

		use Drupal\Component\Render\FormattableMarkup;
		use Drupal\Core\Command\DbDumpApplication;
		use Drupal\Core\Config\DatabaseStorage;
		use Drupal\Core\Database\Database;
		use Drupal\Core\DependencyInjection\ContainerBuilder;
		use Drupal\KernelTests\KernelTestBase;
		use Drupal\KernelTests\Core\Database\DriverSpecificKernelTestBase;
		use Drupal\Tests\Traits\Core\PathAliasTestTrait;
		use Drupal\user\Entity\User;
		use Symfony\Component\Console\Tester\CommandTester;
		@@ -18,7 +18,7 @@
		*
		* @group Update
		*/
		class DbDumpTest extends KernelTestBase {
		class DbDumpTest extends DriverSpecificKernelTestBase {

		use PathAliasTestTrait;

		@@ -84,10 +84,6 @@ public function register(ContainerBuilder $container) {
		protected function setUp(): void {
		parent::setUp();

		if (Database::getConnection()->databaseType() !== 'mysql') {
		$this->markTestSkipped("Skipping test since the DbDumpCommand is currently only compatible with MySql");
		}

		// Create some schemas so our export contains tables.
		$this->installSchema('system', ['sessions']);
		$this->installSchema('dblog', ['watchdog']);

core/modules/mysql/tests/src/Kernel/mysql/SchemaTest.php

+86 −1

Original line number	Diff line number	Diff line
		@@ -2,10 +2,11 @@

		namespace Drupal\Tests\mysql\Kernel\mysql;

		use Drupal\KernelTests\Core\Database\DriverSpecificSchemaTestBase;
		use Drupal\Component\Utility\Unicode;
		use Drupal\Core\Database\SchemaException;
		use Drupal\Core\Database\SchemaObjectDoesNotExistException;
		use Drupal\Core\Database\SchemaObjectExistsException;
		use Drupal\KernelTests\Core\Database\DriverSpecificSchemaTestBase;

		/**
		* Tests schema API for the MySQL driver.
		@@ -14,6 +15,34 @@
		*/
		class SchemaTest extends DriverSpecificSchemaTestBase {

		/**
		* {@inheritdoc}
		*/
		public function checkSchemaComment(string $description, string $table, string $column = NULL): void {
		$comment = $this->schema->getComment($table, $column);
		$max_length = $column ? 255 : 60;
		$description = Unicode::truncate($description, $max_length, TRUE, TRUE);
		$this->assertSame($description, $comment, 'The comment matches the schema description.');
		}

		/**
		* {@inheritdoc}
		*/
		protected function assertCollation(): void {
		// Make sure that varchar fields have the correct collations.
		$columns = $this->connection->query('SHOW FULL COLUMNS FROM {test_table}');
		foreach ($columns as $column) {
		if ($column->Field == 'test_field_string') {
		$string_check = $column->Collation;
		}
		if ($column->Field == 'test_field_string_ascii') {
		$string_ascii_check = $column->Collation;
		}
		}
		$this->assertMatchesRegularExpression('#^(utf8mb4_general_ci\|utf8mb4_0900_ai_ci)$#', $string_check, 'test_field_string should have a utf8mb4_general_ci or a utf8mb4_0900_ai_ci collation, but it has not.');
		$this->assertSame('ascii_general_ci', $string_ascii_check, 'test_field_string_ascii should have a ascii_general_ci collation, but it has not.');
		}

		/**
		* Tests that indexes on string fields are limited to 191 characters on MySQL.
		*
		@@ -143,4 +172,60 @@ public function testIndexLength(): void {
		$this->assertEquals($column_count, $test_count, 'Number of tests matches expected value.');
		}

		/**
		* @covers \Drupal\mysql\Driver\Database\mysql\Schema::introspectIndexSchema
		*/
		public function testIntrospectIndexSchema(): void {
		$table_specification = [
		'fields' => [
		'id' => [
		'type' => 'int',
		'not null' => TRUE,
		'default' => 0,
		],
		'test_field_1' => [
		'type' => 'int',
		'not null' => TRUE,
		'default' => 0,
		],
		'test_field_2' => [
		'type' => 'int',
		'default' => 0,
		],
		'test_field_3' => [
		'type' => 'int',
		'default' => 0,
		],
		'test_field_4' => [
		'type' => 'int',
		'default' => 0,
		],
		'test_field_5' => [
		'type' => 'int',
		'default' => 0,
		],
		],
		'primary key' => ['id', 'test_field_1'],
		'unique keys' => [
		'test_field_2' => ['test_field_2'],
		'test_field_3_test_field_4' => ['test_field_3', 'test_field_4'],
		],
		'indexes' => [
		'test_field_4' => ['test_field_4'],
		'test_field_4_test_field_5' => ['test_field_4', 'test_field_5'],
		],
		];

		$table_name = strtolower($this->getRandomGenerator()->name());
		$this->schema->createTable($table_name, $table_specification);

		unset($table_specification['fields']);

		$introspect_index_schema = new \ReflectionMethod(get_class($this->schema), 'introspectIndexSchema');
		$introspect_index_schema->setAccessible(TRUE);
		$index_schema = $introspect_index_schema->invoke($this->schema, $table_name);

		$this->assertEquals($table_specification, $index_schema);
		}

		}

core/modules/pgsql/tests/src/Kernel/pgsql/KernelTestBaseTest.php

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Tests\pgsql\Kernel\pgsql;

		use Drupal\KernelTests\Core\Database\DriverSpecificKernelTestBase;

		/**
		* @coversDefaultClass \Drupal\KernelTests\KernelTestBase
		*
		* @group KernelTests
		* @group Database
		*/
		class KernelTestBaseTest extends DriverSpecificKernelTestBase {

		/**
		* @covers ::setUp
		*/
		public function testSetUp() {
		// Ensure that the database tasks have been run during set up.
		$this->assertSame('on', $this->connection->query("SHOW standard_conforming_strings")->fetchField());
		$this->assertSame('escape', $this->connection->query("SHOW bytea_output")->fetchField());
		}

		}

core/modules/pgsql/tests/src/Kernel/pgsql/SchemaTest.php

+101 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,107 @@
		*/
		class SchemaTest extends DriverSpecificSchemaTestBase {

		/**
		* {@inheritdoc}
		*/
		public function checkSchemaComment(string $description, string $table, string $column = NULL): void {
		$this->assertSame($description, $this->schema->getComment($table, $column), 'The comment matches the schema description.');
		}

		/**
		* {@inheritdoc}
		*/
		protected function checkSequenceRenaming(string $tableName): void {
		// For PostgreSQL, we also need to check that the sequence has been renamed.
		// The initial name of the sequence has been generated automatically by
		// PostgreSQL when the table was created, however, on subsequent table
		// renames the name is generated by Drupal and can not be easily
		// re-constructed. Hence we can only check that we still have a sequence on
		// the new table name.
		$sequenceExists = (bool) $this->connection->query("SELECT pg_get_serial_sequence('{" . $tableName . "}', 'id')")->fetchField();
		$this->assertTrue($sequenceExists, 'Sequence was renamed.');

		// Rename the table again and repeat the check.
		$anotherTableName = strtolower($this->getRandomGenerator()->name(63 - strlen($this->getDatabasePrefix())));
		$this->schema->renameTable($tableName, $anotherTableName);

		$sequenceExists = (bool) $this->connection->query("SELECT pg_get_serial_sequence('{" . $anotherTableName . "}', 'id')")->fetchField();
		$this->assertTrue($sequenceExists, 'Sequence was renamed.');
		}

		/**
		* @covers \Drupal\pgsql\Driver\Database\pgsql\Schema::introspectIndexSchema
		*/
		public function testIntrospectIndexSchema(): void {
		$table_specification = [
		'fields' => [
		'id' => [
		'type' => 'int',
		'not null' => TRUE,
		'default' => 0,
		],
		'test_field_1' => [
		'type' => 'int',
		'not null' => TRUE,
		'default' => 0,
		],
		'test_field_2' => [
		'type' => 'int',
		'default' => 0,
		],
		'test_field_3' => [
		'type' => 'int',
		'default' => 0,
		],
		'test_field_4' => [
		'type' => 'int',
		'default' => 0,
		],
		'test_field_5' => [
		'type' => 'int',
		'default' => 0,
		],
		],
		'primary key' => ['id', 'test_field_1'],
		'unique keys' => [
		'test_field_2' => ['test_field_2'],
		'test_field_3_test_field_4' => ['test_field_3', 'test_field_4'],
		],
		'indexes' => [
		'test_field_4' => ['test_field_4'],
		'test_field_4_test_field_5' => ['test_field_4', 'test_field_5'],
		],
		];

		$table_name = strtolower($this->getRandomGenerator()->name());
		$this->schema->createTable($table_name, $table_specification);

		unset($table_specification['fields']);

		$introspect_index_schema = new \ReflectionMethod(get_class($this->schema), 'introspectIndexSchema');
		$introspect_index_schema->setAccessible(TRUE);
		$index_schema = $introspect_index_schema->invoke($this->schema, $table_name);

		// The PostgreSQL driver is using a custom naming scheme for its indexes, so
		// we need to adjust the initial table specification.
		$ensure_identifier_length = new \ReflectionMethod(get_class($this->schema), 'ensureIdentifiersLength');
		$ensure_identifier_length->setAccessible(TRUE);

		foreach ($table_specification['unique keys'] as $original_index_name => $columns) {
		unset($table_specification['unique keys'][$original_index_name]);
		$new_index_name = $ensure_identifier_length->invoke($this->schema, $table_name, $original_index_name, 'key');
		$table_specification['unique keys'][$new_index_name] = $columns;
		}

		foreach ($table_specification['indexes'] as $original_index_name => $columns) {
		unset($table_specification['indexes'][$original_index_name]);
		$new_index_name = $ensure_identifier_length->invoke($this->schema, $table_name, $original_index_name, 'idx');
		$table_specification['indexes'][$new_index_name] = $columns;
		}

		$this->assertEquals($table_specification, $index_schema);
		}

		/**
		* @covers \Drupal\Core\Database\Driver\pgsql\Schema::extensionExists
		*/