'HAVING',
'ORDER \s+ BY',
'SKIP',
+ 'FETCH',
'FIRST',
'LIMIT',
'OFFSET',
'SAVEPOINT',
'RELEASE \s+ SAVEPOINT',
'RETURNING',
- 'ROW_NUMBER \s* \( \s* \) \s+ OVER',
);
my $expr_start_re = join ("\n\t|\n", @expression_start_keywords );
;
$binary_op_re = qr/$binary_op_re/x;
-my $unary_op_re = '(?: NOT \s+ EXISTS | NOT )';
+my $rno_re = qr/ROW_NUMBER \s* \( \s* \) \s+ OVER/ix;
+
+my $unary_op_re = 'NOT \s+ EXISTS | NOT | ' . $rno_re;
$unary_op_re = join "\n\t|\n",
"$op_look_behind (?i: $unary_op_re ) $op_look_ahead",
;
$_ = qr/ \A $_ \z /x;
}
-
+# what can be bunched together under one MISC in an AST
+my $compressable_node_re = qr/^ \- (?: MISC | LITERAL | PLACEHOLDER ) $/x;
my %indents = (
select => 0,
@right = $self->_recurse_parse($tokens, PARSE_IN_EXPR);
}
- @left = [$op => [ @left, @right ]];
+ push @left, [$op => [ (@left ? pop @left : ''), @right ]];
}
# unary op keywords
elsif ( $token =~ $unary_op_re ) {
my $op = uc $token;
+
+ # normalize RNO explicitly
+ $op = 'ROW_NUMBER() OVER' if $op =~ /^$rno_re$/;
+
my @right = $self->_recurse_parse ($tokens, PARSE_RHS);
push @left, [ $op => \@right ];
else {
my @lits = [ -LITERAL => [$token] ];
+ unshift @lits, pop @left if @left == 1;
+
unless ( $state == PARSE_RHS ) {
while (
@$tokens
! ( @$tokens > 1 and $tokens->[1] eq '(' )
) {
push @lits, [ -LITERAL => [ shift @$tokens ] ];
- }
+ }
}
- if (@left == 1) {
- unshift @lits, pop @left;
- }
-
@lits = [ -MISC => [ @lits ] ] if @lits > 1;
push @left, @lits;
}
- if (@$tokens) {
+ # compress -LITERAL -MISC and -PLACEHOLDER pieces into a single
+ # -MISC container
+ if (@left > 1) {
+ my $i = 0;
+ while ($#left > $i) {
+ if ($left[$i][0] =~ $compressable_node_re and $left[$i+1][0] =~ $compressable_node_re) {
+ splice @left, $i, 2, [ -MISC => [
+ map { $_->[0] eq '-MISC' ? @{$_->[1]} : $_ } (@left[$i, $i+1])
+ ]];
+ }
+ else {
+ $i++;
+ }
+ }
+ }
- # deal with post-fix operators (asc/desc)
+ return @left if $state == PARSE_RHS;
+
+ # deal with post-fix operators
+ if (@$tokens) {
+ # asc/desc
if ($tokens->[0] =~ $asc_desc_re) {
- return @left if $state == PARSE_RHS;
@left = [ ('-' . uc (shift @$tokens)) => [ @left ] ];
}
-
- return @left if $state == PARSE_RHS and $left[-1][0] eq '-LITERAL';
}
}
}
}
# unroll nested parenthesis
- while ( @{$child->[1]} == 1 and $child->[1][0][0] eq '-PAREN') {
+ while ( $ast->[0] ne 'IN' and @{$child->[1]} == 1 and $child->[1][0][0] eq '-PAREN') {
$child = $child->[1][0];
$changes++;
}