use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Number ();
-our $VERSION = '0.05002';
+our $VERSION = '0.05003';
=head1 NAME
# pluralize a relationship name
sub _inflect_plural {
- my ($self, $relname) = @_;
+ my ($self, $relname, $method) = @_;
+
+ return '' if !defined $relname || $relname eq '';
if( ref $self->{inflect_plural} eq 'HASH' ) {
return $self->{inflect_plural}->{$relname}
return $inflected if $inflected;
}
- return Lingua::EN::Inflect::Number::to_PL($relname);
+ $method ||= '_to_PL';
+
+ return $self->$method($relname);
}
# Singularize a relationship name
sub _inflect_singular {
my ($self, $relname) = @_;
+ return '' if !defined $relname || $relname eq '';
+
if( ref $self->{inflect_singular} eq 'HASH' ) {
return $self->{inflect_singular}->{$relname}
if exists $self->{inflect_singular}->{$relname};
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::Number::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);
}
# accessor for options to be passed to each generated relationship
}
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;
+ return $attrs;
}
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 =~ s/_id$//;
$remote_relname = $self->_inflect_singular($col);
}
}
my ( $local_relname, $remote_relname, $remote_method ) =
- $self->_relnames_and_methods( $local_moniker, $rel, \%cond, $uniqs, \%counters );
+ $self->_relnames_and_method( $local_moniker, $rel, \%cond, $uniqs, \%counters );
push(@{$all_code->{$local_class}},
{ method => 'belongs_to',
return $all_code;
}
-sub _relnames_and_methods {
+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_relname = lc $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 ($local_relname, $old_local_relname, $local_relname_uninflected, $old_local_relname_uninflected);
if ( $counters->{$remote_moniker} > 1) {
- my $colnames = q{_} . join(q{_}, @$local_cols);
+ my $colnames = lc(q{_} . join(q{_}, @$local_cols));
$remote_relname .= $colnames if keys %$cond > 1;
- my $old_relname = #< TODO: remove me after 0.05003 release
$local_relname = lc($local_table) . $colnames;
- my $stripped_id = $local_relname =~ s/_id$//; #< strip off any trailing _id
+ $local_relname =~ s/_id$//;
+
+ $local_relname_uninflected = $local_relname;
$local_relname = $self->_inflect_plural( $local_relname );
- # TODO: remove me after 0.05003 release
- $old_relname = $self->_inflect_plural( $old_relname );
- warn __PACKAGE__." $VERSION: warning, stripping trailing _id from ${remote_class} relation '$old_relname', renaming to '$local_relname'. This behavior is new as of 0.05003.\n"
- if $stripped_id;
+ $old_local_relname_uninflected = lc($local_table) . $colnames;
+ $old_local_relname = $self->_inflect_plural( lc($local_table) . $colnames, '_old_to_PL' );
} 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');
}
my $remote_method = 'has_many';
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);
+ $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 );
}
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff