diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php index e34adb6..8d0f752 100644 --- a/core/lib/Drupal/Core/Entity/EntityManager.php +++ b/core/lib/Drupal/Core/Entity/EntityManager.php @@ -283,7 +283,7 @@ protected function processDefinition(&$definition, $plugin_id) { } // Prepare entity schema fields SQL info for // Drupal\Core\Entity\DatabaseStorageControllerInterface::buildQuery(). - if (isset($definition['base_table'])) { + if (isset($definition['base_table']) && drupal_get_schema($definition['base_table']) !== FALSE) { $definition['schema_fields_sql']['base_table'] = drupal_schema_fields_sql($definition['base_table']); if (isset($definition['revision_table'])) { $definition['schema_fields_sql']['revision_table'] = drupal_schema_fields_sql($definition['revision_table']); diff --git a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php index 187c386..fa4d6da 100644 --- a/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php +++ b/core/modules/rest/lib/Drupal/rest/Tests/DeleteTest.php @@ -34,6 +34,12 @@ public static function getInfo() { */ public function testDelete() { foreach (entity_get_info() as $entity_type => $info) { + + // Skip fieldentity and instance. + if (in_array($entity_type, array('fieldentity', 'instance'))) { + continue; + } + // Enable web API for this entity type. $config = config('rest'); $config->set('resources', array( diff --git a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php index 9df2b03..50d4950 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php @@ -8,7 +8,7 @@ namespace Drupal\system\Tests\Upgrade; /** - * Tests upgrade of system variables. + * Tests upgrade of fields and instances. */ class FieldUpgradePathTest extends UpgradePathTestBase { public static function getInfo() {