X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=a0de1814303f4048551906820d1cab9f7e49cc26;hb=f916de47bc9ccf4075b715d9ba900b4f158846db;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..a0de181 100644 --- a/lib/DBIx/Class/Schema/Loader/RelBuilder.pm +++ b/lib/DBIx/Class/Schema/Loader/RelBuilder.pm @@ -4,9 +4,10 @@ use strict; use warnings; use Class::C3; use Carp::Clan qw/^DBIx::Class/; -use Lingua::EN::Inflect::Number (); +use Lingua::EN::Inflect::Phrase (); +use DBIx::Class::Schema::Loader::Utils 'split_name'; -our $VERSION = '0.05003'; +our $VERSION = '0.07001'; =head1 NAME @@ -14,7 +15,7 @@ DBIx::Class::Schema::Loader::RelBuilder - Builds relationships for DBIx::Class:: =head1 SYNOPSIS -See L +See L and L. =head1 DESCRIPTION @@ -76,7 +77,6 @@ arguments, like so: =cut sub new { - my ( $class, $schema, $inflect_pl, $inflect_singular, $rel_attrs ) = @_; my $self = { @@ -98,7 +98,7 @@ sub new { # pluralize a relationship name sub _inflect_plural { - my ($self, $relname, $method) = @_; + my ($self, $relname) = @_; return '' if !defined $relname || $relname eq ''; @@ -111,9 +111,7 @@ sub _inflect_plural { return $inflected if $inflected; } - $method ||= '_to_PL'; - - return $self->$method($relname); + return $self->_to_PL($relname); } # Singularize a relationship name @@ -138,22 +136,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 { +{ @@ -168,6 +164,7 @@ sub _default_relationship_attrs { +{ belongs_to => { on_delete => 'CASCADE', on_update => 'CASCADE', +# is_deferrable => 1, }, } } @@ -192,7 +189,7 @@ sub _relationship_attrs { } sub _array_eq { - my ($a, $b) = @_; + my ($self, $a, $b) = @_; return unless @$a == @$b; @@ -216,6 +213,14 @@ sub _remote_attrs { return $attrs; } +sub _normalize_name { + my ($self, $name) = @_; + + my @words = split_name $name; + + return join '_', map lc, @words; +} + sub _remote_relname { my ($self, $remote_table, $cond) = @_; @@ -224,12 +229,12 @@ 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; @@ -307,48 +312,38 @@ sub _relnames_and_method { 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_relname = $self->_remote_relname( $remote_obj->from, $cond); my $local_cols = $rel->{local_columns}; my $local_table = $self->{schema}->source($local_moniker)->from; # 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); + my ($local_relname, $local_relname_uninflected); if ( $counters->{$remote_moniker} > 1) { - my $colnames = lc(q{_} . join(q{_}, @$local_cols)); + my $colnames = q{_} . $self->_normalize_name(join '_', @$local_cols); $remote_relname .= $colnames if keys %$cond > 1; - $local_relname = lc($local_table) . $colnames; + $local_relname = $self->_normalize_name($local_table . $colnames); $local_relname =~ s/_id$//; $local_relname_uninflected = $local_relname; - $local_relname = $self->_inflect_plural( $local_relname ); - - $old_local_relname_uninflected = lc($local_table) . $colnames; - $old_local_relname = $self->_inflect_plural( lc($local_table) . $colnames, '_old_to_PL' ); - + $local_relname = $self->_inflect_plural($local_relname); } else { - $local_relname_uninflected = lc $local_table; - $local_relname = $self->_inflect_plural(lc $local_table); - - $old_local_relname_uninflected = lc $local_table; - $old_local_relname = $self->_inflect_plural(lc $local_table, '_old_to_PL'); + $local_relname_uninflected = $self->_normalize_name($local_table); + $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 my $local_source = $self->{schema}->source($local_moniker); - if (_array_eq([ $local_source->primary_columns ], $local_cols) || - grep { _array_eq($_->[1], $local_cols) } @$uniqs) { + 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); - $old_local_relname = $self->_inflect_singular($old_local_relname_uninflected); } - 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; - return ( $local_relname, $remote_relname, $remote_method ); } @@ -364,3 +359,4 @@ the same terms as Perl itself. =cut 1; +# vim:et sts=4 sw=4 tw=0: