sub search_related {
my $self = shift;
+ return $self->_query_related('search', @_);
+}
+
+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') {
my $rel_obj = $self->_relationships->{$rel};
$self->throw( "No such relationship ${rel}" ) unless $rel_obj;
$attrs = { %{$rel_obj->{attrs} || {}}, %{$attrs || {}} };
- my $s_cond;
- if (@_) {
- $self->throw( "Invalid query: @_" ) if (@_ > 1 && (@_ % 2 == 1));
- my $query = ((@_ > 1) ? {@_} : shift);
- $s_cond = $self->_cond_resolve($query, $attrs);
- }
- $attrs->{_action} = 'convert';
+
+ $self->throw( "Invalid query: @_" ) if (@_ > 1 && (@_ % 2 == 1));
+ my $query = ((@_ > 1) ? {@_} : shift);
+
+ $attrs->{_action} = 'convert'; # shouldn't we resolve the cond to something
+ # to merge into the AST really?
my ($cond) = $self->_cond_resolve($rel_obj->{cond}, $attrs);
- $cond = "${s_cond} AND ${cond}" if $s_cond;
- return $rel_obj->{class}->retrieve_from_sql($cond, @{$attrs->{bind} || []},
- $attrs);
+ $query = ($query ? { '-and' => [ \$cond, $query ] } : \$cond);
+ #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);
}
sub create_related {
sub new_related {
my ($self, $rel, $values, $attrs) = @_;
- $self->throw( "Can't call create_related as class method" )
+ $self->throw( "Can't call new_related as class method" )
unless ref $self;
- $self->throw( "create_related needs a hash" )
+ $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->_cond_value($attrs, $k => $v);
$fields{$self->_cond_key($attrs, $k)} = (@{delete $attrs->{bind}})[0];
}
- return $rel_obj->{class}->new(\%fields);
+ return $self->resolve_class($rel_obj->{class})->new(\%fields);
}
sub find_or_create_related {
$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';
- $self->throw( "Object $f_obj isn't a ".$rel_obj->{class} )
- unless $f_obj->isa($rel_obj->{class});
+ my $f_class = $self->resolve_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) {
next if ref $cond->{$key}; # Skip literals and complex conditions
$self->throw("set_from_related can't handle $key as key")