Permalink
Browse files

Fix stupid not exists omission

  • Loading branch information...
1 parent 64b9e43 commit af75bd59f0629a3a8533b8e8cb2691289f49abe4 @ribasushi ribasushi committed Dec 22, 2010
Showing with 6 additions and 3 deletions.
  1. +2 −0 Changes
  2. +3 −3 lib/SQL/Abstract/Tree.pm
  3. +1 −0 t/14roundtrippin.t
View
2 Changes
@@ -1,5 +1,7 @@
Revision history for SQL::Abstract
+ - Fix parsing of NOT EXISTS
+
revision 1.72 2010-12-21
----------------------------
- Extra checks of search arguments for possible SQL injection attacks
View
6 lib/SQL/Abstract/Tree.pm
@@ -64,7 +64,7 @@ my @expression_start_keywords = (
'ON',
'WHERE',
'(?: DEFAULT \s+ )? VALUES',
- 'EXISTS',
+ '(?:NOT \s+)? EXISTS',
'GROUP \s+ BY',
'HAVING',
'ORDER \s+ BY',
@@ -379,8 +379,8 @@ sub _recurse_parse {
elsif ( $token =~ /^ NOT $/ix ) {
my $op = uc $token;
my $right = $self->_recurse_parse ($tokens, PARSE_RHS);
- $left = $left ? [ @$left, [$op => [$right] ]]
- : [ $op => [$right] ];
+ $left = $left ? [ @$left, [$op => [$right||()] ]]
+ : [ $op => [$right||()] ];
}
elsif ( $token =~ $placeholder_re) {
View
1 t/14roundtrippin.t
@@ -14,6 +14,7 @@ my @sql = (
"SELECT * FROM (SELECT * FROM foobar) WHERE foo.a = 1 and foo.b LIKE 'station'",
"SELECT * FROM lolz WHERE ( foo.a =1 ) and foo.b LIKE 'station'",
"SELECT [screen].[id], [screen].[name], [screen].[section_id], [screen].[xtype] FROM [users_roles] [me] JOIN [roles] [role] ON [role].[id] = [me].[role_id] JOIN [roles_permissions] [role_permissions] ON [role_permissions].[role_id] = [role].[id] JOIN [permissions] [permission] ON [permission].[id] = [role_permissions].[permission_id] JOIN [permissionscreens] [permission_screens] ON [permission_screens].[permission_id] = [permission].[id] JOIN [screens] [screen] ON [screen].[id] = [permission_screens].[screen_id] WHERE ( [me].[user_id] = ? ) GROUP BY [screen].[id], [screen].[name], [screen].[section_id], [screen].[xtype]",
+ "SELECT * FROM foo WHERE NOT EXISTS (SELECT bar FROM baz)",
);
for (@sql) {

0 comments on commit af75bd5

Please sign in to comment.