Changeset 28794 for branches/eam_branches/ipp-20100621/Nebulous-Server/lib/Nebulous/Server/SQL.pm

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (5 diffs)

branches/eam_branches/ipp-20100621/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -266 +266 @@
             AND mountedvol.name = ?
             AND mountedvol.available = ?
+    },
+    get_ext_id_by_vol_name => qq{
+        SELECT
+            ext_id
+        FROM instance
+        JOIN storage_object
+            USING (so_id)
+        JOIN mountedvol
+            USING(vol_id)
+        JOIN volume
+            USING(vol_id)
+        WHERE volume.name = ?
+            AND mountedvol.available = ?
+        LIMIT ?
     },
     # volume handler
@@ -353 +367 @@
     },
     new_volume          => qq{
-        INSERT INTO volume (name, host, path, allocate, available, xattr, mountpoint, cab_id)
-        VALUES (?, ?, ?, TRUE, TRUE, FALSE, ?, NULL)
+        INSERT INTO volume (name, host, path, allocate, available, xattr, mountpoint, cab_id, note)
+        VALUES (?, ?, ?, TRUE, TRUE, FALSE, ?, NULL, ?)
     },
     get_volume_by_name => qq{
@@ -371 +385 @@
             v.xattr,
             mountedvol.vol_id IS NOT NULL as mounted,
-            v.cab_id
+            v.cab_id,
+            v.note
         FROM volume AS v
         LEFT JOIN mountedvol
@@ -675 +690 @@
     mountpoint VARCHAR(255) NOT NULL,
     cab_id INT,
+    note VARCHAR(255),
     PRIMARY KEY(vol_id),
     UNIQUE KEY(name),
@@ -701 +717 @@
     total BIGINT NOT NULL,
     used BIGINT NOT NULL,
+    note VARCHAR(255),
     PRIMARY KEY(vol_id),
     KEY(name),