Index: image.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/image/image.install,v
retrieving revision 1.15
diff -u -r1.15 image.install
--- image.install	6 Jan 2008 22:15:24 -0000	1.15
+++ image.install	16 Aug 2008 21:56:21 -0000
@@ -249,11 +249,17 @@
   // Copy image files records into the new table.
   $args = array_map('db_escape_string', array_keys(image_get_sizes()));
   $cond = " IN ('". implode("', '",  $args) ."')";
-  $ret[] = update_sql("INSERT INTO {image} SELECT DISTINCT f.nid, f.fid, f.filename FROM {files} f INNER JOIN {node} n ON f.nid = n.nid WHERE n.type='image' AND f.filename". $cond);
-
-  // Remove old file_revision records.
-  $ret[] = update_sql("DELETE FROM {file_revisions} WHERE EXISTS (SELECT * FROM {image} WHERE {image}.fid = {file_revisions}.fid)");
-
+  if (drupal_substr(VERSION, 0, 2) == "5.") {
+    // update code for 5.x-1.x to 5.x-2.x
+    $ret[] = update_sql("INSERT INTO {image} SELECT DISTINCT f.nid, f.fid, f.filename FROM {files} f INNER JOIN {node} n ON f.nid = n.nid WHERE n.type='image' AND f.filename". $cond);
+    
+    // Remove old file_revision records.
+    $ret[] = update_sql("DELETE FROM {file_revisions} WHERE EXISTS (SELECT * FROM {image} WHERE {image}.fid = {file_revisions}.fid)");
+  } else {
+    // update code for 5.x-1.x to 6.x-1.x
+    $ret[] = update_sql("INSERT INTO {image} SELECT DISTINCT u.nid, f.fid, f.filename FROM {upload} u INNER JOIN {files} f ON u.fid=f.fid INNER JOIN {node} n ON u.nid=n.nid WHERE n.type='image' AND f.filename" . $cond);
+    $ret[] = update_sql("DELETE FROM {upload} WHERE EXISTS (SELECT * FROM {image} WHERE {image}.fid = {upload}.fid)");
+  }
   return $ret;
 }