Index: trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 13092)
+++ trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm	(revision 13115)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.30 2007-05-01 02:52:04 jhoblitt Exp $
+# $Id: SQL.pm,v 1.31 2007-05-02 01:00:10 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -17,5 +17,5 @@
     },
     update_instance_uri => qq{
-        UPDATE instance SET uri = ? WHERE ins_id = ?
+        UPDATE instance SET vol_id = ?, uri = ? WHERE ins_id = ?
     },
     last_insert_id      => qq{
@@ -38,11 +38,11 @@
         WHERE storage_object.so_id = ?
     },
-    new_object_instance  => qq{
+    new_object_instance => qq{
         INSERT INTO instance 
-        VALUES (NULL, LAST_INSERT_ID(), 'error', NULL, NULL, NULL, NULL)
+        VALUES (NULL, LAST_INSERT_ID(), 0, 'error', NULL, NULL, NULL, NULL)
     },
     new_instance        => qq{
         INSERT INTO instance
-        VALUES (NULL, ?, 'error', NULL,NULL, NULL, NULL)
+        VALUES (NULL, ?, 0, 'error', NULL,NULL, NULL, NULL)
     },
     get_object          => qq{
@@ -154,5 +154,6 @@
     get_storage_volume_byname   => qq{
         SELECT
-            path as volume,
+            vol_id,
+            path,
             total - used as free
         FROM mountedvol
@@ -165,5 +166,6 @@
     get_storage_volume          => qq{
         SELECT
-            path as volume,
+            vol_id,
+            path,
             total - used as free
         FROM mountedvol
@@ -210,4 +212,5 @@
 {
     my @clear = split /;/, <<END;
+SET FOREIGN_KEY_CHECKS=0;
 DROP TABLE IF EXISTS storage_object;
 DROP TABLE IF EXISTS storage_object_attr;
@@ -219,5 +222,6 @@
 DROP TABLE IF EXISTS class;
 DROP TABLE IF EXISTS log;
-DROP PROCEDURE IF EXISTS getmountedvol
+DROP PROCEDURE IF EXISTS getmountedvol;
+SET FOREIGN_KEY_CHECKS=1
 END
     $sql{get_db_clear} = \@clear;
@@ -273,4 +277,5 @@
     ins_id BIGINT NOT NULL AUTO_INCREMENT,
     so_id BIGINT NOT NULL,
+    vol_id INT NOT NULL,
     uri VARCHAR(255) NOT NULL,
     sha1sum CHAR(40) ASCII,