From: Matt S Trout Date: Sun, 14 Oct 2018 18:50:57 +0000 (+0000) Subject: switch back to original key for special_ops since things poke at it X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=30af97c599d20b792602a5da32f593767d08e49b;p=scpubgit%2FQ-Branch.git switch back to original key for special_ops since things poke at it --- diff --git a/lib/SQL/Abstract.pm b/lib/SQL/Abstract.pm index dc79349..2c0034b 100644 --- a/lib/SQL/Abstract.pm +++ b/lib/SQL/Abstract.pm @@ -155,7 +155,8 @@ sub new { $opt{sqlfalse} ||= '0=1'; # special operators - $opt{user_special_ops} = [ @{$opt{special_ops} ||= []} ]; + $opt{special_ops} ||= []; + # regexes are applied in order, thus push after user-defines push @{$opt{special_ops}}, @BUILTIN_SPECIAL_OPS; @@ -744,7 +745,7 @@ sub _expand_expr_hashpair { ] }; } } - if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{user_special_ops}}) { + if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{special_ops}}) { return { -op => [ $vk, { -ident => $k }, $vv ] }; } if (my $us = List::Util::first { $vk =~ $_->{regex} } @{$self->{unary_ops}}) { @@ -952,7 +953,7 @@ sub _render_op { if (my $h = $special{$op}) { return $self->$h(\@args); } - if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{user_special_ops}}) { + if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}}) { puke "Special op '${op}' requires first value to be identifier" unless my ($k) = map $_->{-ident}, grep ref($_) eq 'HASH', $args[0]; return $self->${\($us->{handler})}($k, $op, $args[1]);