commit 5fc9c7b6621878c3c4e40496b856eff89104b448 Author: fago Date: Sat May 24 22:15:42 2014 +0200 Fixed test fails. diff --git a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php index ed13d96..9f77bf3 100644 --- a/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php +++ b/core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php @@ -1282,9 +1282,13 @@ public static function _fieldSqlSchema(FieldStorageDefinitionInterface $storage_ * * @return string * A string containing the generated name for the database table. - * */ static public function _fieldTableName(FieldStorageDefinitionInterface $storage_definition) { + // Be sure to get the field config object so we check the right deleted + // property. @todo: Fix properly. + if ($storage_definition instanceof FieldInstanceConfigInterface) { + $storage_definition = $storage_definition->getField(); + } if ($storage_definition->deleted) { // When a field is a deleted, the table is renamed to // {field_deleted_data_FIELD_UUID}. To make sure we don't end up with @@ -1315,6 +1319,11 @@ static public function _fieldTableName(FieldStorageDefinitionInterface $storage_ * A string containing the generated name for the database table. */ static public function _fieldRevisionTableName(FieldStorageDefinitionInterface $storage_definition) { + // Be sure to get the field config object so we check the right deleted + // property. @todo: Fix properly. + if ($storage_definition instanceof FieldInstanceConfigInterface) { + $storage_definition = $storage_definition->getField(); + } if ($storage_definition->deleted) { // When a field is a deleted, the table is renamed to // {field_deleted_revision_FIELD_UUID}. To make sure we don't end up with diff --git a/core/lib/Drupal/Core/Field/FieldStorageDefinitionInterface.php b/core/lib/Drupal/Core/Field/FieldStorageDefinitionInterface.php index c6e7384..b8961dc 100644 --- a/core/lib/Drupal/Core/Field/FieldStorageDefinitionInterface.php +++ b/core/lib/Drupal/Core/Field/FieldStorageDefinitionInterface.php @@ -285,7 +285,10 @@ public function getProvider(); */ public function hasCustomStorage(); - + /** + * @todo + * @return string + */ public function getUniqueStorageIdentifier(); }