Database changes for image backed datasets.

sql/database-create.sql

@@ -74,7 +74,7 @@ CREATE TABLE `apt_datasets` (
   `expires` datetime default NULL,
   `last_used` datetime default NULL,
   `state` enum('new','valid','unapproved','grace','locked','expired','busy') NOT NULL default 'new',  
-  `type` enum('stdataset','ltdataset','unknown') NOT NULL default 'unknown',
+  `type` enum('stdataset','ltdataset','imdataset','unknown') NOT NULL default 'unknown',
   `fstype` varchar(40) NOT NULL default 'none',
   `size` int(10) unsigned NOT NULL default '0',
   `read_access` enum('project','global') NOT NULL default 'project',
@@ -2048,6 +2048,7 @@ CREATE TABLE `image_versions` (
   `noexport` tinyint(1) NOT NULL default '0',
   `ready` tinyint(1) NOT NULL default '0',
   `isdelta` tinyint(1) NOT NULL default '0',
+  `isdataset` tinyint(1) NOT NULL default '0',
   `released` tinyint(1) NOT NULL default '0',
   `nodetypes` text default NULL,
   `notes` mediumtext,

sql/database-fill.sql

@@ -1202,6 +1202,7 @@ REPLACE INTO table_regex VALUES ('elabinelab_attributes','ordering','int','redir
 REPLACE INTO table_regex VALUES ('images','auth_key','text','regex','^[0-9a-fA-F,]+$',0,0,NULL);
 REPLACE INTO table_regex VALUES ('images','auth_uuid','text','regex','^[0-9a-fA-F]+$',0,0,NULL);
 REPLACE INTO table_regex VALUES ('images','decryption_key','text','regex','^[0-9a-fA-F]+$',0,0,NULL);
+REPLACE INTO table_regex VALUES ('images','isdataset','int','redirect','default:boolean',0,0,NULL);
 
 REPLACE INTO table_regex VALUES ('experiment_blobs','path','text','redirect','default:text',0,0,NULL);
 REPLACE INTO table_regex VALUES ('experiment_blobs','action','text','redirect','default:text',0,0,NULL);

sql/updates/4/432

+#
+# Dataset stuff
+#
+use strict;
+use libdb;
+
+sub DoUpdate($$$)
+{
+    my ($dbhandle, $dbname, $version) = @_;
+
+    if (!DBSlotExists("image_versions", "isdataset")) {
+	DBQueryFatal("alter table image_versions add ".
+		     " `isdataset` tinyint(1) NOT NULL default '0' ".
+		     "   after isdelta");
+    }
+    DBQueryFatal("alter table apt_datasets change `type` `type` ".
+		 "  enum('stdataset','ltdataset','imdataset','unknown') ".
+		 "    NOT NULL default 'unknown'");
+    }
+    DBQueryFatal("REPLACE INTO table_regex VALUES ".
+		 " ('images','isdataset','int','redirect', ".
+		 "  'default:boolean',0,0,NULL)");
+    return 0;
+}
+1;
+
+# Local Variables:
+# mode:perl
+# End: