[Bast-commits] r5793 - in SQL-Abstract/1.x/trunk: lib/SQL/Abstract t
ribasushi at dev.catalyst.perl.org
ribasushi at dev.catalyst.perl.org
Sun Mar 22 21:10:24 GMT 2009
Author: ribasushi
Date: 2009-03-22 21:10:23 +0000 (Sun, 22 Mar 2009)
New Revision: 5793
Modified:
SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Test.pm
SQL-Abstract/1.x/trunk/t/10test.t
Log:
Massive SQLA::Test rewrite - make it handle ()s sanely, instead of pruning them at will
Modified: SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Test.pm
===================================================================
--- SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Test.pm 2009-03-22 21:09:22 UTC (rev 5792)
+++ SQL-Abstract/1.x/trunk/lib/SQL/Abstract/Test.pm 2009-03-22 21:10:23 UTC (rev 5793)
@@ -17,9 +17,9 @@
our $tb = __PACKAGE__->builder;
# Parser states for _recurse_parse()
-use constant PARSE_TOP_LEVEL => 0;
use constant PARSE_IN_EXPR => 1;
use constant PARSE_IN_PARENS => 2;
+use constant PARSE_TOP_LEVEL => 3;
# These SQL keywords always signal end of the current expression (except inside
# of a parenthesized subexpression).
@@ -27,6 +27,7 @@
# /.../x) regexes, without capturing parentheses. They will be automatically
# anchored to word boundaries to match the whole token).
my @expression_terminator_sql_keywords = (
+ 'SELECT',
'FROM',
'(?:
(?:
@@ -48,6 +49,15 @@
'EXCEPT',
);
+# All of these keywords allow their parameters to be wrapped in parenthesis without changing any semantics
+my @unrollable_sql_keywords = (
+ 'ON',
+ 'WHERE',
+ 'GROUP \s+ BY',
+ 'HAVING',
+ 'ORDER \s+ BY',
+);
+
my $tokenizer_re_str = join('|',
map { '\b' . $_ . '\b' }
@expression_terminator_sql_keywords, 'AND', 'OR'
@@ -65,7 +75,10 @@
\s*
/xi;
+my $unrollable_re_str = join ('|', map { $_ } @unrollable_sql_keywords);
+my $unrollable_re = qr/^ (?: $unrollable_re_str ) $/ix;
+
sub is_same_sql_bind {
my ($sql1, $bind_ref1, $sql2, $bind_ref2, $msg) = @_;
@@ -163,16 +176,12 @@
my $tree1 = parse($sql1);
my $tree2 = parse($sql2);
- return _eq_sql($tree1, $tree2);
+ return 1 if _eq_sql($tree1, $tree2);
}
sub _eq_sql {
my ($left, $right) = @_;
- # ignore top-level parentheses
- while ($left and $left->[0] and $left->[0] eq 'PAREN') {$left = $left->[1]}
- while ($right and $right->[0] and $right->[0] eq 'PAREN') {$right = $right->[1]}
-
# one is defined the other not
if ( (defined $left) xor (defined $right) ) {
return 0;
@@ -181,26 +190,92 @@
elsif (not defined $left) {
return 1;
}
- # if operators are different
- elsif ($left->[0] ne $right->[0]) {
- $sql_differ = sprintf "OP [$left->[0]] != [$right->[0]] in\nleft: %s\nright: %s\n",
- unparse($left),
- unparse($right);
+ # one is a list, the other is an op with a list
+ elsif (ref $left->[0] xor ref $right->[0]) {
+ $sql_differ = sprintf ("left: %s\nright: %s\n", map { unparse ($_) } ($left, $right) );
return 0;
}
- # elsif operators are identical, compare operands
- else {
- if ($left->[0] eq 'EXPR' ) { # unary operator
- (my $l = " $left->[1] " ) =~ s/\s+/ /g;
- (my $r = " $right->[1] ") =~ s/\s+/ /g;
- my $eq = $case_sensitive ? $l eq $r : uc($l) eq uc($r);
- $sql_differ = "[$left->[1]] != [$right->[1]]\n" if not $eq;
- return $eq;
+ # one is a list, so is the other
+ elsif (ref $left->[0]) {
+ for (my $i = 0; $i <= $#$left or $i <= $#$right; $i++ ) {
+ return 0 if (not _eq_sql ($left->[$i], $right->[$i]) );
}
- else { # binary operator
- return _eq_sql($left->[1][0], $right->[1][0]) # left operand
- && _eq_sql($left->[1][1], $right->[1][1]); # right operand
+ return 1;
+ }
+ # both are an op-list combo
+ else {
+
+ for ($left, $right) {
+
+ next unless (ref $_->[1]);
+
+ # unroll parenthesis in an elaborate loop
+ my $changes;
+ do {
+
+ my @children;
+ $changes = 0;
+
+ for my $child (@{$_->[1]}) {
+ if (not ref $child or not $child->[0] eq 'PAREN') {
+ push @children, $child;
+ next;
+ }
+
+ # unroll nested parenthesis
+ while ($child->[1][0][0] eq 'PAREN') {
+ $child = $child->[1][0];
+ $changes++;
+ }
+
+ # if the parens are wrapped around an AND/OR matching the parent AND/OR - open the parens up and merge the list
+ if (
+ ( $_->[0] eq 'AND' or $_->[0] eq 'OR')
+ and
+ $child->[1][0][0] eq $_->[0]
+ ) {
+ push @children, @{$child->[1][0][1]};
+ $changes++;
+ }
+
+ # if the parent operator explcitly allows it, or if parents are wrapped around an expression just nuke them
+ elsif ( $child->[1][0][0] eq 'EXPR' or $_->[0] =~ $unrollable_re ) {
+ push @children, $child->[1][0];
+ $changes++;
+ }
+
+ # otherwise no more mucking
+ else {
+ push @children, $child;
+ }
+ }
+
+ $_->[1] = \@children;
+ } while ($changes);
}
+
+ # if operators are different
+ if ($left->[0] ne $right->[0]) {
+ $sql_differ = sprintf "OP [$left->[0]] != [$right->[0]] in\nleft: %s\nright: %s\n",
+ unparse($left),
+ unparse($right);
+ return 0;
+ }
+ # elsif operators are identical, compare operands
+ else {
+ if ($left->[0] eq 'EXPR' ) { # unary operator
+ (my $l = " $left->[1] " ) =~ s/\s+/ /g;
+ (my $r = " $right->[1] ") =~ s/\s+/ /g;
+ my $eq = $case_sensitive ? $l eq $r : uc($l) eq uc($r);
+ $sql_differ = "[$left->[1]] != [$right->[1]]\n" if not $eq;
+ return $eq;
+ }
+ else {
+ my $eq = _eq_sql($left->[1], $right->[1]);
+ $sql_differ ||= sprintf ("left: %s\nright: %s\n", map { unparse ($_) } ($left, $right) ) if not $eq;
+ return $eq;
+ }
+ }
}
}
@@ -228,12 +303,20 @@
while (1) { # left-associative parsing
my $lookahead = $tokens->[0];
- return $left if !defined($lookahead)
- || ($state == PARSE_IN_PARENS && $lookahead eq ')')
- || ($state == PARSE_IN_EXPR && grep { $lookahead =~ /^$_$/xi }
- '\)', @expression_terminator_sql_keywords
- );
+ if ( not defined($lookahead)
+ or
+ ($state == PARSE_IN_PARENS && $lookahead eq ')')
+ or
+ ($state == PARSE_IN_EXPR && grep { $lookahead =~ /^ $_ $/xi } ('\)', @expression_terminator_sql_keywords) )
+ ) {
+ return $left;
+ return ($state == PARSE_TOP_LEVEL
+ ? $left->[0]
+ : $left
+ );
+ }
+
my $token = shift @$tokens;
# nested expression in ()
@@ -241,24 +324,33 @@
my $right = _recurse_parse($tokens, PARSE_IN_PARENS);
$token = shift @$tokens or croak "missing ')'";
$token eq ')' or croak "unexpected token : $token";
- $left = $left ? [CONCAT => [$left, [PAREN => $right]]]
- : [PAREN => $right];
+ $left = $left ? [@$left, [PAREN => [$right] ]]
+ : [PAREN => [$right] ];
}
- # AND/OR
- elsif ($token eq 'AND' || $token eq 'OR') {
+ # AND/OR
+ elsif ($token =~ /^ (?: OR | AND ) $/xi ) {
+ my $op = uc $token;
my $right = _recurse_parse($tokens, PARSE_IN_EXPR);
- $left = [$token => [$left, $right]];
+
+ # Merge chunks if logic matches
+ if (ref $right and $op eq $right->[0]) {
+ $left = [ (shift @$right ), [$left, map { @$_ } @$right] ];
+ }
+ else {
+ $left = [$op => [$left, $right]];
+ }
}
# expression terminator keywords (as they start a new expression)
- elsif (grep { $token =~ /^$_$/xi } @expression_terminator_sql_keywords) {
+ elsif (grep { $token =~ /^ $_ $/xi } @expression_terminator_sql_keywords ) {
+ my $op = uc $token;
my $right = _recurse_parse($tokens, PARSE_IN_EXPR);
- $left = $left ? [CONCAT => [$left, [CONCAT => [[EXPR => $token], [PAREN => $right]]]]]
- : [CONCAT => [[EXPR => $token], [PAREN => $right]]];
+ $left = $left ? [@$left, [$op => [$right] ]]
+ : [ [$op => [$right] ] ];
}
# leaf expression
else {
- $left = $left ? [CONCAT => [$left, [EXPR => $token]]]
- : [EXPR => $token];
+ $left = $left ? [@$left, [EXPR => $token] ]
+ : [ EXPR => $token ];
}
}
}
@@ -267,14 +359,25 @@
sub unparse {
my $tree = shift;
- my $dispatch = {
- EXPR => sub {$tree->[1] },
- PAREN => sub {"(" . unparse($tree->[1]) . ")" },
- CONCAT => sub {join " ", map {unparse($_)} @{$tree->[1]}},
- AND => sub {join " AND ", map {unparse($_)} @{$tree->[1]}},
- OR => sub {join " OR ", map {unparse($_)} @{$tree->[1]}},
- };
- $dispatch->{$tree->[0]}->();
+
+ if (not $tree ) {
+ return '';
+ }
+ elsif (ref $tree->[0]) {
+ return join (" ", map { unparse ($_) } @$tree);
+ }
+ elsif ($tree->[0] eq 'EXPR') {
+ return $tree->[1];
+ }
+ elsif ($tree->[0] eq 'PAREN') {
+ return sprintf '( %s )', join (" ", map {unparse($_)} @{$tree->[1]});
+ }
+ elsif ($tree->[0] eq 'OR' or $tree->[0] eq 'AND') {
+ return join (" $tree->[0] ", map {unparse($_)} @{$tree->[1]});
+ }
+ else {
+ return sprintf '%s %s', $tree->[0], unparse ($tree->[1]);
+ }
}
Modified: SQL-Abstract/1.x/trunk/t/10test.t
===================================================================
--- SQL-Abstract/1.x/trunk/t/10test.t 2009-03-22 21:09:22 UTC (rev 5792)
+++ SQL-Abstract/1.x/trunk/t/10test.t 2009-03-22 21:10:23 UTC (rev 5793)
@@ -99,22 +99,30 @@
},
{
equal => 1,
- todo => '( (x AND y) AND z ) should be reducable to ( x AND y AND z )',
statements => [
q/SELECT foo FROM bar WHERE a = 1 AND b = 1 AND c = 1/,
q/SELECT foo FROM bar WHERE (a = 1 AND b = 1) AND c = 1/,
q/SELECT foo FROM bar WHERE a = 1 AND (b = 1 AND c = 1)/,
+ q/SELECT foo FROM bar WHERE ((((a = 1))) AND (b = 1 AND c = 1))/,
]
},
{
equal => 1,
- todo => '( (x OR y) OR z ) should be reducable to ( x OR y OR z )',
statements => [
q/SELECT foo FROM bar WHERE a = 1 OR b = 1 OR c = 1/,
q/SELECT foo FROM bar WHERE (a = 1 OR b = 1) OR c = 1/,
q/SELECT foo FROM bar WHERE a = 1 OR (b = 1 OR c = 1)/,
+ q/SELECT foo FROM bar WHERE a = 1 OR ((b = 1 OR (c = 1)))/,
]
},
+ {
+ equal => 1,
+ statements => [
+ q/SELECT foo FROM bar WHERE (a = 1) AND (b = 1 OR c = 1 OR d = 1) AND (e = 1 AND f = 1)/,
+ q/SELECT foo FROM bar WHERE a = 1 AND (b = 1 OR c = 1 OR d = 1) AND e = 1 AND (f = 1)/,
+ q/SELECT foo FROM bar WHERE ( ((a = 1) AND ( b = 1 OR (c = 1 OR d = 1) )) AND ((e = 1)) AND f = 1) /,
+ ]
+ },
# WHERE condition - different
{
More information about the Bast-commits
mailing list