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

Timestamp:

Jun 30, 2008, 1:14:49 PM (18 years ago)

Author:

jhoblitt

Message:

add volume.host field

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.57 2008-06-09 20:34:30 jhoblitt Exp $
+# $Id: SQL.pm,v 1.58 2008-06-30 23:14:49 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -201 +201 @@
         SELECT
             vol_id,
+            host,
             path,
             xattr,
@@ -216 +217 @@
         SELECT
             vol_id,
+            host,
             path,
             xattr,
@@ -228 +230 @@
     },
     new_volume          => qq{
-        INSERT INTO volume (name, path, allocate, available, xattr)
-        VALUES (?, ?, TRUE, TRUE, FALSE)
+        INSERT INTO volume (name, host, path, allocate, available, xattr)
+        VALUES (?, ?, ?, TRUE, TRUE, FALSE)
     },
     get_volume_by_name => qq{
-        SELECT vol_id, name, path
+        SELECT vol_id, name, host, path
         FROM volume
         WHERE name = ?
@@ -252 +254 @@
             count(ins_id) as instances,
             volume.name as volume_name,
+            volume.host as volume_host,
             count(mountedvol.vol_id) as available_instances,
             count(mountedvol.vol_id) > 0 as recoverable,
@@ -366 +369 @@
     vol_id INT NOT NULL AUTO_INCREMENT,
     name VARCHAR(255) UNIQUE NOT NULL,
+    host VARCHAR(255) NOT NULL,
     path VARCHAR(255) NOT NULL,
     allocate BOOLEAN DEFAULT FALSE,
@@ -372 +376 @@
     PRIMARY KEY(vol_id),
     KEY(name(16)),
+    KEY(host(16)),
     KEY(path(255)),
     KEY(allocate),