^ \s* go \s
/xmi;
- $opt{render} = {
- (map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
- %{$opt{render}||{}}
- };
-
$opt{expand_unary} = {};
$opt{expand} = {
-value => '_expand_value',
-not => '_expand_not',
-bool => '_expand_bool',
+ -and => '_expand_andor',
+ -or => '_expand_andor',
+ };
+
+ $opt{render_op} = our $RENDER_OP;
+
+ $opt{render} = {
+ (map +("-$_", "_render_$_"), qw(op func bind ident literal list)),
+ %{$opt{render}||{}}
};
return bless \%opt, $class;
return undef unless my $kc = keys %$expr;
if ($kc > 1) {
$logic ||= 'and';
- return +{ -op => [
- $logic,
- map $self->_expand_expr({ $_ => $expr->{$_} }, $logic),
- sort keys %$expr
- ] };
+ return $self->_expand_andor("-${logic}", $expr);
}
my ($key, $value) = %$expr;
+ if ($key =~ /^-/ and $key =~ s/ [_\s]? \d+ $//x ) {
+ belch 'Use of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0. '
+ . "You probably wanted ...-and => [ $key => COND1, $key => COND2 ... ]";
+ }
if (my $exp = $self->{expand}{$key}) {
return $self->$exp($key, $value);
}
}
if (ref($expr) eq 'ARRAY') {
my $logic = lc($logic || $self->{logic});
- $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
-
- my @expr = grep {
- (ref($_) eq 'ARRAY' and @$_)
- or (ref($_) eq 'HASH' and %$_)
- or 1
- } @$expr;
-
- my @res;
-
- while (my ($el) = splice @expr, 0, 1) {
- puke "Supplying an empty left hand side argument is not supported in array-pairs"
- unless defined($el) and length($el);
- my $elref = ref($el);
- if (!$elref) {
- local $Expand_Depth = 0;
- push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) }));
- } elsif ($elref eq 'ARRAY') {
- push(@res, grep defined, $self->_expand_expr($el)) if @$el;
- } elsif (my $l = is_literal_value($el)) {
- push @res, { -literal => $l };
- } elsif ($elref eq 'HASH') {
- local $Expand_Depth = 0;
- push @res, grep defined, $self->_expand_expr($el) if %$el;
- } else {
- die "notreached";
- }
- }
- # ???
- # return $res[0] if @res == 1;
- return { -op => [ $logic, @res ] };
+ return $self->_expand_andor("-${logic}", $expr);
}
if (my $literal = is_literal_value($expr)) {
return +{ -literal => $literal };
if (my $d = our $Default_Scalar_To) {
return $self->_expand_expr({ $d => $expr });
}
- if (my $m = our $Cur_Col_Meta) {
- return +{ -bind => [ $m, $expr ] };
- }
- return +{ -bind => [ undef, $expr ] };
+ return $self->_expand_value(-value => $expr);
}
die "notreached";
}
}
if ($k =~ /^-/) {
$self->_assert_pass_injection_guard($k =~ /^-(.*)$/s);
- if ($k =~ s/ [_\s]? \d+ $//x ) {
- belch 'Use of [and|or|nest]_N modifiers is deprecated and will be removed in SQLA v2.0. '
- . "You probably wanted ...-and => [ $k => COND1, $k => COND2 ... ]";
- }
if ($k eq '-nest') {
# DBIx::Class requires a nest warning to be emitted once but the private
# method it overrode to do so no longer exists
$self->_expand_expr({ "-${rest}", $v }, $logic)
] };
}
- if (my ($logic) = $k =~ /^-(and|or)$/i) {
- if (ref($v) eq 'HASH') {
- return $self->_expand_expr($v, $logic);
- }
- if (ref($v) eq 'ARRAY') {
- return $self->_expand_expr($v, $logic);
- }
- }
{
my $op = $k;
$op =~ s/^-// if length($op) > 1;
return { -op => [ $op, $v ] };
}
}
- if (my $custom = $self->{expand_unary}{$k}) {
- return $self->$custom($v);
- }
if ($self->{render}{$k}) {
return { $k => $v };
}
if (ref($v) eq 'ARRAY') {
return $self->sqlfalse unless @$v;
$self->_debug("ARRAY($k) means distribute over elements");
- my $this_logic = (
- $v->[0] =~ /^-((?:and|or))$/i
- ? ($v = [ @{$v}[1..$#$v] ], $1)
- : ($self->{logic} || 'or')
+ my $this_logic = lc(
+ $v->[0] =~ /^-(and|or)$/i
+ ? shift(@{$v = [ @$v ]})
+ : '-'.($self->{logic} || 'or')
);
- return +{ -op => [
- $this_logic,
- map $self->_expand_expr({ $k => $_ }, $this_logic), @$v
- ] };
+ return $self->_expand_expr({
+ $this_logic => [ map +{ $k => $_ }, @$v ]
+ });
}
if (my $literal = is_literal_value($v)) {
unless (length $k) {
return $self->_expand_ident(-ident => $v);
}
+sub _expand_andor {
+ my ($self, $k, $v) = @_;
+ my ($logic) = $k =~ /^-(.*)$/;
+ if (ref($v) eq 'HASH') {
+ return +{ -op => [
+ $logic,
+ map $self->_expand_expr({ $_ => $v->{$_} }, $logic),
+ sort keys %$v
+ ] };
+ }
+ if (ref($v) eq 'ARRAY') {
+ $logic eq 'and' or $logic eq 'or' or puke "unknown logic: $logic";
+
+ my @expr = grep {
+ (ref($_) eq 'ARRAY' and @$_)
+ or (ref($_) eq 'HASH' and %$_)
+ or 1
+ } @$v;
+
+ my @res;
+
+ while (my ($el) = splice @expr, 0, 1) {
+ puke "Supplying an empty left hand side argument is not supported in array-pairs"
+ unless defined($el) and length($el);
+ my $elref = ref($el);
+ if (!$elref) {
+ local our $Expand_Depth = 0;
+ push(@res, grep defined, $self->_expand_expr({ $el, shift(@expr) }));
+ } elsif ($elref eq 'ARRAY') {
+ push(@res, grep defined, $self->_expand_expr($el)) if @$el;
+ } elsif (my $l = is_literal_value($el)) {
+ push @res, { -literal => $l };
+ } elsif ($elref eq 'HASH') {
+ local our $Expand_Depth = 0;
+ push @res, grep defined, $self->_expand_expr($el) if %$el;
+ } else {
+ die "notreached";
+ }
+ }
+ # ???
+ # return $res[0] if @res == 1;
+ return { -op => [ $logic, @res ] };
+ }
+ die "notreached";
+}
+
sub _recurse_where {
my ($self, $where, $logic) = @_;
return $self->_convert($self->_quote($ident));
}
-my %unop_postfix = map +($_ => 1),
- 'is null', 'is not null',
- 'asc', 'desc',
-;
-
-my %special = (
- (map +($_ => do {
- my $op = $_;
- sub {
- my ($self, $args) = @_;
- my ($left, $low, $high) = @$args;
- my ($rhsql, @rhbind) = do {
- if (@$args == 2) {
- puke "Single arg to between must be a literal"
- unless $low->{-literal};
- @{$low->{-literal}}
- } else {
- my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
- (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
- @{$l}[1..$#$l], @{$h}[1..$#$h])
- }
- };
- my ($lhsql, @lhbind) = $self->render_aqt($left);
- return (
- join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
- @lhbind, @rhbind
- );
- }
+sub _render_list {
+ my ($self, $list) = @_;
+ my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list;
+ return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts;
+}
+
+sub _render_func {
+ my ($self, $rest) = @_;
+ my ($func, @args) = @$rest;
+ my @arg_sql;
+ my @bind = map {
+ my @x = @$_;
+ push @arg_sql, shift @x;
+ @x
+ } map [ $self->render_aqt($_) ], @args;
+ return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
+}
+
+sub _render_bind {
+ my ($self, $bind) = @_;
+ return ($self->_convert('?'), $self->_bindtype(@$bind));
+}
+
+sub _render_literal {
+ my ($self, $literal) = @_;
+ $self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]);
+ return @$literal;
+}
+
+our $RENDER_OP = {
+ (map +($_ => sub {
+ my ($self, $op, $args) = @_;
+ my ($left, $low, $high) = @$args;
+ my ($rhsql, @rhbind) = do {
+ if (@$args == 2) {
+ puke "Single arg to between must be a literal"
+ unless $low->{-literal};
+ @{$low->{-literal}}
+ } else {
+ my ($l, $h) = map [ $self->render_aqt($_) ], $low, $high;
+ (join(' ', $l->[0], $self->_sqlcase('and'), $h->[0]),
+ @{$l}[1..$#$l], @{$h}[1..$#$h])
+ }
+ };
+ my ($lhsql, @lhbind) = $self->render_aqt($left);
+ return (
+ join(' ', '(', $lhsql, $self->_sqlcase($op), $rhsql, ')'),
+ @lhbind, @rhbind
+ );
}), 'between', 'not between'),
- (map +($_ => do {
- my $op = $_;
- sub {
- my ($self, $args) = @_;
- my ($lhs, $rhs) = @$args;
- my @in_bind;
- my @in_sql = map {
- my ($sql, @bind) = $self->render_aqt($_);
- push @in_bind, @bind;
- $sql;
- } @$rhs;
- my ($lhsql, @lbind) = $self->render_aqt($lhs);
- return (
- $lhsql.' '.$self->_sqlcase($op).' ( '
- .join(', ', @in_sql)
- .' )',
- @lbind, @in_bind
- );
- }
+ (map +($_ => sub {
+ my ($self, $op, $args) = @_;
+ my ($lhs, $rhs) = @$args;
+ my @in_bind;
+ my @in_sql = map {
+ my ($sql, @bind) = $self->render_aqt($_);
+ push @in_bind, @bind;
+ $sql;
+ } @$rhs;
+ my ($lhsql, @lbind) = $self->render_aqt($lhs);
+ return (
+ $lhsql.' '.$self->_sqlcase($op).' ( '
+ .join(', ', @in_sql)
+ .' )',
+ @lbind, @in_bind
+ );
}), 'in', 'not in'),
-);
+ (map +($_ => '_render_unop_postfix'),
+ 'is null', 'is not null', 'asc', 'desc',
+ ),
+ (not => '_render_op_not'),
+ (map +($_ => sub {
+ my ($self, $op, $args) = @_;
+ my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$args;
+ return '' unless @parts;
+ return @{$parts[0]} if @parts == 1;
+ my ($final_sql) = join(
+ ' '.$self->_sqlcase($op).' ',
+ map $_->[0], @parts
+ );
+ return (
+ '('.$final_sql.')',
+ map @{$_}[1..$#$_], @parts
+ );
+ }), qw(and or)),
+};
sub _render_op {
my ($self, $v) = @_;
my ($op, @args) = @$v;
- $op =~ s/^-// if length($op) > 1;
- $op = lc($op);
- if (my $h = $special{$op}) {
- return $self->$h(\@args);
+ if (my $r = $self->{render_op}{$op}) {
+ return $self->$r($op, \@args);
}
my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{special_ops}};
if ($us and @args > 1) {
if (my $us = List::Util::first { $op =~ $_->{regex} } @{$self->{unary_ops}}) {
return $self->${\($us->{handler})}($op, $args[0]);
}
- my $final_op = $op =~ /^(?:is|not)_/ ? join(' ', split '_', $op) : $op;
- if (@args == 1 and $op !~ /^(and|or)$/) {
- my ($expr_sql, @bind) = $self->render_aqt($args[0]);
- my $op_sql = $self->_sqlcase($final_op);
- my $final_sql = (
- $unop_postfix{lc($final_op)}
- ? "${expr_sql} ${op_sql}"
- : "${op_sql} ${expr_sql}"
- );
- return (($op eq 'not' || $us ? '('.$final_sql.')' : $final_sql), @bind);
+ if (@args == 1) {
+ return $self->_render_unop_prefix($op, \@args);
} else {
my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @args;
return '' unless @parts;
- my $is_andor = !!($op =~ /^(and|or)$/);
- return @{$parts[0]} if $is_andor and @parts == 1;
- my ($final_sql) = map +($is_andor ? "( ${_} )" : $_), join(
- ' '.$self->_sqlcase($final_op).' ',
+ my ($final_sql) = join(
+ ' '.$self->_sqlcase($op).' ',
map $_->[0], @parts
);
return (
die "unhandled";
}
-sub _render_list {
- my ($self, $list) = @_;
- my @parts = grep length($_->[0]), map [ $self->render_aqt($_) ], @$list;
- return join(', ', map $_->[0], @parts), map @{$_}[1..$#$_], @parts;
+sub _render_op_not {
+ my ($self, $op, $v) = @_;
+ my ($sql, @bind) = $self->_render_unop_prefix($op, $v);
+ return "(${sql})", @bind;
}
-sub _render_func {
- my ($self, $rest) = @_;
- my ($func, @args) = @$rest;
- my @arg_sql;
- my @bind = map {
- my @x = @$_;
- push @arg_sql, shift @x;
- @x
- } map [ $self->render_aqt($_) ], @args;
- return ($self->_sqlcase($func).'('.join(', ', @arg_sql).')', @bind);
+sub _render_unop_prefix {
+ my ($self, $op, $v) = @_;
+ my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
+ my $op_sql = $self->_sqlcase($op);
+ return ("${op_sql} ${expr_sql}", @bind);
}
-sub _render_bind {
- my ($self, $bind) = @_;
- return ($self->_convert('?'), $self->_bindtype(@$bind));
-}
-
-sub _render_literal {
- my ($self, $literal) = @_;
- $self->_assert_bindval_matches_bindtype(@{$literal}[1..$#$literal]);
- return @$literal;
+sub _render_unop_postfix {
+ my ($self, $op, $v) = @_;
+ my ($expr_sql, @bind) = $self->render_aqt($v->[0]);
+ my $op_sql = $self->_sqlcase($op);
+ return ($expr_sql.' '.$op_sql, @bind);
}
# Some databases (SQLite) treat col IN (1, 2) different from
puke "ordering direction hash passed to order by must have exactly one key (-asc or -desc)";
}
}
- my @exp = map +(defined($dir) ? { -op => [ $dir => $_ ] } : $_),
+ my @exp = map +(
+ defined($dir) ? { -op => [ $dir =~ /^-?(.*)$/ ,=> $_ ] } : $_
+ ),
map $self->expand_expr($_, -ident),
map ref($_) eq 'ARRAY' ? @$_ : $_, @to_expand;
return (@exp > 1 ? { -list => \@exp } : $exp[0]);
};
- local @{$self->{expand_unary}}{qw(-asc -desc)} = (
- sub { shift->$expander(asc => @_) },
- sub { shift->$expander(desc => @_) },
- );
+ local @{$self->{expand}}{qw(-asc -desc)} = (($expander) x 2);
return $self->$expander(undef, $arg);
}
projects / scpubgit/Q-Branch.git / blobdiff