# GLOBALS
#======================================================================
-our $VERSION = '1.90_02';
+our $VERSION = '1.90_03';
# This would confuse some packagers
$VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases
(map +($_ => '_expand_op_is'), ('is', 'is_not')),
(map +($_ => __PACKAGE__->make_unop_expander("_expand_${_}")),
qw(ident value nest)),
+ bind => __PACKAGE__->make_unop_expander(sub { +{ -bind => $_[2] } }),
},
render => {
(map +($_, "_render_$_"),
$self->_expand_ident(ident => $body);
});
}
+ if ($class->isa('SQL::Abstract::More')) {
+ my $orig = $opt{expand_op}{or};
+ $opt{expand_op}{or} = sub {
+ my ($self, $logop, $v, $k) = @_;
+ if ($k and ref($v) eq 'ARRAY') {
+ my ($type, $val) = @$v;
+ my $op;
+ if (
+ ref($type) eq 'HASH' and ref($val) eq 'HASH'
+ and keys %$type == 1 and keys %$val == 1
+ and (keys %$type)[0] eq (keys %$val)[0]
+ ) {
+ ($op) = keys %$type;
+ ($type) = values %$type;
+ ($val) = values %$val;
+ }
+ if ($self->is_bind_value_with_type(my $v = [ $type, $val ])) {
+ return $self->expand_expr(
+ { $k, map +($op ? { $op => $_ } : $_), { -bind => $v } }
+ );
+ }
+ }
+ return $self->$orig($logop, $v, $k);
+ };
+ $opt{render}{bind} = sub {
+ return [ '?', map +(ref($_->[0]) ? $_ : $_->[1]), $_[2] ]
+ };
+ }
}
if ($opt{lazy_join_sql_parts}) {
die "Not a node type: $k" unless $k =~ s/^-//;
if (my $meth = $self->{render}{$k}) {
local our $Render_Top_Level = $top_level;
- return $self->$meth($k, $v);
+ return $self->$meth($k, $v)||[];
}
die "notreached: $k";
}
if (ref($expr) eq 'HASH') {
return undef unless my $kc = keys %$expr;
if ($kc > 1) {
- return $self->_expand_op_andor(and => $expr);
+ return $self->_expand_logop(and => $expr);
}
my ($key, $value) = %$expr;
if ($key =~ /^-/ and $key =~ s/ [_\s]? \d+ $//x ) {
return $self->_expand_hashpair($key, $value);
}
if (ref($expr) eq 'ARRAY') {
- return $self->_expand_op_andor(lc($self->{logic}), $expr);
+ return $self->_expand_logop(lc($self->{logic}), $expr);
}
if (my $literal = is_literal_value($expr)) {
return +{ -literal => $literal };
# hash with multiple or no elements is andor
if (ref($v) eq 'HASH' and keys %$v != 1) {
- return $self->_expand_op_andor(and => $v, $k);
+ return $self->_expand_logop(and => $v, $k);
}
# undef needs to be re-sent with cmp to achieve IS/IS NOT NULL
? (shift(@{$v = [ @$v ]}), $1)
: lc($self->{logic} || 'OR')
);
- return $self->_expand_op_andor(
+ return $self->_expand_logop(
$logic => $v, $k
);
}
"operator '%s' applied on an empty array (field '$k')"
) ? $self->sqlfalse : $self->sqltrue);
}
- return $self->_expand_op_andor($logic => \@values, $k);
+ return $self->_expand_logop($logic => \@values, $k);
}
if (is_undef_value($vv)) {
my $is = ($self->_dwim_op_to_is($op,
unless (defined($body) or (ref($body) and ref($body) eq 'ARRAY')) {
puke "-ident requires a single plain scalar argument (a quotable identifier) or an arrayref of identifier parts";
}
- my @parts = map split(/\Q${\($self->{name_sep}||'.')}\E/, $_),
- ref($body) ? @$body : $body;
+ my ($sep) = map +(defined() ? $_ : '.') , $self->{name_sep};
+ my @parts = map +($sep
+ ? map split(/\Q${sep}\E/, $_), @$_
+ : @$_
+ ), ref($body) ? $body : [ $body ];
return { -ident => $parts[-1] } if $self->{_dequalify_idents};
unless ($self->{quote_char}) {
$self->_assert_pass_injection_guard($_) for @parts;
] };
}
+sub _expand_logop {
+ my ($self, $logop, $v, $k) = @_;
+ $self->${\$self->{expand_op}{$logop}}($logop, $v, $k);
+}
+
sub _expand_op_andor {
my ($self, $logop, $v, $k) = @_;
if (defined $k) {