X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=85d011031e41e6039b1087cd5369c0d00d83851c;hb=2f01b5e3e1ba77316270cb2d7feac4330fd2ff7e;hp=9d2760ecb588854e474607f049d6e15cbb667ddc;hpb=8990a2b23d98bcb87da292ee3731de3ac4f1b86f;p=dbsrgits%2FDBIx-Class-Schema-Loader.git

diff --git a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
index 9d2760e..85d0110 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -18,7 +18,7 @@ use String::ToIdentifier::EN::Unicode ();
 use Class::Unload ();
 use Class::Inspector ();
 
-our $VERSION = '0.07028';
+our $VERSION = '0.07036_04';
 
 # Glossary:
 #
@@ -149,8 +149,8 @@ sub new {
 
     # validate the relationship_attrs arg
     if( defined $self->relationship_attrs ) {
-        ref $self->relationship_attrs eq 'HASH'
-            or croak "relationship_attrs must be a hashref";
+        (ref $self->relationship_attrs eq 'HASH' || ref $self->relationship_attrs eq 'CODE')
+            or croak "relationship_attrs must be a hashref or coderef";
     }
 
     return $self;
@@ -257,16 +257,30 @@ sub _default_relationship_attrs { +{
 # The attributes from the database override the default attributes, which in
 # turn are overridden by user supplied attributes.
 sub _relationship_attrs {
-    my ( $self, $reltype, $db_attrs ) = @_;
+    my ( $self, $reltype, $db_attrs, $params ) = @_;
     my $r = $self->relationship_attrs;
 
     my %composite = (
         %{ $self->_default_relationship_attrs->{$reltype} || {} },
         %{ $db_attrs || {} },
-        %{ $r->{all} || {} },
-        %{ $r->{$reltype} || {} },
+        (
+            ref $r eq 'HASH' ? (
+                %{ $r->{all} || {} },
+                %{ $r->{$reltype} || {} },
+            )
+            :
+            ()
+        ),
     );
 
+    if (ref $r eq 'CODE') {
+        $params->{attrs} = \%composite;
+
+        my %ret = %{ $r->(%$params) || {} };
+
+        %composite = %ret if %ret;
+    }
+
     return %composite ? \%composite : undef;
 }
 
@@ -279,10 +293,10 @@ sub _strip_id_postfix {
 }
 
 sub _remote_attrs {
-    my ($self, $local_moniker, $local_cols, $fk_attrs) = @_;
+    my ($self, $local_moniker, $local_cols, $fk_attrs, $params) = @_;
 
     # get our set of attrs from _relationship_attrs, which uses the FK attrs if available
-    my $attrs = $self->_relationship_attrs('belongs_to', $fk_attrs) || {};
+    my $attrs = $self->_relationship_attrs('belongs_to', $fk_attrs, $params) || {};
 
     # If any referring column is nullable, make 'belongs_to' an
     # outer join, unless explicitly set by relationship_attrs
@@ -409,12 +423,23 @@ sub generate_code {
             $remote_relname   = $self->_resolve_relname_collision($local_moniker,  $local_cols,  $remote_relname);
             $local_relname    = $self->_resolve_relname_collision($remote_moniker, $remote_cols, $local_relname);
 
+            my $rel_attrs_params = {
+                rel_name      => $remote_relname,
+                rel_type      => $local_method,
+                local_source  => $self->schema->source($local_moniker),
+                remote_source => $self->schema->source($remote_moniker),
+                local_table   => $rel->{local_table},
+                local_cols    => $local_cols,
+                remote_table  => $rel->{remote_table},
+                remote_cols   => $remote_cols,
+            };
+
             push(@{$all_code->{$local_class}},
                 { method => $local_method,
                   args => [ $remote_relname,
                             $remote_class,
                             \%cond,
-                            $self->_remote_attrs($local_moniker, $local_cols, $rel->{attrs}),
+                            $self->_remote_attrs($local_moniker, $local_cols, $rel->{attrs}, $rel_attrs_params),
                   ],
                   extra => {
                       local_class    => $local_class,
@@ -430,12 +455,23 @@ sub generate_code {
                 delete $rev_cond{$_};
             }
 
+            $rel_attrs_params = {
+                rel_name      => $local_relname,
+                rel_type      => $remote_method,
+                local_source  => $self->schema->source($remote_moniker),
+                remote_source => $self->schema->source($local_moniker),
+                local_table   => $rel->{remote_table},
+                local_cols    => $remote_cols,
+                remote_table  => $rel->{local_table},
+                remote_cols   => $local_cols,
+            };
+
             push(@{$all_code->{$remote_class}},
                 { method => $remote_method,
                   args => [ $local_relname,
                             $local_class,
                             \%rev_cond,
-                            $self->_relationship_attrs($remote_method),
+                            $self->_relationship_attrs($remote_method, {}, $rel_attrs_params),
                   ],
                   extra => {
                       local_class    => $remote_class,
@@ -481,12 +517,16 @@ sub _generate_m2ms {
             $_->{method} eq 'has_many' && $_->{args}[1] eq $class
         } @{ $all_code->{$class1} };
 
+        next unless $class1_to_link_table_rel;
+
         my $class1_to_link_table_rel_name = $class1_to_link_table_rel->{args}[0];
 
         my $class2_to_link_table_rel = first {
             $_->{method} eq 'has_many' && $_->{args}[1] eq $class
         } @{ $all_code->{$class2} };
 
+        next unless $class2_to_link_table_rel;
+
         my $class2_to_link_table_rel_name = $class2_to_link_table_rel->{args}[0];
 
         my $class1_link_rel = $rels->[1]{args}[0];
@@ -508,11 +548,13 @@ sub _generate_m2ms {
 
         my @class2_to_cols = apply { s/^foreign\.//i } keys %{ $rels->[0]{args}[2] };
 
+        my $link_moniker = $rels->[0]{extra}{local_moniker};
+
         my @link_table_cols =
-            @{[ $self->schema->source($rels->[0]{extra}{local_moniker})->columns ]};
+            @{[ $self->schema->source($link_moniker)->columns ]};
 
         my @link_table_primary_cols =
-            @{[ $self->schema->source($rels->[0]{extra}{local_moniker})->primary_columns ]};
+            @{[ $self->schema->source($link_moniker)->primary_columns ]};
 
         next unless @class1_link_cols + @class2_link_cols == @link_table_cols
             && @link_table_cols == @link_table_primary_cols;
@@ -526,6 +568,11 @@ sub _generate_m2ms {
             $class2,
             $class1_remote_moniker,
             \@class1_to_cols,
+            {
+                link_class => $class,
+                link_moniker => $link_moniker,
+                link_rel_name => $class1_to_link_table_rel_name,
+            },
         );
 
         $class1_to_class2_relname = $self->_resolve_relname_collision(
@@ -543,6 +590,11 @@ sub _generate_m2ms {
             $class2,
             $class2_remote_moniker,
             \@class2_to_cols,
+            {
+                link_class => $class,
+                link_moniker => $link_moniker,
+                link_rel_name => $class2_to_link_table_rel_name,
+            },
         );
 
         $class2_to_class1_relname = $self->_resolve_relname_collision(
@@ -557,6 +609,16 @@ sub _generate_m2ms {
                 $class1_to_class2_relname,
                 $class1_to_link_table_rel_name,
                 $class1_link_rel,
+                $self->_relationship_attrs('many_to_many', {}, {
+                    rel_type => 'many_to_many',
+                    rel_name => $class1_to_class2_relname,
+                    local_source => $self->schema->source($class1_local_moniker),
+                    remote_source => $self->schema->source($class1_remote_moniker),
+                    local_table => $self->loader->class_to_table->{$class1},
+                    local_cols => \@class1_from_cols,
+                    remote_table => $self->loader->class_to_table->{$class2},
+                    remote_cols => \@class2_from_cols,
+                }) || (),
             ],
             extra  => {
                 local_class    => $class1,
@@ -572,6 +634,16 @@ sub _generate_m2ms {
                 $class2_to_class1_relname,
                 $class2_to_link_table_rel_name,
                 $class2_link_rel,
+                $self->_relationship_attrs('many_to_many', {}, {
+                    rel_type => 'many_to_many',
+                    rel_name => $class2_to_class1_relname,
+                    local_source => $self->schema->source($class2_local_moniker),
+                    remote_source => $self->schema->source($class2_remote_moniker),
+                    local_table => $self->loader->class_to_table->{$class2},
+                    local_cols => \@class2_from_cols,
+                    remote_table => $self->loader->class_to_table->{$class1},
+                    remote_cols => \@class1_from_cols,
+                }) || (),
             ],
             extra  => {
                 local_class    => $class2,
@@ -873,9 +945,10 @@ sub _relnames_and_method {
 
 sub _rel_name_map {
     my ($self, $relname, $method, $local_class, $local_moniker, $local_cols,
-        $remote_class, $remote_moniker, $remote_cols) = @_;
+        $remote_class, $remote_moniker, $remote_cols, $extra) = @_;
 
     my $info = {
+        %{$extra || {}},
         name           => $relname,
         type           => $method,
         local_class    => $local_class,