diff --git a/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php b/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php index f127944..5347840 100644 --- a/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php +++ b/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php @@ -57,6 +57,18 @@ public function __construct(array $database_contents, $connection_options = arra } /** + * Returns the current database content of all tables. + * + * @return array + * An array of data keyed by table name. + */ + public function getDatabaseContent() { + end($this->databaseContentsStack); + $end = key($this->databaseContentsStack); + return $this->databaseContentsStack[$end]; + } + + /** * {@inheritdoc} */ public function getConnectionOptions() { diff --git a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php index 577006f..6e3bd2b 100644 --- a/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php +++ b/core/modules/migrate/tests/Drupal/migrate/Tests/MigrateSqlIdMapTest.php @@ -40,7 +40,7 @@ class MigrateSqlIdMapTest extends MigrateTestCase { /** * The database connection. * - * @var \Drupal\Core\Database\Connection + * @var \Drupal\Core\Database\Driver\fake\FakeConnection */ protected $database; @@ -125,7 +125,7 @@ public function testSaveIdMapping() { 'destid1' => 2, ) + $this->idMapDefaults(), ); - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_result); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_result); $source = array( 'source_id_property' => 'source_value_1', ); @@ -135,10 +135,10 @@ public function testSaveIdMapping() { 'sourceid1' => 'source_value_1', 'destid1' => 3, ) + $this->idMapDefaults(); - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_result); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_result); $id_map->saveIdMapping($row, array('destination_id_property' => 4)); $expected_result[1]['destid1'] = 4; - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_result); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_result); } /** @@ -202,7 +202,7 @@ public function testGetRowsNeedingUpdate() { } } // Assert that test values exist. - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_results); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_results); // Assert a single row needs an update. $row_needing_update = $id_map->getRowsNeedingUpdate(1); @@ -616,7 +616,7 @@ public function testSetUpdate() { ); } // Assert that test values exist. - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_results); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_results); // Mark each row as STATUS_NEEDS_UPDATE. foreach ($row_statuses as $status) { $id_map->setUpdate(array('source_value_' . $status)); @@ -626,7 +626,7 @@ public function testSetUpdate() { $expected_results[$key]['source_row_status'] = MigrateIdMapInterface::STATUS_NEEDS_UPDATE; } // Assert that updated expected values match. - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_results); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_results); // Assert an exception is thrown when source identifiers are not provided. try { $id_map->setUpdate(array()); @@ -665,7 +665,7 @@ public function testPrepareUpdate() { } // Assert that test values exist. - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_results); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_results); // Mark all rows as STATUS_NEEDS_UPDATE. $id_map->prepareUpdate(); @@ -675,7 +675,7 @@ public function testPrepareUpdate() { $expected_results[$key]['source_row_status'] = MigrateIdMapInterface::STATUS_NEEDS_UPDATE; } // Assert that updated expected values match. - $this->queryResultTest($this->database->databaseContents['migrate_map_sql_idmap_test'], $expected_results); + $this->queryResultTest($this->database->getDatabaseContent()['migrate_map_sql_idmap_test'], $expected_results); } /**