my $cond = (@_
? (
(@_ == 1 || ref $_[0] eq "HASH")
- ? shift
+ ? (
+ (ref $_[0] eq 'HASH')
+ ? (
+ (keys %{ $_[0] } > 0)
+ ? shift
+ : undef
+ )
+ : shift
+ )
: (
(@_ % 2)
? $self->throw_exception("Odd number of arguments to search")
}
: $where);
}
+
if (defined $cond) {
$new_attrs->{where} = (
defined $new_attrs->{where}
sub _remove_alias {
my ($self, $query, $alias) = @_;
- my %unaliased = %{ $query || {} };
- foreach my $key (keys %unaliased) {
- $unaliased{$1} = delete $unaliased{$key}
+ my %orig = %{ $query || {} };
+ my %unaliased;
+
+ foreach my $key (keys %orig) {
+ if ($key !~ /\./) {
+ $unaliased{$key} = $orig{$key};
+ next;
+ }
+ $unaliased{$1} = $orig{$key}
if $key =~ m/^(?:\Q$alias\E\.)?([^.]+)$/;
}