=== modified file 'modules/field/field.install'
--- modules/field/field.install	2010-10-20 01:15:58 +0000
+++ modules/field/field.install	2010-12-13 21:56:55 +0000
@@ -196,6 +196,16 @@ function _update_7000_field_create_field
     'module' => 'field_sql_storage',
     'active' => 1,
   );
+  // Create storage for this field, the field module is not guaranteed to be
+  // loaded at this point.
+  module_load_install($field['module']);
+  $schema = (array) module_invoke($field['module'], 'field_schema', $field);
+  $schema += array('columns' => array(), 'indexes' => array());
+  // 'columns' are hardcoded in the field type.
+  $field['columns'] = $schema['columns'];
+  // 'indexes' can be both hardcoded in the field type, and specified in the
+  // incoming $field definition.
+  $field['indexes'] += $schema['indexes'];
 
   // The serialized 'data' column contains everything from $field that does not
   // have its own column and is not automatically populated when the field is
@@ -226,17 +236,6 @@ function _update_7000_field_create_field
     ->fields($record)
     ->execute();
 
-  // Create storage for this field, the field module is not guaranteed to be
-  // loaded at this point.
-  module_load_install($field['module']);
-  $schema = (array) module_invoke($field['module'], 'field_schema', $field);
-  $schema += array('columns' => array(), 'indexes' => array());
-  // 'columns' are hardcoded in the field type.
-  $field['columns'] = $schema['columns'];
-  // 'indexes' can be both hardcoded in the field type, and specified in the
-  // incoming $field definition.
-  $field['indexes'] += $schema['indexes'];
-
   field_sql_storage_field_storage_create_field($field);
 }
 

=== modified file 'modules/simpletest/tests/upgrade/upgrade.node.test'
--- modules/simpletest/tests/upgrade/upgrade.node.test	2010-10-01 22:03:29 +0000
+++ modules/simpletest/tests/upgrade/upgrade.node.test	2010-12-13 21:42:20 +0000
@@ -39,6 +39,7 @@ class NodeBodyUpgradePathTestCase extend
     $revision = db_query_range("SELECT r.nid, r.vid FROM {node_revision} r JOIN {node} n ON n.nid = r.nid WHERE n.status = 0 AND n.type <> 'poll' AND n.vid <> r.vid", 0, 1)->fetch();
     $revision = node_load($revision->nid, $revision->vid);
     $this->assertTrue(!empty($revision->body), 'Unpublished non-current node revisions still have a node body.');
+    $this->drupalPost('admin/structure/types/manage/story/fields/body', array(), t('Save settings'));
   }
 }