=cut
sub add_relationship {
- my ($class, $rel, $f_class, $cond, $attrs) = @_;
- die "Can't create relationship without join condition" unless $cond;
- $attrs ||= {};
- eval "require $f_class;";
- if ($@) {
- $class->throw($@) unless $@ =~ /Can't locate/;
- }
- my %rels = %{ $class->_relationships };
- $rels{$rel} = { class => $f_class,
- cond => $cond,
- attrs => $attrs };
- $class->_relationships(\%rels);
-
- return unless eval { $f_class->can('columns'); }; # Foreign class not loaded
- eval { $class->_resolve_join($rel, 'me') };
-
- if ($@) { # If the resolve failed, back out and re-throw the error
- delete $rels{$rel}; #
- $class->_relationships(\%rels);
- $class->throw("Error creating relationship $rel: $@");
- }
- 1;
+ shift->result_source->add_relationship(@_);
+}
+
+sub relationships {
+ shift->result_source->relationships(@_);
+}
+
+sub relationship_info {
+ shift->result_source->relationship_info(@_);
}
sub _resolve_join {
return map { $class->_resolve_join($_, $alias) } @$join;
} elsif (ref $join eq 'HASH') {
return map { $class->_resolve_join($_, $alias),
- $class->_relationships->{$_}{class}->_resolve_join($join->{$_}, $_) }
+ $class->relationship_info($_)->{class}->_resolve_join($join->{$_}, $_) }
keys %$join;
} elsif (ref $join) {
$class->throw("No idea how to resolve join reftype ".ref $join);
} else {
- my $rel_obj = $class->_relationships->{$join};
+ my $rel_obj = $class->relationship_info($join);
+ #use Data::Dumper; warn Dumper($class->result_source) unless $rel_obj;
$class->throw("No such relationship ${join}") unless $rel_obj;
my $j_class = $rel_obj->{class};
my %join = (_action => 'join',
}
sub _cond_key {
- my ($self, $attrs, $key) = @_;
+ my ($self, $attrs, $key, $alias) = @_;
my $action = $attrs->{_action} || '';
if ($action eq 'convert') {
unless ($key =~ s/^foreign\.//) {
$self->throw("Unable to convert relationship to WHERE clause: invalid key ${key}");
}
- return $key;
+ if (defined (my $alias = $attrs->{_aliases}{foreign})) {
+ return "${alias}.${key}";
+ } else {
+ return $key;
+ }
} elsif ($action eq 'join') {
return $key unless $key =~ /\./;
my ($type, $field) = split(/\./, $key);
sub search_related {
my $self = shift;
- return $self->_query_related('search', @_);
-}
-
-=head2 count_related
-
- My::Table->count_related('relname', $cond, $attrs);
-
-=cut
-
-sub count_related {
- my $self = shift;
- return $self->_query_related('count', @_);
-}
-
-sub _query_related {
- my $self = shift;
- my $meth = shift;
my $rel = shift;
my $attrs = { };
if (@_ > 1 && ref $_[$#_] eq 'HASH') {
$attrs = { %{ pop(@_) } };
}
- my $rel_obj = $self->_relationships->{$rel};
+ my $rel_obj = $self->relationship_info($rel);
$self->throw( "No such relationship ${rel}" ) unless $rel_obj;
$attrs = { %{$rel_obj->{attrs} || {}}, %{$attrs || {}} };
#use Data::Dumper; warn Dumper($query);
#warn $rel_obj->{class}." $meth $cond ".join(', ', @{$attrs->{bind}||[]});
delete $attrs->{_action};
- return $self->resolve_class($rel_obj->{class}
- )->$meth($query, $attrs);
+ return $self->result_source->schema->resultset($rel_obj->{class}
+ )->search($query, $attrs);
+}
+
+=head2 count_related
+
+ My::Table->count_related('relname', $cond, $attrs);
+
+=cut
+
+sub count_related {
+ my $self = shift;
+ return $self->search_related(@_)->count;
}
=head2 create_related
sub create_related {
my $class = shift;
- return $class->new_related(@_)->insert;
+ my $rel = shift;
+ return $class->search_related($rel)->create(@_);
}
=head2 new_related
sub new_related {
my ($self, $rel, $values, $attrs) = @_;
- $self->throw( "Can't call new_related as class method" )
- unless ref $self;
- $self->throw( "new_related needs a hash" )
- unless (ref $values eq 'HASH');
- my $rel_obj = $self->_relationships->{$rel};
- $self->throw( "No such relationship ${rel}" ) unless $rel_obj;
- $self->throw( "Can't abstract implicit create for ${rel}, condition not a hash" )
- unless ref $rel_obj->{cond} eq 'HASH';
- $attrs = { %{$rel_obj->{attrs}}, %{$attrs || {}}, _action => 'convert' };
-
- my %fields = %{$self->resolve_condition($rel_obj->{cond},$attrs)};
- $fields{$_} = $values->{$_} for keys %$values;
-
- return $self->resolve_class($rel_obj->{class})->new(\%fields);
+ return $self->search_related($rel)->new($values, $attrs);
}
=head2 find_related
sub find_related {
my $self = shift;
my $rel = shift;
- my $rel_obj = $self->_relationships->{$rel};
- $self->throw( "No such relationship ${rel}" ) unless $rel_obj;
- my ($cond) = $self->resolve_condition($rel_obj->{cond}, { _action => 'convert' });
- $self->throw( "Invalid query: @_" ) if (@_ > 1 && (@_ % 2 == 1));
- my $attrs = { };
- if (@_ > 1 && ref $_[$#_] eq 'HASH') {
- $attrs = { %{ pop(@_) } };
- }
- my $query = ((@_ > 1) ? {@_} : shift);
- $query = ($query ? { '-and' => [ $cond, $query ] } : $cond);
- return $self->resolve_class($rel_obj->{class})->find($query);
+ return $self->search_related($rel)->find(@_);
}
=head2 find_or_create_related
sub set_from_related {
my ($self, $rel, $f_obj) = @_;
- my $rel_obj = $self->_relationships->{$rel};
+ my $rel_obj = $self->relationship_info($rel);
$self->throw( "No such relationship ${rel}" ) unless $rel_obj;
my $cond = $rel_obj->{cond};
$self->throw( "set_from_related can only handle a hash condition; the "
."condition for $rel is of type ".(ref $cond ? ref $cond : 'plain scalar'))
unless ref $cond eq 'HASH';
- my $f_class = $self->resolve_class($rel_obj->{class});
+ my $f_class = $self->result_source->schema->class($rel_obj->{class});
$self->throw( "Object $f_obj isn't a ".$f_class )
unless $f_obj->isa($f_class);
foreach my $key (keys %$cond) {