diff -u b/core/modules/field_sql_storage/field_sql_storage.install b/core/modules/field_sql_storage/field_sql_storage.install --- b/core/modules/field_sql_storage/field_sql_storage.install +++ b/core/modules/field_sql_storage/field_sql_storage.install @@ -13,22 +13,20 @@ function field_sql_storage_schema() { $schema = array(); - if (!defined('MAINTENANCE_MODE')) { - // Loading entities within hook_schema() triggers lots of race conditions. - // Read definitions for raw storage instead (configuration, and state for - // deleted fields). - $fields = array(); - foreach (config_get_storage_names_with_prefix('field.field') as $name) { - $fields[] = config($name)->get(); - } - $deleted_fields = state()->get('field.field.deleted') ?: array(); - $fields = array_merge($fields, $deleted_fields); - - foreach ($fields as $field) { - if ($field['storage']['type'] == 'field_sql_storage') { - $field = new Field($field); - $schema += _field_sql_storage_schema($field); - } + // Loading entities within hook_schema() triggers lots of race conditions. + // Read definitions for raw storage instead (configuration, and state for + // deleted fields). + $fields = array(); + foreach (config_get_storage_names_with_prefix('field.field') as $name) { + $fields[] = config($name)->get(); + } + $deleted_fields = state()->get('field.field.deleted') ?: array(); + $fields = array_merge($fields, $deleted_fields); + + foreach ($fields as $field) { + if ($field['storage']['type'] == 'field_sql_storage') { + $field = new Field($field); + $schema += _field_sql_storage_schema($field); } } diff -u b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php --- b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Upgrade/FieldUpgradePathTest.php @@ -205,7 +205,6 @@ field_attach_load('node', array(2 => $entity), FIELD_LOAD_CURRENT, array('field_id' => $deleted_field['uuid'], 'deleted' => 1)); $deleted_value = $entity->get('test_deleted_field'); $this->assertEqual($deleted_value[LANGUAGE_NOT_SPECIFIED][0]['value'], 'Some deleted value'); - $this->assertEqual($deleted_value[LANGUAGE_NOT_SPECIFIED][0]['format'], 'filtered_html'); // Check that creation of a new node works as expected. $value = $this->randomName(); diff -u b/core/modules/system/tests/upgrade/drupal-7.field.database.php b/core/modules/system/tests/upgrade/drupal-7.field.database.php --- b/core/modules/system/tests/upgrade/drupal-7.field.database.php +++ b/core/modules/system/tests/upgrade/drupal-7.field.database.php @@ -116,7 +116,9 @@ 'locked' => 0, 'data' => serialize(array( 'entity_types' => array(), - 'settings' => array(), + 'settings' => array( + 'max_length' => 255, + ), 'storage' => array( 'type' => 'field_sql_storage', 'settings' => array(), @@ -158,7 +160,7 @@ ), ), 'settings' => array( - 'text_processing' => 1, + 'text_processing' => 0, 'user_register_form' => FALSE, ), 'display' => array( @@ -374,7 +376,6 @@ 'language' => 'und', 'delta' => '0', 'test_deleted_field_value' => 'Some deleted value', - 'test_deleted_field_format' => 'filtered_html', ); db_insert("field_deleted_data_{$field_id}") ->fields($field_data_row)