Changeset 18017 for trunk/Nebulous-Server

Timestamp:

Jun 9, 2008, 10:34:30 AM (18 years ago)

Author:

jhoblitt

Message:

SQL tweaks/testing

Location:

trunk/Nebulous-Server/lib/Nebulous

Files:

• Server.pm (modified) (2 diffs)
• Server/SQL.pm (modified) (2 diffs)

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

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.76 2008-05-28 21:03:20 jhoblitt Exp $
+# $Id: Server.pm,v 1.77 2008-06-09 20:34:30 jhoblitt Exp $
 
 package Nebulous::Server;
@@ -209 +209 @@
             
             # create instance with no URI
+#            my $query = $db->prepare_cached( $sql->new_instance );
             my $query = $db->prepare_cached( $sql->new_object_instance );
-            $query->execute($so_id, $vol_id);
+            $query->execute($vol_id);
         }
 

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

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.56 2008-05-30 00:15:53 jhoblitt Exp $
+# $Id: SQL.pm,v 1.57 2008-06-09 20:34:30 jhoblitt Exp $
 
 package Nebulous::Server::SQL;
@@ -40 +40 @@
     new_object_instance => qq{
         INSERT INTO instance 
-        VALUES (NULL, LAST_INSERT_ID(), ?, 'error', NULL, NULL, NULL, NULL)
+        (so_id, vol_id, uri)
+        VALUES (LAST_INSERT_ID(), ?, 'error')
     },
     new_instance        => qq{
         INSERT INTO instance
-        VALUES (NULL, ?, ?, 'error', NULL, NULL, NULL, NULL)
+        (so_id, vol_id, uri)
+        VALUES (?, ?, 'error')
     },
     get_object          => qq{