X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=64d9366359588803c583dcaeec37a79504ee13c9;hb=refs%2Fheads%2Fregex_capture_issues;hp=4cfd707d115b6e9643e10494d47547b3ff6deec1;hpb=dc96667ab512fd5d1af88bb06d8e89e42c706c02;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 4cfd707..64d9366 100644
--- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
+++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm
@@ -106,6 +106,7 @@ __PACKAGE__->mk_group_accessors('simple', qw/
     inflect_singular
     relationship_attrs
     rel_collision_map
+    rel_name_map
     _temp_classes
     __tagger
 /);
@@ -129,6 +130,7 @@ sub new {
         inflect_singular   => $base->inflect_singular,
         relationship_attrs => $base->relationship_attrs,
         rel_collision_map  => $base->rel_collision_map,
+        rel_name_map       => $base->rel_name_map,
         _temp_classes      => [],
     };
 
@@ -152,16 +154,26 @@ sub _inflect_plural {
 
     return '' if !defined $relname || $relname eq '';
 
+    my $result;
+    my $mapped = 0;
+
     if( ref $self->inflect_plural eq 'HASH' ) {
-        return $self->inflect_plural->{$relname}
-            if exists $self->inflect_plural->{$relname};
+        if (exists $self->inflect_plural->{$relname}) {
+            $result = $self->inflect_plural->{$relname};
+            $mapped = 1;
+        }
     }
     elsif( ref $self->inflect_plural eq 'CODE' ) {
         my $inflected = $self->inflect_plural->($relname);
-        return $inflected if $inflected;
+        if ($inflected) {
+            $result = $inflected;
+            $mapped = 1;
+        }
     }
 
-    return $self->_to_PL($relname);
+    return ($result, $mapped) if $mapped;
+
+    return ($self->_to_PL($relname), 0);
 }
 
 # Singularize a relationship name
