diff --git a/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php b/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php index 5347840..c39005a 100644 --- a/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php +++ b/core/lib/Drupal/Core/Database/Driver/fake/FakeConnection.php @@ -62,7 +62,7 @@ public function __construct(array $database_contents, $connection_options = arra * @return array * An array of data keyed by table name. */ - public function getDatabaseContent() { + public function &getDatabaseContent() { end($this->databaseContentsStack); $end = key($this->databaseContentsStack); return $this->databaseContentsStack[$end]; @@ -86,54 +86,42 @@ public function tablePrefix($table = 'default') { * {@inheritdoc} */ public function select($table, $alias = NULL, array $options = array()) { - end($this->databaseContentsStack); - $end = key($this->databaseContentsStack); - return new FakeSelect($this->databaseContentsStack[$end], $table, $alias); + return new FakeSelect($this->getDatabaseContent(), $table, $alias); } /** * {@inheritdoc} */ public function insert($table, array $options = array()) { - end($this->databaseContentsStack); - $end = key($this->databaseContentsStack); - return new FakeInsert($this->databaseContentsStack[$end], $table); + return new FakeInsert($this->getDatabaseContent(), $table); } /** * {@inheritdoc} */ public function merge($table, array $options = array()) { - end($this->databaseContentsStack); - $end = key($this->databaseContentsStack); - return new FakeMerge($this->databaseContentsStack[$end], $table); + return new FakeMerge($this->getDatabaseContent(), $table); } /** * {@inheritdoc} */ public function update($table, array $options = array()) { - end($this->databaseContentsStack); - $end = key($this->databaseContentsStack); - return new FakeUpdate($this->databaseContentsStack[$end], $table); + return new FakeUpdate($this->getDatabaseContent(), $table); } /** * {@inheritdoc} */ public function truncate($table, array $options = array()) { - end($this->databaseContentsStack); - $end = key($this->databaseContentsStack); - return new FakeTruncate($this->databaseContentsStack[$end], $table); + return new FakeTruncate($this->getDatabaseContent(), $table); } /** * {@inheritdoc} */ public function schema() { - end($this->databaseContentsStack); - $end = key($this->databaseContentsStack); - return new FakeDatabaseSchema($this->databaseContentsStack[$end]); + return new FakeDatabaseSchema($this->getDatabaseContent()); } /**