Issue #2953385 by mondrake, voleger: Add a $connection property to... (bdfce71e) · Commits · project / drupal

core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php

+19 −8

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@

		namespace Drupal\KernelTests\Core\Database;

		use Drupal\Core\Database\Database;
		use Drupal\KernelTests\KernelTestBase;

		/**
		@@ -14,8 +15,16 @@ abstract class DatabaseTestBase extends KernelTestBase {

		public static $modules = ['database_test'];

		/**
		* The database connection for testing.
		*
		* @var \Drupal\Core\Database\Connection
		*/
		protected $connection;

		protected function setUp() {
		parent::setUp();
		$this->connection = Database::getConnection();
		$this->installSchema('database_test', [
		'test',
		'test_people',
		@@ -35,7 +44,7 @@ protected function setUp() {
		* Sets up tables for NULL handling.
		*/
		public function ensureSampleDataNull() {
		db_insert('test_null')
		$this->connection->insert('test_null')
		->fields(['name', 'age'])
		->values([
		'name' => 'Kermit',
		@@ -56,8 +65,10 @@ public function ensureSampleDataNull() {
		* Sets up our sample data.
		*/
		public static function addSampleData() {
		$connection = Database::getConnection();

		// We need the IDs, so we can't use a multi-insert here.
		$john = db_insert('test')
		$john = $connection->insert('test')
		->fields([
		'name' => 'John',
		'age' => 25,
		@@ -65,7 +76,7 @@ public static function addSampleData() {
		])
		->execute();

		$george = db_insert('test')
		$george = $connection->insert('test')
		->fields([
		'name' => 'George',
		'age' => 27,
		@@ -73,7 +84,7 @@ public static function addSampleData() {
		])
		->execute();

		db_insert('test')
		$connection->insert('test')
		->fields([
		'name' => 'Ringo',
		'age' => 28,
		@@ -81,7 +92,7 @@ public static function addSampleData() {
		])
		->execute();

		$paul = db_insert('test')
		$paul = $connection->insert('test')
		->fields([
		'name' => 'Paul',
		'age' => 26,
		@@ -89,7 +100,7 @@ public static function addSampleData() {
		])
		->execute();

		db_insert('test_people')
		$connection->insert('test_people')
		->fields([
		'name' => 'Meredith',
		'age' => 30,
		@@ -97,7 +108,7 @@ public static function addSampleData() {
		])
		->execute();

		db_insert('test_task')
		$connection->insert('test_task')
		->fields(['pid', 'task', 'priority'])
		->values([
		'pid' => $john,
		@@ -136,7 +147,7 @@ public static function addSampleData() {
		])
		->execute();

		db_insert('test_special_columns')
		$connection->insert('test_special_columns')
		->fields([
		'id' => 1,
		'offset' => 'Offset value 1',

core/tests/Drupal/KernelTests/Core/Database/DeleteTruncateTest.php

+0 −17

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@

		namespace Drupal\KernelTests\Core\Database;

		use Drupal\Core\Database\Database;

		/**
		* Tests delete and truncate queries.
		*
		@@ -19,21 +17,6 @@
		*/
		class DeleteTruncateTest extends DatabaseTestBase {

		/**
		* The database connection for testing.
		*
		* @var \Drupal\Core\Database\Connection
		*/
		protected $connection;

		/**
		* {@inheritdoc}
		*/
		protected function setUp() {
		parent::setUp();
		$this->connection = Database::getConnection();
		}

		/**
		* Confirms that we can use a subselect in a delete successfully.
		*/