From 4b586bfecae3400ce62cf6ea6bfbd99de23a9dbe Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 4 Oct 2010 21:58:45 +0000
Subject: [PATCH] #895176 follow-up by Berdir: Don't run the upload module
 upgrade path if there's nothing to upgrade.

---
 modules/system/system.install | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/system/system.install b/modules/system/system.install
index 97e058e8698..ae7ada281d8 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -2593,6 +2593,16 @@ function system_update_7060() {
     return;
   }
 
+  if (!db_query_range('SELECT 1 FROM {upload}', 0, 1)->fetchField()) {
+    // There is nothing to migrate. Delete variables and the empty table. There
+    // is no need to create fields that are not going to be used.
+    foreach (_update_7000_node_get_types() as $node_type) {
+      variable_del('upload_' . $node_type->type);
+    }
+    db_drop_table('upload');
+    return;
+  }
+
   // Check which node types have upload.module attachments enabled.
   $context['types'] = array();
   foreach (_update_7000_node_get_types() as $node_type) {