From 816752c5f907ccd3c7b72c230fba7031076f4723 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 20 Oct 2010 15:57:42 +0000
Subject: #934050 follow-up by sun: Fix broken upgrade path.

---
 modules/taxonomy/taxonomy.install | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'modules/taxonomy')

diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index dd97edde4..8c2de3f86 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -258,6 +258,11 @@ function taxonomy_update_dependencies() {
   $dependencies['node'][7006] = array(
     'taxonomy' => 7002,
   );
+  // Ensure that format columns are only changed after Filter module has changed
+  // the primary records.
+  $dependencies['taxonomy'][7009] = array(
+    'filter' => 7010,
+  );
 
   return $dependencies;
 }
@@ -782,3 +787,16 @@ function taxonomy_update_7008() {
     ),
   ));
 }
+
+/**
+ * Change {taxonomy_term_data}.format into varchar.
+ */
+function taxonomy_update_7009() {
+  db_change_field('taxonomy_term_data', 'format', 'format', array(
+    'type' => 'varchar',
+    'length' => 255,
+    'not null' => FALSE,
+    'description' => 'The {filter_format}.format of the description.',
+  ));
+}
+
-- 
cgit v1.2.3