X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FSchema%2FLoader%2FRelBuilder.pm;h=e3475dd6e3a3d5bdb38131b86c8dd693261a6508;hb=414c61a02b22a17b8dbdad49e4e47d4cee1c3981;hp=2fe5824897f4a775cea282e9875d42065a2c68e2;hpb=243c6ebce7ae31cd4234b3125b177d4d0c86bcc7;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 2fe5824..e3475dd 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 = { @@ -111,7 +111,7 @@ sub _inflect_plural { return $inflected if $inflected; } - return Lingua::EN::Inflect::Number::to_PL($relname); + return $self->_to_PL($relname); } # Singularize a relationship name @@ -129,18 +129,57 @@ sub _inflect_singular { return $inflected if $inflected; } - return Lingua::EN::Inflect::Number::to_S($relname); + return $self->_to_S($relname); +} + +sub _to_PL { + my ($self, $name) = @_; + + $name =~ s/_/ /g; + my $plural = Lingua::EN::Inflect::Phrase::to_PL($name); + $plural =~ s/ /_/g; + + return $plural; +} + +sub _to_S { + my ($self, $name) = @_; + + $name =~ s/_/ /g; + my $singular = Lingua::EN::Inflect::Phrase::to_S($name); + $singular =~ s/ /_/g; + + return $singular; } +sub _default_relationship_attrs { +{ + has_many => { + cascade_delete => 0, + cascade_copy => 0, + }, + might_have => { + cascade_delete => 0, + cascade_copy => 0, + }, + belongs_to => { + on_delete => 'CASCADE', + on_update => 'CASCADE', +# is_deferrable => 1, + }, +} } + # accessor for options to be passed to each generated relationship # type. take single argument, the relationship type name, and returns # either a hashref (if some options are set), or nothing sub _relationship_attrs { my ( $self, $reltype ) = @_; my $r = $self->{relationship_attrs}; - return unless $r && ( $r->{all} || $r->{$reltype} ); - my %composite = %{ $r->{all} || {} }; + my %composite = ( + %{ $self->_default_relationship_attrs->{$reltype} || {} }, + %{ $r->{all} || {} } + ); + if( my $specific = $r->{$reltype} ) { while( my ($k,$v) = each %$specific ) { $composite{$k} = $v; @@ -150,7 +189,7 @@ sub _relationship_attrs { } sub _array_eq { - my ($a, $b) = @_; + my ($self, $a, $b) = @_; return unless @$a == @$b; @@ -161,19 +200,42 @@ sub _array_eq { } sub _remote_attrs { - my ($self, $local_moniker, $local_cols) = @_; + my ($self, $local_moniker, $local_cols) = @_; + + # get our base set of attrs from _relationship_attrs, if present + my $attrs = $self->_relationship_attrs('belongs_to') || {}; - # get our base set of attrs from _relationship_attrs, if present - my $attrs = $self->_relationship_attrs('belongs_to') || {}; + # 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; + $attrs->{join_type} = 'LEFT' if $nullable && !defined $attrs->{join_type}; - # 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; - $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 $attrs; + 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 { @@ -184,12 +246,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; @@ -267,45 +329,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; - my $old_multirel_name; #< TODO: remove me + 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 =~ s/_id$// - #< TODO: remove me - and $old_multirel_name = $self->_inflect_plural( lc($local_table) . $colnames ); - $local_relname = $self->_inflect_plural( $local_relname ); + $local_relname = $self->_normalize_name($local_table . $colnames); + $local_relname =~ s/_id$//; + $local_relname_uninflected = $local_relname; + $local_relname = $self->_inflect_plural($local_relname); } else { - $local_relname = $self->_inflect_plural(lc $local_table); + $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); - #< TODO: remove me - $old_multirel_name = $self->_inflect_singular($old_multirel_name); + $local_relname = $self->_inflect_singular($local_relname_uninflected); } - # TODO: remove me after 0.05003 release - $old_multirel_name - and warn __PACKAGE__." $VERSION: warning, stripping trailing _id from ${remote_class} relation '$old_multirel_name', renaming to '$local_relname'. This behavior is new as of 0.05003.\n"; - return ( $local_relname, $remote_relname, $remote_method ); } @@ -321,3 +376,4 @@ the same terms as Perl itself. =cut 1; +# vim:et sts=4 sw=4 tw=0: