Changeset 16259 for trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

Jan 28, 2008, 9:48:08 AM (18 years ago)

Author:

jhoblitt

Message:

add additional fkey constraints to the instance table

File:

• trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (3 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.44 2008-01-26 02:04:46 jhoblitt Exp $
+# $Id: SQL.pm,v 1.45 2008-01-28 19:48:08 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -325 +325 @@
 ###
 
-CREATE TABLE instance (
-    ins_id BIGINT NOT NULL AUTO_INCREMENT,
-    so_id BIGINT NOT NULL,
-    FOREIGN KEY(so_id) REFERENCES storage_object(so_id),
-    vol_id INT NOT NULL,
-    uri VARCHAR(255) NOT NULL UNIQUE,
-    sha1sum CHAR(40) ASCII,
-    assigned_vol_id INT,
-    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    mtime TIMESTAMP,
-    PRIMARY KEY(ins_id),
-    KEY(so_id),
-    KEY(vol_id),
-    KEY(uri(64))
-) ENGINE=innodb;
-
-###
-
 CREATE TABLE lock_record (
     so_id BIGINT NOT NULL,
@@ -365 +347 @@
     KEY(allocate),
     KEY(available)
+) ENGINE=innodb;
+
+###
+
+CREATE TABLE instance (
+    ins_id BIGINT NOT NULL AUTO_INCREMENT,
+    so_id BIGINT NOT NULL,
+    FOREIGN KEY(so_id) REFERENCES storage_object(so_id),
+    vol_id INT NOT NULL,
+    FOREIGN KEY(vol_id) REFERENCES volume(vol_id),
+    uri VARCHAR(255) NOT NULL UNIQUE,
+    sha1sum CHAR(40) ASCII,
+    assigned_vol_id INT,
+    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    mtime TIMESTAMP,
+    PRIMARY KEY(ins_id),
+    KEY(so_id),
+    KEY(vol_id),
+    KEY(uri(64))
 ) ENGINE=innodb;