X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FPK.pm;h=ed0b830a4302fae3d52ef7ac3a8a11ea8c012792;hb=1a14aa3f5016c456db28c148abab256ea72776df;hp=32165dc49802ebf55df2a7ed0f0ac8ebf94e813a;hpb=34d52be2d55c86c6eddd2317157db7f2accbe810;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/PK.pm b/lib/DBIx/Class/PK.pm
index 32165dc..ed0b830 100644
--- a/lib/DBIx/Class/PK.pm
+++ b/lib/DBIx/Class/PK.pm
@@ -2,8 +2,9 @@ package DBIx::Class::PK;
 
 use strict;
 use warnings;
+use Tie::IxHash;
 
-use base qw/Class::Data::Inheritable DBIx::Class::SQL/;
+use base qw/Class::Data::Inheritable/;
 
 __PACKAGE__->mk_classdata('_primaries' => {});
 
@@ -38,61 +39,72 @@ sub _ident_values {
 sub set_primary_key {
   my ($class, @cols) = @_;
   my %pri;
-  $pri{$_} = {} for @cols;
+  tie %pri, 'Tie::IxHash';
+  %pri = map { $_ => {} } @cols;
   $class->_primaries(\%pri);
 }
 
-sub retrieve {
+sub find {
   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 find unless primary columns are defined" ) 
+    unless @pk;
   my $query;
   if (ref $vals[0] eq 'HASH') {
     $query = $vals[0];
   } elsif (@pk == @vals) {
-    my $ret = ($class->retrieve_from_sql($class->_ident_cond, @vals, $attrs))[0];
+    $query = {};
+    @{$query}{@pk} = @vals;
+    #my $ret = ($class->search_literal($class->_ident_cond, @vals, $attrs))[0];
     #warn "$class: ".join(', ', %{$ret->{_column_data}});
-    return $ret;
+    #return $ret;
   } else {
     $query = {@vals};
   }
-  die "Can't retrieve unless all primary keys are specified"
+  $class->throw( "Can't find 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];
-  #warn "$class: ".join(', ', %{$ret->{_column_data}});
-  return $ret;
+  #return $class->search($query)->next;
+  my @cols = $class->_select_columns;
+  my @row = $class->storage->select_single($class->_table_name, \@cols, $query);
+  return (@row ? $class->_row_to_object(\@cols, \@row) : ());
 }
 
 sub discard_changes {
   my ($self) = @_;
   delete $self->{_dirty_columns};
-  return unless $self->in_database; # Don't reload if we aren't real!
-  my ($reload) = $self->retrieve($self->id);
+  return unless $self->in_storage; # Don't reload if we aren't real!
+  my ($reload) = $self->find($self->id);
   unless ($reload) { # If we got deleted in the mean-time
-    $self->in_database(0);
+    $self->in_storage(0);
     return $self;
   }
-  $self->store_column($_ => $reload->get_column($_))
-    foreach keys %{$self->_columns};
+  delete @{$self}{keys %$self};
+  @{$self}{keys %$reload} = values %$reload;
+  #$self->store_column($_ => $reload->get_column($_))
+  #  foreach keys %{$self->_columns};
   return $self;
 }
 
 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]);
 }
 
+sub primary_columns {
+  return keys %{shift->_primaries};
+}
+
 1;
 
 =back
 
 =head1 AUTHORS
 
-Matt S. Trout <perl-stuff@trout.me.uk>
+Matt S. Trout <mst@shadowcatsystems.co.uk>
 
 =head1 LICENSE