[Jifty-commit] r2721 - jifty/branches/virtual-models/lib/Jifty

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Mon Jan 29 06:51:21 EST 2007


Author: audreyt
Date: Mon Jan 29 06:51:08 2007
New Revision: 2721

Modified:
   jifty/branches/virtual-models/lib/Jifty/Handle.pm
   jifty/branches/virtual-models/lib/Jifty/Record.pm

Log:
* Allow for hand-set uuids.

Modified: jifty/branches/virtual-models/lib/Jifty/Handle.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Handle.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/Handle.pm	Mon Jan 29 06:51:08 2007
@@ -223,12 +223,17 @@
 sub insert {
     my $self  = shift;
     my $table = shift;
-    my $rv = $self->SUPER::insert($table, @_);
+    my %attrs = @_;
+    my $uuid  = delete($attrs{__uuid});
+
+    my $rv = $self->SUPER::insert($table, %attrs);
 
     if ($rv) {
         # Generate a UUID on the sideband: $table - $rv - UUID.
-        my $uuid = Jifty::Util->generate_uuid;
-        $self->dbh->do(qq[ INSERT INTO _jifty_uuids VALUES (?, ?, ?) ], {}, $uuid, $table, $rv);
+        $self->dbh->do(
+            qq[ INSERT INTO _jifty_uuids VALUES (?, ?, ?) ], {},
+            ($uuid || Jifty::Util->generate_uuid), $table, $rv
+        );
     }
 
     return $rv;

Modified: jifty/branches/virtual-models/lib/Jifty/Record.pm
==============================================================================
--- jifty/branches/virtual-models/lib/Jifty/Record.pm	(original)
+++ jifty/branches/virtual-models/lib/Jifty/Record.pm	Mon Jan 29 06:51:08 2007
@@ -487,13 +487,13 @@
     return "ALTER TABLE " . $self->table . " DROP COLUMN " . $col->name;
 }
 
-=head2 uuid
+=head2 __uuid
 
 Get the UUID of any given row.
 
 =cut
 
-sub uuid {
+sub __uuid {
     my $self = shift;
     my $id = $self->id or return undef;
     my $table = $self->table or return undef;


More information about the Jifty-commit mailing list