Remove stray $DB::single

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / CDBICompat / HasMany.pm

diff --git a/lib/DBIx/Class/CDBICompat/HasMany.pm b/lib/DBIx/Class/CDBICompat/HasMany.pm
index 56c044d..6438e43 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/HasMany.pm
+++ b/lib/DBIx/Class/CDBICompat/HasMany.pm
@@ -1,4 +1,5 @@
-package DBIx::Class::CDBICompat::HasMany;
+package # hide from PAUSE
+    DBIx::Class::CDBICompat::HasMany;
 
 use strict;
 use warnings;
@@ -6,48 +7,40 @@ use warnings;
 sub has_many {
   my ($class, $rel, $f_class, $f_key, $args) = @_;
 
-  my $self_key;
+  my @f_method;
 
   if (ref $f_class eq 'ARRAY') {
-    ($f_class, $self_key) = @$f_class;
+    ($f_class, @f_method) = @$f_class;
   }
 
-  if (!$self_key || $self_key eq 'id') {
-    my ($pri, $too_many) = keys %{ $class->_primaries };
-    $class->throw( "has_many only works with a single primary key; ${class} has more" )
-      if $too_many;
-    $self_key = $pri;
-  }
-    
-  eval "require $f_class";
+  if (ref $f_key eq 'HASH' && !$args) { $args = $f_key; undef $f_key; };
 
-  if (ref $f_key eq 'HASH') { $args = $f_key; undef $f_key; };
+  $args ||= {};
+  if (delete $args->{no_cascade_delete}) {
+    $args->{cascade_delete} = 0;
+  }
 
-  #unless ($f_key) { Not selective enough. Removed pending fix.
-  #  ($f_rel) = grep { $_->{class} && $_->{class} eq $class }
-  #               $f_class->_relationships;
-  #}
+  if( !$f_key and !@f_method ) {
+      my $f_source = $f_class->result_source_instance;
+      ($f_key) = grep { $f_source->relationship_info($_)->{class} eq $class }
+                      $f_source->relationships;
+  }
 
-  unless ($f_key) {
-    #warn join(', ', %{ $f_class->_columns });
-    $class =~ /([^\:]+)$/;
-    #warn $1;
-    $f_key = lc $1 if $f_class->_columns->{lc $1};
+  $class->next::method($rel, $f_class, $f_key, $args);
+
+  if (@f_method) {
+    no strict 'refs';
+    no warnings 'redefine';
+    my $post_proc = sub { my $o = shift; $o = $o->$_ for @f_method; $o; };
+    *{"${class}::${rel}"} =
+      sub {
+        my $rs = shift->search_related($rel => @_);
+        $rs->{attrs}{record_filter} = $post_proc;
+        return (wantarray ? $rs->all : $rs);
+      };
+    return 1;
   }
 
-  $class->throw( "Unable to resolve foreign key for has_many from ${class} to ${f_class}" )
-    unless $f_key;
-  $class->throw( "No such column ${f_key} on foreign class ${f_class}" )
-    unless $f_class->_columns->{$f_key};
-  $args ||= {};
-  my $cascade = not (ref $args eq 'HASH' && delete $args->{no_cascade_delete});
-  $class->add_relationship($rel, $f_class,
-                            { "foreign.${f_key}" => "self.${self_key}" },
-                            { accessor => 'multi',
-                              join_type => 'LEFT',
-                              ($cascade ? ('cascade_delete' => 1) : ()),
-                              %$args } );
-  return 1;
 }
 
 1;