diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-20 15:57:42 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-20 15:57:42 +0000 |
| commit | 816752c5f907ccd3c7b72c230fba7031076f4723 (patch) | |
| tree | 9df6fd907716c92a34b6f409582af599da202b6c /modules/field | |
| parent | 7cf3518b64b40ba08fdf605d7f72e19b9e8b9841 (diff) | |
| download | brdo-816752c5f907ccd3c7b72c230fba7031076f4723.tar.gz brdo-816752c5f907ccd3c7b72c230fba7031076f4723.tar.bz2 | |
#934050 follow-up by sun: Fix broken upgrade path.
Diffstat (limited to 'modules/field')
| -rw-r--r-- | modules/field/modules/text/text.install | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/modules/field/modules/text/text.install b/modules/field/modules/text/text.install index 3854e5688..cd1d9ded5 100644 --- a/modules/field/modules/text/text.install +++ b/modules/field/modules/text/text.install @@ -89,12 +89,21 @@ function text_update_7000() { 'length' => 255, 'not null' => FALSE, ); - $fields = _update_7000_field_read_fields(array('module' => 'text', 'storage_type' => 'field_sql_storage')); + $fields = _update_7000_field_read_fields(array( + 'module' => 'text', + 'storage_type' => 'field_sql_storage', + )); foreach ($fields as $field_name => $field) { - $table = _field_sql_storage_tablename($prior_field); - $revision_table = _field_sql_storage_revision_tablename($prior_field); - $field_name = _field_sql_storage_columnname($field['field_name'], 'format'); - db_change_field($table, $field_name, $field_name, $spec); - db_change_field($revision_table, $field_name, $field_name, $spec); + if ($field['deleted']) { + $table = "field_deleted_data_{$field['id']}"; + $revision_table = "field_deleted_revision_{$field['id']}"; + } + else { + $table = "field_data_{$field['field_name']}"; + $revision_table = "field_revision_{$field['field_name']}"; + } + $column = $field['field_name'] . '_' . 'format'; + db_change_field($table, $column, $column, $spec); + db_change_field($revision_table, $column, $column, $spec); } } |