From c03281ba49c39a0f2d1a9c45219135a7de03c5cc Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Tue, 7 Mar 2017 12:07:29 -0700
Subject: [PATCH] Ack, back out last change. I hated it.

---
 sql/database-create.sql | 4 ++--
 sql/updates/4/569       | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/sql/database-create.sql b/sql/database-create.sql
index 86efd2195..86b3aa316 100644
--- a/sql/database-create.sql
+++ b/sql/database-create.sql
@@ -2319,8 +2319,8 @@ DROP TABLE IF EXISTS `image_deletions`;
 CREATE TABLE `image_deletions` (
   `urn` varchar(128) default NULL,
   `image_uuid` varchar(40) NOT NULL default '',
-  `version` int(8) unsigned default NULL,
-  `deleted` datetime default NULL
+  `deleted` datetime default NULL,
+  PRIMARY KEY  (`image_uuid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 
 --
diff --git a/sql/updates/4/569 b/sql/updates/4/569
index a1ed4991e..48112147a 100644
--- a/sql/updates/4/569
+++ b/sql/updates/4/569
@@ -5,12 +5,9 @@ sub DoUpdate($$$)
 {
     my ($dbhandle, $dbname, $version) = @_;
 
-    if (!DBSlotExists("image_deletions", "version")) {
-	DBQueryFatal("alter table image_deletions add ".
-		     " `version` int(8) unsigned default NULL ".
-		     "    after image_uuid");
-    }    
-    DBQueryFatal("alter table image_deletions drop primary key");
+    #
+    # This has been nullified; made a mistake.
+    #
     return 0;
 }
 
-- 
GitLab