Changeset 18388

Timestamp:

Jun 30, 2008, 1:26:16 PM (18 years ago)

Author:

jhoblitt

Message:

add volume.host field

File:

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

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.58 2008-06-30 23:14:49 jhoblitt Exp $
+# $Id: SQL.pm,v 1.59 2008-06-30 23:26:16 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -431 +431 @@
     FOREIGN KEY(vol_id) REFERENCES volume(vol_id) ON DELETE CASCADE,
     name VARCHAR(255) NOT NULL,
+    host VARCHAR(255) NOT NULL,
     path VARCHAR(255) NOT NULL,
     FOREIGN KEY(path) REFERENCES volume(path) ON DELETE CASCADE,
@@ -448 +449 @@
     DECLARE vol_idvar INT;
     DECLARE namevar VARCHAR(255);
+    DECLARE hostvar VARCHAR(255);
     DECLARE pathvar VARCHAR(255);
     DECLARE allocatevar BOOLEAN;
@@ -453 +455 @@
     DECLARE xattrvar BOOLEAN;
     DECLARE trans_level VARCHAR(255);
-    DECLARE cur1 CURSOR FOR SELECT vol_id, name, path, allocate, available, xattr FROM volume;
+    DECLARE cur1 CURSOR FOR SELECT vol_id, name, host, path, allocate, available, xattr FROM volume;
     DECLARE CONTINUE HANDLER FOR SQLSTATE '02000' SET done = TRUE;
 
@@ -471 +473 @@
 
     myloop: LOOP
-        FETCH cur1 INTO vol_idvar, namevar, pathvar, allocatevar, availablevar, xattrvar;
+        FETCH cur1 INTO vol_idvar, namevar, hostvar, pathvar, allocatevar, availablevar, xattrvar;
         IF `done` THEN LEAVE myloop; END IF;
         INSERT INTO mountedvol
-            SELECT mountpoint, total, used, vol_idvar, namevar, pathvar, allocatevar, availablevar, xattrvar
+            SELECT mountpoint, total, used, vol_idvar, namevar, hostvar, pathvar, allocatevar, availablevar, xattrvar
             FROM
                 (SELECT *, INSTR(pathvar, mountpoint) = 1 as substring