X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=96318b4e779aabaf983f0b41ed8c953fd127a474;hb=9b1dd93554ec8f70923940e2ae88e2e0260d0b55;hp=359c9a722a457e77b032127ba76dbb56a6995349;hpb=53ef681d0209e2c85ddd60e049e3c8510fb27bb5;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 359c9a7..96318b4 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm @@ -2,11 +2,26 @@ package DBIx::Class::Schema::Loader::RelBuilder; use strict; use warnings; -use Class::C3; +use base 'Class::Accessor::Grouped'; +use mro 'c3'; use Carp::Clan qw/^DBIx::Class/; -use Lingua::EN::Inflect::Number (); - -our $VERSION = '0.05003'; +use Scalar::Util 'weaken'; +use Lingua::EN::Inflect::Phrase (); +use DBIx::Class::Schema::Loader::Utils 'split_name'; +use File::Slurp 'slurp'; +use Try::Tiny; +use Class::Unload (); +use Class::Inspector (); +use List::MoreUtils 'apply'; +use namespace::clean; + +our $VERSION = '0.07010'; + +# Glossary: +# +# remote_relname -- name of relationship from the local table referring to the remote table +# local_relname -- name of relationship from the remote table referring to the local table +# remote_method -- relationship type from remote table to local table, usually has_many =head1 NAME @@ -14,7 +29,7 @@ DBIx::Class::Schema::Loader::RelBuilder - Builds relationships for DBIx::Class:: =head1 SYNOPSIS -See L +See L and L. =head1 DESCRIPTION @@ -25,15 +40,7 @@ is module is not (yet) for external use. =head2 new -Arguments: schema_class (scalar), inflect_plural, inflect_singular - -C<$schema_class> should be a schema class name, where the source -classes have already been set up and registered. Column info, primary -key, and unique constraints will be drawn from this schema for all -of the existing source monikers. - -Options inflect_plural and inflect_singular are optional, and are better documented -in L. +Arguments: $base object =head2 generate_code @@ -75,45 +82,68 @@ arguments, like so: =cut +__PACKAGE__->mk_group_accessors('simple', qw/ + base + schema + inflect_plural + inflect_singular + relationship_attrs + rel_collision_map + _temp_classes +/); + sub new { + my ( $class, $base ) = @_; + + # from old POD about this constructor: + # C<$schema_class> should be a schema class name, where the source + # classes have already been set up and registered. Column info, + # primary key, and unique constraints will be drawn from this + # schema for all of the existing source monikers. - my ( $class, $schema, $inflect_pl, $inflect_singular, $rel_attrs ) = @_; + # Options inflect_plural and inflect_singular are optional, and + # are better documented in L. my $self = { - schema => $schema, - inflect_plural => $inflect_pl, - inflect_singular => $inflect_singular, - relationship_attrs => $rel_attrs, + base => $base, + schema => $base->schema, + inflect_plural => $base->inflect_plural, + inflect_singular => $base->inflect_singular, + relationship_attrs => $base->relationship_attrs, + rel_collision_map => $base->rel_collision_map, + _temp_classes => [], }; + weaken $self->{base}; #< don't leak + + bless $self => $class; + # validate the relationship_attrs arg - if( defined $self->{relationship_attrs} ) { - ref($self->{relationship_attrs}) eq 'HASH' + if( defined $self->relationship_attrs ) { + ref $self->relationship_attrs eq 'HASH' or croak "relationship_attrs must be a hashref"; } - return bless $self => $class; + return $self; } # pluralize a relationship name sub _inflect_plural { - my ($self, $relname, $method) = @_; + my ($self, $relname) = @_; return '' if !defined $relname || $relname eq ''; - if( ref $self->{inflect_plural} eq 'HASH' ) { - return $self->{inflect_plural}->{$relname} - if exists $self->{inflect_plural}->{$relname}; + if( ref $self->inflect_plural eq 'HASH' ) { + return $self->inflect_plural->{$relname} + if exists $self->inflect_plural->{$relname}; } - elsif( ref $self->{inflect_plural} eq 'CODE' ) { - my $inflected = $self->{inflect_plural}->($relname); + elsif( ref $self->inflect_plural eq 'CODE' ) { + my $inflected = $self->inflect_plural->($relname); return $inflected if $inflected; } - $method ||= '_to_PL'; - - return $self->$method($relname); + return $self->_to_PL($relname); } # Singularize a relationship name @@ -122,12 +152,12 @@ sub _inflect_singular { return '' if !defined $relname || $relname eq ''; - if( ref $self->{inflect_singular} eq 'HASH' ) { - return $self->{inflect_singular}->{$relname} - if exists $self->{inflect_singular}->{$relname}; + if( ref $self->inflect_singular eq 'HASH' ) { + return $self->inflect_singular->{$relname} + if exists $self->inflect_singular->{$relname}; } - elsif( ref $self->{inflect_singular} eq 'CODE' ) { - my $inflected = $self->{inflect_singular}->($relname); + elsif( ref $self->inflect_singular eq 'CODE' ) { + my $inflected = $self->inflect_singular->($relname); return $inflected if $inflected; } @@ -138,22 +168,20 @@ sub _to_PL { my ($self, $name) = @_; $name =~ s/_/ /g; - my $plural = Lingua::EN::Inflect::Number::to_PL($name); + my $plural = Lingua::EN::Inflect::Phrase::to_PL($name); $plural =~ s/ /_/g; return $plural; } -sub _old_to_PL { - my ($self, $name) = @_; - - return Lingua::EN::Inflect::Number::to_PL($name); -} - sub _to_S { my ($self, $name) = @_; - return Lingua::EN::Inflect::Number::to_S($name); + $name =~ s/_/ /g; + my $singular = Lingua::EN::Inflect::Phrase::to_S($name); + $singular =~ s/ /_/g; + + return $singular; } sub _default_relationship_attrs { +{ @@ -164,10 +192,12 @@ sub _default_relationship_attrs { +{ might_have => { cascade_delete => 0, cascade_copy => 0, + cascade_update => 0, }, belongs_to => { on_delete => 'CASCADE', on_update => 'CASCADE', + is_deferrable => 1, }, } } @@ -176,7 +206,7 @@ sub _default_relationship_attrs { +{ # either a hashref (if some options are set), or nothing sub _relationship_attrs { my ( $self, $reltype ) = @_; - my $r = $self->{relationship_attrs}; + my $r = $self->relationship_attrs; my %composite = ( %{ $self->_default_relationship_attrs->{$reltype} || {} }, @@ -192,7 +222,7 @@ sub _relationship_attrs { } sub _array_eq { - my ($a, $b) = @_; + my ($self, $a, $b) = @_; return unless @$a == @$b; @@ -210,12 +240,37 @@ sub _remote_attrs { # If the referring column is nullable, make 'belongs_to' an # outer join, unless explicitly set by relationship_attrs - my $nullable = grep { $self->{schema}->source($local_moniker)->column_info($_)->{is_nullable} } @$local_cols; + my $nullable = grep { $self->schema->source($local_moniker)->column_info($_)->{is_nullable} } @$local_cols; $attrs->{join_type} = 'LEFT' if $nullable && !defined $attrs->{join_type}; return $attrs; } +sub _sanitize_name { + my ($self, $name) = @_; + + if (ref $name) { + # scalar ref for weird table name (like one containing a '.') + ($name = $$name) =~ s/\W+/_/g; + } + else { + # remove 'schema.' prefix if any + $name =~ s/^[^.]+\.//; + } + + return $name; +} + +sub _normalize_name { + my ($self, $name) = @_; + + $name = $self->_sanitize_name($name); + + my @words = split_name $name; + + return join '_', map lc, @words; +} + sub _remote_relname { my ($self, $remote_table, $cond) = @_; @@ -224,23 +279,54 @@ sub _remote_relname { # name, to make filter accessors work, but strip trailing _id if(scalar keys %{$cond} == 1) { my ($col) = values %{$cond}; - $col = lc $col; + $col = $self->_normalize_name($col); $col =~ s/_id$//; $remote_relname = $self->_inflect_singular($col); } else { - $remote_relname = $self->_inflect_singular(lc $remote_table); + $remote_relname = $self->_inflect_singular($self->_normalize_name($remote_table)); } return $remote_relname; } +sub _resolve_relname_collision { + my ($self, $moniker, $cols, $relname) = @_; + + return $relname if $relname eq 'id'; # this shouldn't happen, but just in case + + if ($self->base->_is_result_class_method($relname)) { + if (my $map = $self->rel_collision_map) { + for my $re (keys %$map) { + if (my @matches = $relname =~ /$re/) { + return sprintf $map->{$re}, @matches; + } + } + } + + my $new_relname = $relname; + while ($self->base->_is_result_class_method($new_relname)) { + $new_relname .= '_rel' + } + + warn <<"EOF"; +Relationship '$relname' in source '$moniker' for columns '@{[ join ',', @$cols ]}' collides with an inherited method. +Renaming to '$new_relname'. +See "RELATIONSHIP NAME COLLISIONS" in perldoc DBIx::Class::Schema::Loader::Base . +EOF + + return $new_relname; + } + + return $relname; +} + sub generate_code { my ($self, $local_moniker, $rels, $uniqs) = @_; my $all_code = {}; - my $local_class = $self->{schema}->class($local_moniker); + my $local_class = $self->schema->class($local_moniker); my %counters; foreach my $rel (@$rels) { @@ -252,8 +338,8 @@ sub generate_code { my $remote_moniker = $rel->{remote_source} or next; - my $remote_class = $self->{schema}->class($remote_moniker); - my $remote_obj = $self->{schema}->source($remote_moniker); + my $remote_class = $self->schema->class($remote_moniker); + my $remote_obj = $self->schema->source($remote_moniker); my $remote_cols = $rel->{remote_columns} || [ $remote_obj->primary_columns ]; my $local_cols = $rel->{local_columns}; @@ -271,6 +357,9 @@ sub generate_code { my ( $local_relname, $remote_relname, $remote_method ) = $self->_relnames_and_method( $local_moniker, $rel, \%cond, $uniqs, \%counters ); + $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', args => [ $remote_relname, @@ -305,53 +394,86 @@ 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 = lc $self->_remote_relname( $remote_obj->from, $cond); + 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_relname_uninflected = $self->_normalize_name($local_table); + my $local_relname = $self->_inflect_plural($self->_normalize_name($local_table)); + + my $remote_method = 'has_many'; - my $local_cols = $rel->{local_columns}; - my $local_table = $self->{schema}->source($local_moniker)->from; + # 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); + } # If more than one rel between this pair of tables, use the local - # col names to distinguish - my ($local_relname, $old_local_relname, $local_relname_uninflected, $old_local_relname_uninflected); - if ( $counters->{$remote_moniker} > 1) { - my $colnames = lc(q{_} . join(q{_}, @$local_cols)); - $remote_relname .= $colnames if keys %$cond > 1; + # col names to distinguish, unless the rel was created previously. + if ($counters->{$remote_moniker} > 1) { + my $relationship_exists = 0; - $local_relname = lc($local_table) . $colnames; - $local_relname =~ s/_id$//; + if (-f (my $existing_remote_file = $self->base->get_dump_filename($remote_class))) { + my $class = "${remote_class}Temporary"; - $local_relname_uninflected = $local_relname; - $local_relname = $self->_inflect_plural( $local_relname ); + if (not Class::Inspector->loaded($class)) { + my $code = slurp $existing_remote_file; - $old_local_relname_uninflected = lc($local_table) . $colnames; - $old_local_relname = $self->_inflect_plural( lc($local_table) . $colnames, '_old_to_PL' ); + $code =~ s/(?<=package $remote_class)/Temporary/g; - } else { - $local_relname_uninflected = lc $local_table; - $local_relname = $self->_inflect_plural(lc $local_table); + $code =~ s/__PACKAGE__->meta->make_immutable[^;]*;//g; - $old_local_relname_uninflected = lc $local_table; - $old_local_relname = $self->_inflect_plural(lc $local_table, '_old_to_PL'); - } + eval $code; + die $@ if $@; - my $remote_method = 'has_many'; + push @{ $self->_temp_classes }, $class; + } - # If the local columns have a UNIQUE constraint, this is a one-to-one rel - my $local_source = $self->{schema}->source($local_moniker); - if (_array_eq([ $local_source->primary_columns ], $local_cols) || - grep { _array_eq($_->[1], $local_cols) } @$uniqs) { - $remote_method = 'might_have'; - $local_relname = $self->_inflect_singular($local_relname_uninflected); - $old_local_relname = $self->_inflect_singular($old_local_relname_uninflected); - } + if ($class->has_relationship($local_relname)) { + my $rel_cols = [ sort { $a cmp $b } apply { s/^foreign\.//i } + (keys %{ $class->relationship_info($local_relname)->{cond} }) ]; - warn __PACKAGE__." $VERSION: renaming ${remote_class} relation '$old_local_relname' to '$local_relname'. This behavior is new as of 0.05003.\n" if $old_local_relname && $local_relname ne $old_local_relname; + $relationship_exists = 1 if $self->_array_eq([ sort @$local_cols ], $rel_cols); + } + } + + if (not $relationship_exists) { + my $colnames = q{_} . $self->_normalize_name(join '_', @$local_cols); + $remote_relname .= $colnames if keys %$cond > 1; + + $local_relname = $self->_normalize_name($local_table . $colnames); + $local_relname =~ s/_id$//; + + $local_relname_uninflected = $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); + } + } + } return ( $local_relname, $remote_relname, $remote_method ); } +sub cleanup { + my $self = shift; + + for my $class (@{ $self->_temp_classes }) { + Class::Unload->unload($class); + } + + $self->_temp_classes([]); +} + =head1 AUTHOR See L and L. @@ -364,3 +486,4 @@ the same terms as Perl itself. =cut 1; +# vim:et sts=4 sw=4 tw=0: