X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRow.pm;h=fc4a07271db3f976340d5fc0a45addd627b8c516;hb=fea3d0452969e98afc0296ba80f90a91ab7dc1be;hp=f789b2907481ddda1344b1a6cb1f4c114d3160f6;hpb=1a14aa3f5016c456db28c148abab256ea72776df;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Row.pm b/lib/DBIx/Class/Row.pm
index f789b29..fc4a072 100644
--- a/lib/DBIx/Class/Row.pm
+++ b/lib/DBIx/Class/Row.pm
@@ -3,6 +3,8 @@ package DBIx::Class::Row;
 use strict;
 use warnings;
 
+use base qw/DBIx::Class/;
+
 =head1 NAME 
 
 DBIx::Class::Row - Basic row methods
@@ -16,9 +18,7 @@ derived from L<DBIx::Class::Table> objects.
 
 =head1 METHODS
 
-=over 4
-
-=item new
+=head2 new
 
   my $obj = My::Class->new($attrs);
 
@@ -33,13 +33,14 @@ sub new {
   if ($attrs) {
     $new->throw("attrs must be a hashref" ) unless ref($attrs) eq 'HASH';
     while (my ($k, $v) = each %{$attrs}) {
+      die "No such column $k on $class" unless $class->has_column($k);
       $new->store_column($k => $v);
     }
   }
   return $new;
 }
 
-=item insert
+=head2 insert
 
   $obj->insert;
 
@@ -52,18 +53,13 @@ sub insert {
   my ($self) = @_;
   return $self if $self->in_storage;
   #use Data::Dumper; warn Dumper($self);
-  my %in;
-  $in{$_} = $self->get_column($_)
-    for grep { defined $self->get_column($_) } $self->columns;
-  my %out = %{ $self->storage->insert($self->_table_name, \%in) };
-  $self->store_column($_, $out{$_})
-    for grep { $self->get_column($_) ne $out{$_} } keys %out;
+  $self->storage->insert($self->_table_name, { $self->get_columns });
   $self->in_storage(1);
   $self->{_dirty_columns} = {};
   return $self;
 }
 
-=item in_storage
+=head2 in_storage
 
   $obj->in_storage; # Get value
   $obj->in_storage(1); # Set value
@@ -78,21 +74,7 @@ sub in_storage {
   return $self->{_in_storage};
 }
 
-=item create
-
-  my $new = My::Class->create($attrs);
-
-A shortcut for My::Class->new($attrs)->insert;
-
-=cut
-
-sub create {
-  my ($class, $attrs) = @_;
-  $class->throw( "create needs a hashref" ) unless ref $attrs eq 'HASH';
-  return $class->new($attrs)->insert;
-}
-
-=item update
+=head2 update
 
   $obj->update;
 
