Index: trunk/Nebulous/lib/Nebulous/Server/SQL.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server/SQL.pm	(revision 13173)
+++ trunk/Nebulous/lib/Nebulous/Server/SQL.pm	(revision 13177)
@@ -1,5 +1,5 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.34 2007-05-03 01:44:24 jhoblitt Exp $
+# $Id: SQL.pm,v 1.35 2007-05-03 01:49:55 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -17,5 +17,7 @@
     },
     update_instance_uri => qq{
-        UPDATE instance SET vol_id = ?, uri = ? WHERE ins_id = ?
+        UPDATE instance
+        SET vol_id = ?, uri = ?
+        WHERE ins_id = ?
     },
     last_insert_id      => qq{
@@ -33,7 +35,10 @@
     },
     delete_object       => qq{
-        DELETE storage_object, storage_object_attr 
-        FROM storage_object LEFT JOIN storage_object_attr
-        USING (so_id)
+        DELETE
+            storage_object,
+            storage_object_attr 
+        FROM storage_object
+        JOIN storage_object_attr
+            USING (so_id)
         WHERE storage_object.so_id = ?
     },
@@ -47,8 +52,13 @@
     },
     get_object          => qq{
-        SELECT storage_object.so_id,
-            ext_id, read_lock, write_lock, epoch, mtime
-        FROM storage_object
-        LEFT JOIN storage_object_attr
+        SELECT
+            storage_object.so_id,
+            ext_id,
+            read_lock,
+            write_lock,
+            epoch,
+            mtime
+        FROM storage_object
+        JOIN storage_object_attr
         USING (so_id)
         WHERE ext_id = ?
@@ -56,8 +66,10 @@
     # Note: this sets an update lock
     get_object_locks    => qq{
-        SELECT storage_object.so_id,
-            read_lock, write_lock 
-        FROM storage_object
-        LEFT JOIN storage_object_attr
+        SELECT
+            storage_object.so_id,
+            read_lock,
+            write_lock 
+        FROM storage_object
+        JOIN storage_object_attr
         USING (so_id)
         WHERE ext_id = ?
@@ -104,5 +116,5 @@
     set_write_lock      => qq{
         UPDATE storage_object_attr
-        LEFT JOIN storage_object
+        JOIN storage_object
         USING(so_id)
         SET write_lock = 'write'
@@ -111,5 +123,5 @@
     delete_write_lock   => qq{
         UPDATE storage_object_attr
-        LEFT JOIN storage_object
+        JOIN storage_object
         USING(so_id)
         SET write_lock = NULL
@@ -118,5 +130,5 @@
     increment_read_lock => qq{
         UPDATE storage_object_attr
-        LEFT JOIN storage_object
+        JOIN storage_object
         USING(so_id)
         SET read_lock = read_lock + 1
@@ -125,5 +137,5 @@
     decrement_read_lock => qq{
         UPDATE storage_object_attr
-        LEFT JOIN storage_object
+        JOIN storage_object
         USING(so_id)
         SET read_lock = read_lock - 1