Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / tests / Drupal / KernelTests / Core / Database / DatabaseTestBase.php

diff --git a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
index 6fcfaa44aded83c9c2657b331d1e466715b1cd33..784bfd6189a4079d5f6add46bc7b4755b47ed980 100644 (file)
--- a/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
+++ b/web/core/tests/Drupal/KernelTests/Core/Database/DatabaseTestBase.php
@@ -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 @@ abstract class DatabaseTestBase extends KernelTestBase {
    * 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 @@ abstract class DatabaseTestBase extends KernelTestBase {
    * 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 @@ abstract class DatabaseTestBase extends KernelTestBase {
       ])
       ->execute();
 
-    $george = db_insert('test')
+    $george = $connection->insert('test')
       ->fields([
         'name' => 'George',
         'age' => 27,
@@ -73,7 +84,7 @@ abstract class DatabaseTestBase extends KernelTestBase {
       ])
       ->execute();
 
-    db_insert('test')
+    $connection->insert('test')
       ->fields([
         'name' => 'Ringo',
         'age' => 28,
@@ -81,7 +92,7 @@ abstract class DatabaseTestBase extends KernelTestBase {
       ])
       ->execute();
 
-    $paul = db_insert('test')
+    $paul = $connection->insert('test')
       ->fields([
         'name' => 'Paul',
         'age' => 26,
@@ -89,7 +100,7 @@ abstract class DatabaseTestBase extends KernelTestBase {
       ])
       ->execute();
 
-    db_insert('test_people')
+    $connection->insert('test_people')
       ->fields([
         'name' => 'Meredith',
         'age' => 30,
@@ -97,7 +108,7 @@ abstract class DatabaseTestBase extends KernelTestBase {
       ])
       ->execute();
 
-    db_insert('test_task')
+    $connection->insert('test_task')
       ->fields(['pid', 'task', 'priority'])
       ->values([
         'pid' => $john,
@@ -136,10 +147,11 @@ abstract class DatabaseTestBase extends KernelTestBase {
       ])
       ->execute();
 
-    db_insert('test_special_columns')
+    $connection->insert('test_special_columns')
       ->fields([
         'id' => 1,
         'offset' => 'Offset value 1',
+        'function' => 'Function value 1',
       ])
       ->execute();
   }