Index: trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 13131)
+++ trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 13173)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.33 2007-05-02 20:53:42 jhoblitt Exp $
+# $Id: SQL.pm,v 1.34 2007-05-03 01:44:24 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -144,11 +144,30 @@
         WHERE so_id = ?
     },
-    get_object_instances        => qq{
-        SELECT storage_object.so_id,
-            uri, assigned_location
-        FROM storage_object
-        LEFT JOIN instance
-        USING (so_id)
-        WHERE ext_id = ?
+    get_object_instances    => qq{
+        SELECT
+            storage_object.so_id,
+            uri,
+            assigned_vol_id
+        FROM storage_object
+        JOIN instance
+            USING (so_id)
+        JOIN mountedvol
+            USING(vol_id)
+        WHERE ext_id = ?
+            AND available = ?
+    },
+    get_object_instances_by_vol_name => qq{
+        SELECT
+            storage_object.so_id,
+            uri,
+            assigned_vol_id
+        FROM storage_object
+        JOIN instance
+            USING (so_id)
+        JOIN mountedvol
+            USING(vol_id)
+        WHERE ext_id = ?
+            AND name = ?
+            AND available = ?
     },
     get_storage_volume_byname   => qq{
@@ -284,5 +303,5 @@
     uri VARCHAR(255) NOT NULL,
     sha1sum CHAR(40) ASCII,
-    assigned_location BOOL,
+    assigned_vol_id INT,
     epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     mtime TIMESTAMP,