@@ -104,10 +86,9 @@ UPDATE query to commit any changes to the object to the db if required.
 sub update {
   my ($self, $upd) = @_;
   $self->throw( "Not in database" ) unless $self->in_storage;
-  my %to_update = %{$upd || {}};
-  $to_update{$_} = $self->get_column($_) for $self->is_changed;
+  my %to_update = $self->get_dirty_columns;
   return -1 unless keys %to_update;
-  my $rows = $self->storage->update($self->_table_name, \%to_update,
+  my $rows = $self->storage->update($self->result_source->from, \%to_update,
                                       $self->ident_condition);
   if ($rows == 0) {
     $self->throw( "Can't update ${self}: row not found" );
@@ -118,14 +99,7 @@ sub update {
   return $self;
 }
 
-sub ident_condition {
-  my ($self) = @_;
-  my %cond;
-  $cond{$_} = $self->get_column($_) for keys %{$self->_primaries};
-  return \%cond;
-}
-
-=item delete
+=head2 delete
 
   $obj->delete
 
@@ -140,7 +114,7 @@ sub delete {
   if (ref $self) {
     $self->throw( "Not in database" ) unless $self->in_storage;
     #warn $self->_ident_cond.' '.join(', ', $self->_ident_values);
-    $self->storage->delete($self->_table_name, $self->ident_condition);
+    $self->storage->delete($self->result_source->from, $self->ident_condition);
     $self->in_storage(undef);
     #$self->store_column($_ => undef) for $self->primary_columns;
       # Should probably also arrange to trash PK if auto
@@ -156,29 +130,58 @@ sub delete {
   return $self;
 }
 
-=item get_column
+=head2 get_column
 
   my $val = $obj->get_column($col);
 
-Fetches a column value
+Gets a column value from a row object. Currently, does not do
+any queries; the column must have already been fetched from
+the database and stored in the object.
 
 =cut
 
 sub get_column {
   my ($self, $column) = @_;
   $self->throw( "Can't fetch data as class method" ) unless ref $self;
-  $self->throw( "No such column '${column}'" ) unless $self->_columns->{$column};
   return $self->{_column_data}{$column}
     if exists $self->{_column_data}{$column};
+  $self->throw( "No such column '${column}'" ) unless $self->has_column($column);
   return undef;
 }
 
-=item set_column
+=head2 get_columns
+
+  my %data = $obj->get_columns;
+
+Does C<get_column>, for all column values at once.
+
+=cut
+
+sub get_columns {
+  my $self = shift;
+  return return %{$self->{_column_data}};
+}
+
+=head2 get_dirty_columns
+
+  my %data = $obj->get_dirty_columns;
+
+Identical to get_columns but only returns those that have been changed.
+
+=cut
+
+sub get_dirty_columns {
+  my $self = shift;
+  return map { $_ => $self->{_column_data}{$_} }
+           keys %{$self->{_dirty_columns}};
+}
+
+=head2 set_column
 
   $obj->set_column($col => $val);
 
-Sets a column value; if the new value is different to the old the column
-is marked as dirty for when you next call $obj->update
+Sets a column value. If the new value is different from the old one,
+the column is marked as dirty for when you next call $obj->update.
 
 =cut
 
@@ -191,38 +194,82 @@ sub set_column {
   return $ret;
 }
 
-=item store_column
+=head2 set_columns
+
+  my $copy = $orig->set_columns({ $col => $val, ... });
+
+Sets more than one column value at once.
+
+=cut
+
+sub set_columns {
+  my ($self,$data) = @_;
+  while (my ($col,$val) = each %$data) {
+    $self->set_column($col,$val);
+  }
+}
+
+=head2 copy
+
+  my $copy = $orig->copy({ change => $to, ... });
+
+Inserts a new row with the specified changes.
+
+=cut
+
+=head2 store_column
 
   $obj->store_column($col => $val);
 
-Sets a column value without marking it as dirty
+Sets a column value without marking it as dirty.
 
 =cut
 
 sub store_column {
   my ($self, $column, $value) = @_;
   $self->throw( "No such column '${column}'" ) 
-    unless $self->_columns->{$column};
+    unless exists $self->{_column_data}{$column} || $self->has_column($column);
   $self->throw( "set_column called for ${column} without value" ) 
     if @_ < 3;
   return $self->{_column_data}{$column} = $value;
 }
 
-sub _row_to_object {
-  my ($class, $cols, $row) = @_;
-  my %vals;
-  $vals{$cols->[$_]} = $row->[$_] for 0 .. $#$cols;
-  my $new = $class->new(\%vals);
-  $new->in_storage(1);
-  return $new;
-}
+=head2 inflate_result
 
-=item copy
+  Class->inflate_result(\%me, \%prefetch?)
 
-  my $copy = $orig->copy({ change => $to, ... });
+Called by ResultSet to inflate a result from storage
 
 =cut
 
+sub inflate_result {
+  my ($class, $me, $prefetch) = @_;
+  #use Data::Dumper; print Dumper(@_);
+  my $new = bless({ _column_data => $me }, ref $class || $class);
+  $new->in_storage(1);
+  PRE: foreach my $pre (keys %{$prefetch||{}}) {
+    my $rel_obj = $class->_relationships->{$pre};
+    my $pre_class = $class->resolve_class($rel_obj->{class});
+    my $fetched = $pre_class->inflate_result(@{$prefetch->{$pre}});
+    $class->throw("No accessor for prefetched $pre")
+      unless defined $rel_obj->{attrs}{accessor};
+    if ($rel_obj->{attrs}{accessor} eq 'single') {
+      PRIMARY: foreach my $pri ($rel_obj->{class}->primary_columns) {
+        unless (defined $fetched->get_column($pri)) {
+          undef $fetched;
+          last PRIMARY;
+        }
+      }
+      $new->{_relationship_data}{$pre} = $fetched;
+    } elsif ($rel_obj->{attrs}{accessor} eq 'filter') {
+      $new->{_inflated_column}{$pre} = $fetched;
+    } else {
+      $class->throw("Don't know how to store prefetched $pre");
+    }
+  }
+  return $new;
+}
+
 sub copy {
   my ($self, $changes) = @_;
   my $new = bless({ _column_data => { %{$self->{_column_data}}} }, ref $self);
@@ -230,11 +277,11 @@ sub copy {
   return $new->insert;
 }
 
-=item insert_or_update
+=head2 insert_or_update
 
   $obj->insert_or_update
 
-Updates the object if it's already in the db, else inserts it
+Updates the object if it's already in the db, else inserts it.
 
 =cut
 
@@ -243,7 +290,7 @@ sub insert_or_update {
   return ($self->in_storage ? $self->update : $self->insert);
 }
 
-=item is_changed
+=head2 is_changed
 
   my @changed_col_names = $obj->is_changed
 
@@ -255,8 +302,6 @@ sub is_changed {
 
 1;
 
-=back
-
 =head1 AUTHORS
 
 Matt S. Trout <mst@shadowcatsystems.co.uk>