#453254 follow-up by agentrickard: Move block update to block.install.

2 files changed, 39 insertions, 40 deletions

diff --git a/modules/block/block.install b/modules/block/block.install
index c68a60286..b3c207996 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -235,3 +235,42 @@ function block_update_7000() {
   $ret[] = update_sql("UPDATE {system} SET weight = -5 WHERE name = 'block'");
   return $ret;
 }
+
+
+/**
+ * Add the block_node_type table.
+ */
+function block_update_7001() {
+  $ret = array();
+
+  $schema['block_node_type'] = array(
+    'description' => 'Sets up display criteria for blocks based on content types',
+    'fields' => array(
+      'module' => array(
+        'type' => 'varchar',
+        'length' => 64,
+        'not null' => TRUE,
+        'description' => "The block's origin module, from {block}.module.",
+      ),
+      'delta' => array(
+        'type' => 'varchar',
+        'length' => 32,
+        'not null' => TRUE,
+        'description' => "The block's unique delta within module, from {block}.delta.",
+      ),
+      'type' => array(
+        'type' => 'varchar',
+        'length' => 32,
+        'not null' => TRUE,
+        'description' => "The machine-readable name of this type from {node_type}.type.",
+      ),
+    ),
+    'primary key' => array('module', 'delta', 'type'),
+    'indexes' => array(
+      'type' => array('type'),
+    ),
+  );
+
+  db_create_table($ret, 'block_node_type', $schema['block_node_type']);
+  return $ret;
+}
diff --git a/modules/system/system.install b/modules/system/system.install
index 0d921426e..f402edd58 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2224,46 +2224,6 @@ function system_update_7028() {
 }
 
 /**
- * Add the block_node_type table.
- */
-function system_update_7029() {
-  $ret = array();
-
-  $schema['block_node_type'] = array(
-    'description' => 'Sets up display criteria for blocks based on content types',
-    'fields' => array(
-      'module' => array(
-        'type' => 'varchar',
-        'length' => 64,
-        'not null' => TRUE,
-        'description' => "The block's origin module, from {block}.module.",
-      ),
-      'delta' => array(
-        'type' => 'varchar',
-        'length' => 32,
-        'not null' => TRUE,
-        'description' => "The block's unique delta within module, from {block}.delta.",
-      ),
-      'type' => array(
-        'type' => 'varchar',
-        'length' => 32,
-        'not null' => TRUE,
-        'description' => "The machine-readable name of this type from {node_type}.type.",
-      ),
-    ),
-    'primary key' => array('module', 'delta', 'type'),
-    'indexes' => array(
-      'type' => array('type'),
-    ),
-  );
-
-  db_create_table($ret, 'block_node_type', $schema['block_node_type']);
-  return $ret;
-}
-
-
-
-/**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
  */