use strict;
use warnings;
+use Class::C3;
use Carp::Clan qw/^DBIx::Class/;
use Lingua::EN::Inflect::Number ();
-our $VERSION = '0.04999_12';
+our $VERSION = '0.05003';
=head1 NAME
=cut
sub new {
- my ( $class, $schema, $inflect_pl, $inflect_singular ) = @_;
+
+ my ( $class, $schema, $inflect_pl, $inflect_singular, $rel_attrs ) = @_;
my $self = {
schema => $schema,
inflect_plural => $inflect_pl,
inflect_singular => $inflect_singular,
+ relationship_attrs => $rel_attrs,
};
- bless $self => $class;
+ # validate the relationship_attrs arg
+ if( defined $self->{relationship_attrs} ) {
+ ref($self->{relationship_attrs}) eq 'HASH'
+ or croak "relationship_attrs must be a hashref";
+ }
- $self;
+ return bless $self => $class;
}
sub _inflect_plural {
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};
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 Lingua::EN::Inflect::Number::to_S($relname);
}
+# 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} || {} };
+ if( my $specific = $r->{$reltype} ) {
+ while( my ($k,$v) = each %$specific ) {
+ $composite{$k} = $v;
+ }
+ }
+ return \%composite;
+}
+
sub _array_eq {
my ($a, $b) = @_;
return 1;
}
-sub _uniq_fk_rel {
- my ($self, $local_moniker, $local_relname, $local_cols, $uniqs) = @_;
-
- 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) {
- $remote_method = 'might_have';
- $local_relname = $self->_inflect_singular($local_relname);
- }
-
- return ($remote_method, $local_relname);
-}
-
sub _remote_attrs {
my ($self, $local_moniker, $local_cols) = @_;
- # If the referring column is nullable, make 'belongs_to' an outer join:
+ # 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};
- return $nullable ? { join_type => 'LEFT' } : ();
+ return $attrs;
}
sub _remote_relname {
my $all_code = {};
- my $local_table = $self->{schema}->source($local_moniker)->from;
my $local_class = $self->{schema}->class($local_moniker);
-
+
my %counters;
foreach my $rel (@$rels) {
next if !$rel->{remote_source};
}
foreach my $rel (@$rels) {
- next if !$rel->{remote_source};
- my $local_cols = $rel->{local_columns};
- my $remote_cols = $rel->{remote_columns};
- my $remote_moniker = $rel->{remote_source};
- my $remote_obj = $self->{schema}->source($remote_moniker);
- my $remote_class = $self->{schema}->class($remote_moniker);
- my $remote_table = $remote_obj->from;
- $remote_cols ||= [ $remote_obj->primary_columns ];
+ 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_cols = $rel->{remote_columns} || [ $remote_obj->primary_columns ];
+
+ my $local_cols = $rel->{local_columns};
if($#$local_cols != $#$remote_cols) {
croak "Column count mismatch: $local_moniker (@$local_cols) "
$cond{$remote_cols->[$i]} = $local_cols->[$i];
}
- my $local_relname;
- my $remote_relname = $self->_remote_relname($remote_table, \%cond);
-
- # If more than one rel between this pair of tables, use the local
- # col names to distinguish
- if($counters{$remote_moniker} > 1) {
- my $colnames = q{_} . join(q{_}, @$local_cols);
- $local_relname = $self->_inflect_plural(
- lc($local_table) . $colnames
- );
- $remote_relname .= $colnames if keys %cond > 1;
- } else {
- $local_relname = $self->_inflect_plural(lc $local_table);
- }
-
- my %rev_cond = reverse %cond;
-
- for (keys %rev_cond) {
- $rev_cond{"foreign.$_"} = "self.".$rev_cond{$_};
- delete $rev_cond{$_};
- }
-
- my ($remote_method);
-
- ($remote_method, $local_relname) = $self->_uniq_fk_rel($local_moniker, $local_relname, $local_cols, $uniqs);
+ my ( $local_relname, $remote_relname, $remote_method ) =
+ $self->_relnames_and_method( $local_moniker, $rel, \%cond, $uniqs, \%counters );
push(@{$all_code->{$local_class}},
{ method => 'belongs_to',
}
);
+ my %rev_cond = reverse %cond;
+ for (keys %rev_cond) {
+ $rev_cond{"foreign.$_"} = "self.".$rev_cond{$_};
+ delete $rev_cond{$_};
+ }
+
push(@{$all_code->{$remote_class}},
{ method => $remote_method,
args => [ $local_relname,
$local_class,
\%rev_cond,
+ $self->_relationship_attrs($remote_method),
],
}
);
return $all_code;
}
+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 $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
+ if ( $counters->{$remote_moniker} > 1) {
+ my $colnames = q{_} . join(q{_}, @$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 );
+
+ } else {
+ $local_relname = $self->_inflect_plural(lc $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) {
+ $remote_method = 'might_have';
+ $local_relname = $self->_inflect_singular($local_relname);
+ #< TODO: remove me
+ $old_multirel_name = $self->_inflect_singular($old_multirel_name);
+ }
+
+ # 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 );
+}
+
=head1 AUTHOR
-See L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
+See L<DBIx::Class::Schema::Loader/AUTHOR> and L<DBIx::Class::Schema::Loader/CONTRIBUTORS>.
=head1 LICENSE
projects / dbsrgits/DBIx-Class-Schema-Loader.git / blobdiff