$opt{expand} = {
-ident => '_expand_ident',
- -value => sub { +{ -bind => [ our $Cur_Col_Meta, $_[2] ] } },
- -not => sub { +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] } },
+ -value => '_expand_value',
+ -not => '_expand_not',
+ -bool => '_expand_bool',
+ -and => '_expand_andor',
+ -or => '_expand_andor',
};
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 ($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
}
return $self->_expand_expr($v);
}
- if ($k eq '-bool') {
- if (ref($v)) {
- return $self->_expand_expr($v);
- }
- puke "-bool => undef not supported" unless defined($v);
- return $self->_expand_ident(-ident => $v);
- }
if (my ($rest) = $k =~/^-not[_ ](.*)$/) {
return +{ -op => [
'not',
$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 +{ -ident => \@parts };
}
+sub _expand_value {
+ +{ -bind => [ our $Cur_Col_Meta, $_[2] ] };
+}
+
+sub _expand_not {
+ +{ -op => [ 'not', $_[0]->_expand_expr($_[2]) ] };
+}
+
+sub _expand_bool {
+ my ($self, undef, $v) = @_;
+ if (ref($v)) {
+ return $self->_expand_expr($v);
+ }
+ puke "-bool => undef not supported" unless defined($v);
+ 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) = @_;
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