@@ -170,16 +182,26 @@ sub _inflect_singular {
 
     return '' if !defined $relname || $relname eq '';
 
+    my $result;
+    my $mapped = 0;
+
     if( ref $self->inflect_singular eq 'HASH' ) {
-        return $self->inflect_singular->{$relname}
-            if exists $self->inflect_singular->{$relname};
+        if (exists $self->inflect_singular->{$relname}) {
+            $result = $self->inflect_singular->{$relname};
+            $mapped = 1;
+        }
     }
     elsif( ref $self->inflect_singular eq 'CODE' ) {
         my $inflected = $self->inflect_singular->($relname);
-        return $inflected if $inflected;
+        if ($inflected) {
+            $result = $inflected;
+            $mapped = 1;
+        }
     }
 
-    return $self->_to_S($relname);
+    return ($result, $mapped) if $mapped;
+
+    return ($self->_to_S($relname), 0);
 }
 
 sub _to_PL {
@@ -298,10 +320,10 @@ sub _remote_relname {
         my ($col) = values %{$cond};
         $col = $self->_normalize_name($col);
         $col =~ s/_id$//;
-        $remote_relname = $self->_inflect_singular($col);
+        ($remote_relname) = $self->_inflect_singular($col);
     }
     else {
-        $remote_relname = $self->_inflect_singular($self->_normalize_name($remote_table));
+        ($remote_relname) = $self->_inflect_singular($self->_normalize_name($remote_table));
     }
 
     return $remote_relname;
@@ -379,19 +401,25 @@ sub generate_code {
 
             my ( $local_relname, $remote_relname, $remote_method ) =
                 $self->_relnames_and_method( $local_moniker, $rel, \%cond,  $uniqs, \%counters );
+            my $local_method  = 'belongs_to';
+
+            ($remote_relname) = $self->_rel_name_map($remote_relname, $local_method, $local_class, $local_moniker, $local_cols, $remote_class, $remote_moniker, $remote_cols);
+            ($local_relname)  = $self->_rel_name_map($local_relname, $remote_method, $remote_class, $remote_moniker, $remote_cols, $local_class, $local_moniker, $local_cols);
 
-            $remote_relname = $self->_resolve_relname_collision($local_moniker,  $local_cols,  $remote_relname);
-            $local_relname  = $self->_resolve_relname_collision($remote_moniker, $remote_cols, $local_relname);
+            $remote_relname   = $self->_resolve_relname_collision($local_moniker,  $local_cols,  $remote_relname);
+            $local_relname    = $self->_resolve_relname_collision($remote_moniker, $remote_cols, $local_relname);
 
             push(@{$all_code->{$local_class}},
-                { method => 'belongs_to',
+                { method => $local_method,
                   args => [ $remote_relname,
                             $remote_class,
                             \%cond,
                             $self->_remote_attrs($local_moniker, $local_cols),
                   ],
                   extra => {
-                      moniker => $local_moniker,
+                      local_class    => $local_class,
+                      local_moniker  => $local_moniker,
+                      remote_moniker => $remote_moniker,
                   },
                 }
             );
@@ -410,7 +438,9 @@ sub generate_code {
                             $self->_relationship_attrs($remote_method),
                   ],
                   extra => {
-                      moniker => $remote_moniker,
+                      local_class    => $remote_class,
+                      local_moniker  => $remote_moniker,
+                      remote_moniker => $local_moniker,
                   },
                 }
             );
@@ -502,17 +532,21 @@ sub _disambiguate {
             if (@adjectives) {
                 my $rel_name = join '_', sort(@adjectives), $rel->{args}[0];
 
-                $rel_name = $rel->{method} eq 'might_have' ?
+                ($rel_name) = $rel->{method} eq 'might_have' ?
                     $self->_inflect_singular($rel_name)
                     :
                     $self->_inflect_plural($rel_name);
 
-                my $moniker = $rel->{extra}{moniker};
+                my ($local_class, $local_moniker, $remote_moniker)
+                    = @{ $rel->{extra} }
+                        {qw/local_class local_moniker remote_moniker/};
 
                 my @from_cols = apply { s/^self\.//i }
                     values %{ $rel->{args}[2] };
 
-                $rel_name = $self->_resolve_relname_collision($moniker, \@from_cols, $rel_name);
+                ($rel_name) = $self->_rel_name_map($rel_name, $rel->{method}, $local_class, $local_moniker, \@from_cols, $to_class, $remote_moniker, \@to_cols);
+
+                $rel_name = $self->_resolve_relname_collision($local_moniker, \@from_cols, $rel_name);
 
                 $rel->{args}[0] = $rel_name;
             }
@@ -538,24 +572,39 @@ sub _disambiguate {
 
                 my $inflect_method = "_$inflect_type";
 
-                my $relname_new_uninflected =
-                    $self->_inflect_singular($rel->{args}[0]) . "_$rel_num";
+                my $relname_new_uninflected = $rel->{args}[0] . "_$rel_num";
 
                 $rel_num++;
 
-                my $relname_new = $self->$inflect_method($relname_new_uninflected);
-
-                my $moniker = $rel->{extra}{moniker};
+                my ($local_class, $local_moniker, $remote_moniker)
+                    = @{ $rel->{extra} }
+                        {qw/local_class local_moniker remote_moniker/};
 
                 my @from_cols = apply { s/^self\.//i }
                     values %{ $rel->{args}[2] };
 
-                warn <<"EOF";
-Could not find a proper name for relationship '$relname_new' in source '$moniker' for columns '@{[ join ',', @from_cols ]}'.
-Supply a value in '$inflect_type' for '$relname_new_uninflected' to name this relationship.
+                my @to_cols = apply { s/^foreign\.//i }
+                    keys %{ $rel->{args}[2] };
+
+                my $to_class = $rel->{args}[1];
+
+                my ($relname_new, $inflect_mapped) =
+                    $self->$inflect_method($relname_new_uninflected);
+
+                my $rel_name_mapped;
+
+                ($relname_new, $rel_name_mapped) = $self->_rel_name_map($relname_new, $rel->{method}, $local_class, $local_moniker, \@from_cols, $to_class, $remote_moniker, \@to_cols);
+                
+                my $mapped = $inflect_mapped || $rel_name_mapped;
+
+                warn <<"EOF" unless $mapped;
+Could not find a proper name for relationship '$relname_new' in source
+'$local_moniker' for columns '@{[ join ',', @from_cols ]}'. Supply a value in
+'$inflect_type' or 'rel_name_map' for '$relname_new_uninflected' to name this
+relationship.
 EOF
 
-                $relname_new = $self->_resolve_relname_collision($moniker, \@from_cols, $relname_new);
+                $relname_new = $self->_resolve_relname_collision($local_moniker, \@from_cols, $relname_new);
 
                 $rel->{args}[0] = $relname_new;
             }
@@ -566,26 +615,26 @@ EOF
 sub _relnames_and_method {
     my ( $self, $local_moniker, $rel, $cond, $uniqs, $counters ) = @_;
 
-    my $remote_moniker = $rel->{remote_source};
-    my $remote_obj     = $self->schema->source( $remote_moniker );
-    my $remote_class   = $self->schema->class(  $remote_moniker );
-    my $remote_relname = $self->_remote_relname( $remote_obj->from, $cond);
+    my $remote_moniker  = $rel->{remote_source};
+    my $remote_obj      = $self->schema->source( $remote_moniker );
+    my $remote_class    = $self->schema->class(  $remote_moniker );
+    my $remote_relname  = $self->_remote_relname( $remote_obj->from, $cond);
 
-    my $local_cols     = $rel->{local_columns};
-    my $local_table    = $self->schema->source($local_moniker)->from;
-    my $local_class    = $self->schema->class($local_moniker);
-    my $local_source   = $self->schema->source($local_moniker);
+    my $local_cols      = $rel->{local_columns};
+    my $local_table     = $self->schema->source($local_moniker)->from;
+    my $local_class     = $self->schema->class($local_moniker);
+    my $local_source    = $self->schema->source($local_moniker);
 
     my $local_relname_uninflected = $self->_normalize_name($local_table);
-    my $local_relname = $self->_inflect_plural($self->_normalize_name($local_table));
+    my ($local_relname) = $self->_inflect_plural($self->_normalize_name($local_table));
 
     my $remote_method = 'has_many';
 
     # If the local columns have a UNIQUE constraint, this is a one-to-one rel
     if ($self->_array_eq([ $local_source->primary_columns ], $local_cols) ||
             grep { $self->_array_eq($_->[1], $local_cols) } @$uniqs) {
-        $remote_method = 'might_have';
-        $local_relname = $self->_inflect_singular($local_relname_uninflected);
+        $remote_method   = 'might_have';
+        ($local_relname) = $self->_inflect_singular($local_relname_uninflected);
     }
 
     # If more than one rel between this pair of tables, use the local
@@ -625,16 +674,61 @@ sub _relnames_and_method {
             $local_relname =~ s/_id$//;
 
             $local_relname_uninflected = $local_relname;
-            $local_relname = $self->_inflect_plural($local_relname);
+            ($local_relname) = $self->_inflect_plural($local_relname);
 
             # if colnames were added and this is a might_have, re-inflect
             if ($remote_method eq 'might_have') {
-                $local_relname = $self->_inflect_singular($local_relname_uninflected);
+                ($local_relname) = $self->_inflect_singular($local_relname_uninflected);
             }
         }
     }
 
-    return ( $local_relname, $remote_relname, $remote_method );
+    return ($local_relname, $remote_relname, $remote_method);
+}
+
+sub _rel_name_map {
+    my ($self, $relname, $method, $local_class, $local_moniker, $local_cols,
+        $remote_class, $remote_moniker, $remote_cols) = @_;
+
+    my $info = {
+        name           => $relname,
+        type           => $method,
+        local_class    => $local_class,
+        local_moniker  => $local_moniker,
+        local_columns  => $local_cols,
+        remote_class   => $remote_class,
+        remote_moniker => $remote_moniker,
+        remote_columns => $remote_cols,
+    };
+
+    my $new_name = $relname;
+
+    my $map = $self->rel_name_map;
+    my $mapped = 0;
+
+    if ('HASH' eq ref($map)) {
+        my $name = $info->{name};
+        my $moniker = $info->{local_moniker};
+        if ($map->{$moniker} and 'HASH' eq ref($map->{$moniker})
+            and $map->{$moniker}{$name}
+        ) {
+            $new_name = $map->{$moniker}{$name};
+            $mapped   = 1;
+        }
+        elsif ($map->{$name} and not 'HASH' eq ref($map->{$name})) {
+            $new_name = $map->{$name};
+            $mapped   = 1;
+        }
+    }
+    elsif ('CODE' eq ref($map)) {
+        my $name = $map->($info);
+        if ($name) {
+            $new_name = $name;
+            $mapped   = 1;
+        }
+    }
+
+    return ($new_name, $mapped);
 }
 
 sub _cleanup {