Fixed dumbass typo in t/lib

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Row.pm

diff --git a/lib/DBIx/Class/Row.pm b/lib/DBIx/Class/Row.pm
index e61c1c9..26b0c14 100644 (file)
--- 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 Carp qw/croak/;
+
 use base qw/DBIx::Class/;
 
 __PACKAGE__->load_components(qw/AccessorGroup/);
@@ -37,7 +39,7 @@ 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);
+      croak "No such column $k on $class" unless $class->has_column($k);
       $new->store_column($k => $v);
     }
   }
@@ -60,7 +62,7 @@ sub insert {
   $self->{result_source} ||= $self->result_source_instance
     if $self->can('result_source_instance');
   my $source = $self->{result_source};
-  die "No result_source set on this object; can't insert" unless $source;
+  croak "No result_source set on this object; can't insert" unless $source;
   #use Data::Dumper; warn Dumper($self);
   $source->storage->insert($source->from, { $self->get_columns });
   $self->in_storage(1);
@@ -126,7 +128,7 @@ sub delete {
       $self->result_source->from, $self->ident_condition);
     $self->in_storage(undef);
   } else {
-    die "Can't do class delete without a ResultSource instance"
+    croak "Can't do class delete without a ResultSource instance"
       unless $self->can('result_source_instance');
     my $attrs = { };
     if (@_ > 1 && ref $_[$#_] eq 'HASH') {
@@ -167,7 +169,7 @@ Does C<get_column>, for all column values at once.
 
 sub get_columns {
   my $self = shift;
-  return return %{$self->{_column_data}};
+  return %{$self->{_column_data}};
 }
 
 =head2 get_dirty_columns
@@ -269,23 +271,22 @@ sub inflate_result {
                   ref $class || $class);
   my $schema;
   PRE: foreach my $pre (keys %{$prefetch||{}}) {
-    my $rel_obj = $class->relationship_info($pre);
-    die "Can't prefetch non-eistant relationship ${pre}" unless $rel_obj;
-    $schema ||= $source->schema;
-    my $pre_class = $schema->class($rel_obj->{class});
-    my $fetched = $pre_class->inflate_result(
-                    $schema->source($pre_class), @{$prefetch->{$pre}});
+    my $pre_source = $source->related_source($pre);
+    croak "Can't prefetch non-existant relationship ${pre}" unless $pre_source;
+    my $fetched = $pre_source->result_class->inflate_result(
+                    $pre_source, @{$prefetch->{$pre}});
+    my $accessor = $source->relationship_info($pre)->{attrs}{accessor};
     $class->throw("No accessor for prefetched $pre")
-      unless defined $rel_obj->{attrs}{accessor};
-    PRIMARY: foreach my $pri ($rel_obj->{class}->primary_columns) {
+      unless defined $accessor;
+    PRIMARY: foreach my $pri ($pre_source->primary_columns) {
       unless (defined $fetched->get_column($pri)) {
         undef $fetched;
         last PRIMARY;
       }
     }
-    if ($rel_obj->{attrs}{accessor} eq 'single') {
+    if ($accessor eq 'single') {
       $new->{_relationship_data}{$pre} = $fetched;
-    } elsif ($rel_obj->{attrs}{accessor} eq 'filter') {
+    } elsif ($accessor eq 'filter') {
       $new->{_inflated_column}{$pre} = $fetched;
     } else {
       $class->throw("Don't know how to store prefetched $pre");
@@ -321,8 +322,17 @@ sub is_changed {
 
   Accessor to the ResultSource this object was created from
 
+=head2 register_column($column, $column_info)
+
+  Registers a column on the class and creates an accessor for it
+
 =cut
 
+sub register_column {
+  my ($class, $col, $info) = @_;
+  $class->mk_group_accessors('column' => $col);
+}
+
 1;
 
 =head1 AUTHORS