X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FAbstract.pm;h=92ac9534bc1f887b046897965fdc1579d9e05cb0;hb=057fab7b919edf54887213a1dfe52364f88d8dcf;hp=c4866957319ad5d25023c1629e4cffd0d7b6f624;hpb=5be20cbbabf2dccccf14d2c2e864345a7fd503a1;p=scpubgit%2FQ-Branch.git diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm index c486695..92ac953 100644 --- a/lib/SQL/Abstract.pm +++ b/lib/SQL/Abstract.pm @@ -905,14 +905,14 @@ sub _expand_not { } sub _expand_row { - my ($self, $node, $args) = @_; - +{ '-'.$node => [ map $self->expand_expr($_), @$args ] }; + my ($self, undef, $args) = @_; + +{ -row => [ map $self->expand_expr($_), @$args ] }; } sub _expand_op { - my ($self, $node, $args) = @_; + my ($self, undef, $args) = @_; my ($op, @opargs) = @$args; - +{ '-'.$node => [ $op, map $self->expand_expr($_), @opargs ] }; + +{ -op => [ $op, map $self->expand_expr($_), @opargs ] }; } sub _expand_bool { @@ -1042,7 +1042,7 @@ sub _expand_in { } sub _expand_nest { - my ($self, $op, $v) = @_; + my ($self, undef, $v) = @_; # DBIx::Class requires a nest warning to be emitted once but the private # method it overrode to do so no longer exists if ($self->{warn_once_on_nest}) { @@ -1058,8 +1058,8 @@ sub _expand_nest { } sub _expand_bind { - my ($self, $op, $bind) = @_; - return { '-'.$op => $bind }; + my ($self, undef, $bind) = @_; + return { -bind => $bind }; } sub _recurse_where {