X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=487aa94edbe7f7339f9c351a5cd02da889cba9ce;hb=78bab9cad621ac5e3d1d12b02c41d662dec7a22a;hp=1ae5331f496285b096b9d8175ceabcf3a5243845;hpb=95a70f01eae4b2c325a3a527a72cf8ae91796e8c;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm index 1ae5331..487aa94 100644 --- a/lib/DBIx/Class/PK.pm +++ b/lib/DBIx/Class/PK.pm @@ -48,7 +48,8 @@ sub retrieve { my ($class, @vals) = @_; my $attrs = (@vals > 1 && ref $vals[$#vals] eq 'HASH' ? pop(@vals) : {}); my @pk = keys %{$class->_primaries}; - die "Can't retrieve unless primary columns are defined" unless @pk; + $class->throw( "Can't retrieve unless primary columns are defined" ) + unless @pk; my $query; if (ref $vals[0] eq 'HASH') { $query = $vals[0]; @@ -59,7 +60,7 @@ sub retrieve { } else { $query = {@vals}; } - die "Can't retrieve unless all primary keys are specified" + $class->throw( "Can't retrieve unless all primary keys are specified" ) unless (keys %$query >= @pk); # If we check 'em we run afoul of uc/lc # column names etc. Not sure what to do yet my $ret = ($class->search($query))[0]; @@ -83,7 +84,7 @@ sub discard_changes { sub id { my ($self) = @_; - die "Can't call id() as a class method" unless ref $self; + $self->throw( "Can't call id() as a class method" ) unless ref $self; my @pk = $self->_ident_values; return (wantarray ? @pk : $pk[0]); }