X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=rt%2Flib%2FRT%2FTickets_Overlay_SQL.pm;h=4531a16908db839a7f95ec4c74bc23c462e03fc3;hp=a873af2d0a5055245caef824ac06fab2bbd646d6;hb=ef20b2b6b1feb47ad02b5ff7525f1a0fd11d0fa4;hpb=d39d52aac8f38ea9115628039f0df5aa3ac826de diff --git a/rt/lib/RT/Tickets_Overlay_SQL.pm b/rt/lib/RT/Tickets_Overlay_SQL.pm index a873af2d0..4531a1690 100644 --- a/rt/lib/RT/Tickets_Overlay_SQL.pm +++ b/rt/lib/RT/Tickets_Overlay_SQL.pm @@ -1,8 +1,8 @@ -# {{{ BEGIN BPS TAGGED BLOCK +# BEGIN BPS TAGGED BLOCK {{{ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC # # # (Except where explicitly superseded by other copyright notices) @@ -22,7 +22,9 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 or visit their web page on the internet at +# http://www.gnu.org/copyleft/gpl.html. # # # CONTRIBUTION SUBMISSION POLICY: @@ -42,21 +44,21 @@ # works based on those contributions, and sublicense and distribute # those contributions and any derivatives thereof. # -# }}} END BPS TAGGED BLOCK +# END BPS TAGGED BLOCK }}} +package RT::Tickets; + use strict; use warnings; -use RT::Tickets; - # Import configuration data from the lexcial scope of __PACKAGE__ (or # at least where those two Subroutines are defined.) -my %FIELDS = %{FIELDS()}; +my %FIELD_METADATA = %{FIELDS()}; my %dispatch = %{dispatch()}; my %can_bundle = %{can_bundle()}; # Lower Case version of FIELDS, for case insensitivity -my %lcfields = map { ( lc($_) => $_ ) } (keys %FIELDS); +my %lcfields = map { ( lc($_) => $_ ) } (keys %FIELD_METADATA); sub _InitSQL { my $self = shift; @@ -73,7 +75,7 @@ sub _InitSQL { $self->{'_sql_linkalias'} = undef; $self->{'_sql_transalias'} = undef; $self->{'_sql_trattachalias'} = undef; - $self->{'_sql_keywordalias'} = undef; + $self->{'_sql_object_cf_alias'} = undef; $self->{'_sql_depth'} = 0; $self->{'_sql_localdepth'} = 0; $self->{'_sql_query'} = ''; @@ -85,11 +87,13 @@ sub _InitSQL { sub _SQLLimit { my $self = shift; my %args = (@_); - if ($args{'FIELD'} eq 'EffectiveId') { + if ($args{'FIELD'} eq 'EffectiveId' && + (!$args{'ALIAS'} || $args{'ALIAS'} eq 'main' ) ) { $self->{'looking_at_effective_id'} = 1; } - if ($args{'FIELD'} eq 'Type') { + if ($args{'FIELD'} eq 'Type' && + (!$args{'ALIAS'} || $args{'ALIAS'} eq 'main' ) ) { $self->{'looking_at_type'} = 1; } @@ -149,15 +153,18 @@ use Regexp::Common qw /delimited/; use constant VALUE => 1; use constant AGGREG => 2; use constant OP => 4; -use constant PAREN => 8; -use constant KEYWORD => 16; -my @tokens = qw[VALUE AGGREG OP PAREN KEYWORD]; +use constant OPEN_PAREN => 8; +use constant CLOSE_PAREN => 16; +use constant KEYWORD => 32; +my @tokens = qw[VALUE AGGREG OP OPEN_PAREN CLOSE_PAREN KEYWORD]; my $re_aggreg = qr[(?i:AND|OR)]; -my $re_value = qr[$RE{delimited}{-delim=>qq{\'\"}}|\d+]; -my $re_keyword = qr[$RE{delimited}{-delim=>qq{\'\"}}|(?:\{|\}|\w|\.)+]; +my $re_delim = qr[$RE{delimited}{-delim=>qq{\'\"}}]; +my $re_value = qr[$re_delim|\d+|NULL]; +my $re_keyword = qr[$re_delim|(?:\{|\}|\w|\.)+]; my $re_op = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)]; # long to short -my $re_paren = qr'\(|\)'; +my $re_open_paren = qr'\('; +my $re_close_paren = qr'\)'; sub _close_bundle { @@ -193,7 +200,7 @@ sub _close_bundle sub _parser { my ($self,$string) = @_; - my $want = KEYWORD | PAREN; + my $want = KEYWORD | OPEN_PAREN; my $last = undef; my $depth = 0; @@ -214,17 +221,19 @@ sub _parser { |$re_op |$re_keyword |$re_value - |$re_paren - )/igx ) { + |$re_open_paren + |$re_close_paren + )/iogx ) { my $val = $1; my $current = 0; # Highest priority is last - $current = OP if $val =~ /^$re_op$/io; - $current = VALUE if $val =~ /^$re_value$/io; - $current = KEYWORD if $val =~ /^$re_keyword$/io && ($want & KEYWORD); - $current = AGGREG if $val =~ /^$re_aggreg$/io; - $current = PAREN if $val =~ /^$re_paren$/io; + $current = OP if ($want & OP) && $val =~ /^$re_op$/io; + $current = VALUE if ($want & VALUE) && $val =~ /^$re_value$/io; + $current = KEYWORD if ($want & KEYWORD) && $val =~ /^$re_keyword$/io; + $current = AGGREG if ($want & AGGREG) && $val =~ /^$re_aggreg$/io; + $current = OPEN_PAREN if ($want & OPEN_PAREN) && $val =~ /^$re_open_paren$/io; + $current = CLOSE_PAREN if ($want & CLOSE_PAREN) && $val =~ /^$re_close_paren$/io; unless ($current && $want & $current) { @@ -238,24 +247,23 @@ sub _parser { #$RT::Logger->debug("We've just found a '$current' called '$val'"); # Parens are highest priority - if ($current & PAREN) { - if ($val eq "(") { - $self->_close_bundle(@bundle); @bundle = (); - $depth++; - $self->_OpenParen; - - } else { - $self->_close_bundle(@bundle); @bundle = (); - $depth--; - $self->_CloseParen; - } + if ($current & OPEN_PAREN) { + $self->_close_bundle(@bundle); @bundle = (); + $depth++; + $self->_OpenParen; - $want = KEYWORD | PAREN | AGGREG; + $want = KEYWORD | OPEN_PAREN; } + elsif ( $current & CLOSE_PAREN ) { + $self->_close_bundle(@bundle); @bundle = (); + $depth--; + $self->_CloseParen; + $want = CLOSE_PAREN | AGGREG; + } elsif ( $current & AGGREG ) { $ea = $val; - $want = KEYWORD | PAREN; + $want = KEYWORD | OPEN_PAREN; } elsif ( $current & KEYWORD ) { $key = $val; @@ -270,21 +278,21 @@ sub _parser { # Remove surrounding quotes from $key, $val # (in future, simplify as for($key,$val) { action on $_ }) - if ($key =~ /$RE{delimited}{-delim=>qq{\'\"}}/) { + if ($key =~ /$re_delim/o) { substr($key,0,1) = ""; substr($key,-1,1) = ""; } - if ($val =~ /$RE{delimited}{-delim=>qq{\'\"}}/) { + if ($val =~ /$re_delim/o) { substr($val,0,1) = ""; substr($val,-1,1) = ""; } # Unescape escaped characters - $key =~ s!\\(.)!$1!g; - $val =~ s!\\(.)!$1!g; + $key =~ s!\\(.)!$1!g; + $val =~ s!\\(.)!$1!g; # print "$ea Key=[$key] op=[$op] val=[$val]\n"; - my $subkey; + my $subkey = ''; if ($key =~ /^(.+?)\.(.+)$/) { $key = $1; $subkey = $2; @@ -293,7 +301,7 @@ sub _parser { my $class; if (exists $lcfields{lc $key}) { $key = $lcfields{lc $key}; - $class = $FIELDS{$key}->[0]; + $class = $FIELD_METADATA{$key}->[0]; } # no longer have a default, since CF's are now a real class, not fallthrough # fixme: "default class" is not Generic. @@ -336,7 +344,7 @@ sub _parser { ($ea,$key,$op,$value) = ("","","",""); - $want = PAREN | AGGREG; + $want = CLOSE_PAREN | AGGREG; } else { die "I'm lost"; } @@ -347,10 +355,10 @@ sub _parser { $self->_close_bundle(@bundle); @bundle = (); die "Incomplete query" - unless (($want | PAREN) || ($want | KEYWORD)); + unless (($want | CLOSE_PAREN) || ($want | KEYWORD)); die "Incomplete Query" - unless ($last && ($last | PAREN) || ($last || VALUE)); + unless ($last && ($last | CLOSE_PAREN) || ($last || VALUE)); # This will never happen, because the parser will complain die "Mismatched parentheses" @@ -373,11 +381,11 @@ sub ClausesToSQL { my $first = 1; # Build SQL from the data hash - for my $data ( @{ $clauses->{$f} } ) { - $sql .= $data->[0] unless $first; $first=0; - $sql .= " '". $data->[2] . "' "; - $sql .= $data->[3] . " "; - $sql .= "'". $data->[4] . "' "; + for my $data ( @{ $clauses->{$f} } ) { + $sql .= $data->[0] unless $first; $first=0; # ENTRYAGGREGATOR + $sql .= " '". $data->[2] . "' "; # FIELD + $sql .= $data->[3] . " "; # OPERATOR + $sql .= "'". $data->[4] . "' "; # VALUE } push @sql, " ( " . $sql . " ) "; @@ -397,64 +405,66 @@ failure. =begin testing use RT::Tickets; - - +use strict; my $tix = RT::Tickets->new($RT::SystemUser); +{ + my $query = "Status = 'open'"; + my ($status, $msg) = $tix->FromSQL($query); + ok ($status, "correct query") or diag("error: $msg"); +} -my $query = "Status = 'open'"; -my ($id, $msg) = $tix->FromSQL($query); - -ok ($id, $msg); - - -my (@ids, @expectedids); - -my $t = RT::Ticket->new($RT::SystemUser); +my (@created,%created); my $string = 'subject/content SQL test'; -ok( $t->Create(Queue => 'General', Subject => $string), "Ticket Created"); - -push @ids, $t->Id; - -my $Message = MIME::Entity->build( - Subject => 'this is my subject', - From => 'jesse@example.com', - Data => [ $string ], - ); - -ok( $t->Create(Queue => 'General', Subject => 'another ticket', MIMEObj => $Message, MemberOf => $ids[0]), "Ticket Created"); - -push @ids, $t->Id; - -$query = ("Subject LIKE '$string' OR Content LIKE '$string'"); - -my ($id, $msg) = $tix->FromSQL($query); - -ok ($id, $msg); - -is ($tix->Count, scalar @ids, "number of returned tickets same as entered"); - -while (my $tick = $tix->Next) { - push @expectedids, $tick->Id; +{ + my $t = RT::Ticket->new($RT::SystemUser); + ok( $t->Create(Queue => 'General', Subject => $string), "Ticket Created"); + $created{ $t->Id }++; push @created, $t->Id; } -ok (eq_array(\@ids, \@expectedids), "returned expected tickets"); - -$query = ("id = $ids[0] OR MemberOf = $ids[0]"); +{ + my $Message = MIME::Entity->build( + Subject => 'this is my subject', + From => 'jesse@example.com', + Data => [ $string ], + ); + + my $t = RT::Ticket->new($RT::SystemUser); + ok( $t->Create( Queue => 'General', + Subject => 'another ticket', + MIMEObj => $Message, + MemberOf => $created[0] + ), + "Ticket Created" + ); + $created{ $t->Id }++; push @created, $t->Id; +} -my ($id, $msg) = $tix->FromSQL($query); +{ + my $query = ("Subject LIKE '$string' OR Content LIKE '$string'"); + my ($status, $msg) = $tix->FromSQL($query); + ok ($status, "correct query") or diag("error: $msg"); -ok ($id, $msg); + my $count = 0; + while (my $tick = $tix->Next) { + $count++ if $created{ $tick->id }; + } + is ($count, scalar @created, "number of returned tickets same as entered"); +} -is ($tix->Count, scalar @ids, "number of returned tickets same as entered"); +{ + my $query = "id = $created[0] OR MemberOf = $created[0]"; + my ($status, $msg) = $tix->FromSQL($query); + ok ($status, "correct query") or diag("error: $msg"); -@expectedids = (); -while (my $tick = $tix->Next) { - push @expectedids, $tick->Id; + my $count = 0; + while (my $tick = $tix->Next) { + $count++ if $created{ $tick->id }; + } + is ($count, scalar @created, "number of returned tickets same as entered"); } -ok (eq_array(\@ids, \@expectedids), "returned expected tickets"); =end testing @@ -476,7 +486,7 @@ sub FromSQL { $self->{_sql_query} = $query; eval { $self->_parser( $query ); }; if ($@) { - $RT::Logger->error( $@ ); + $RT::Logger->error( "Query error in <<$query>>:\n$@" ); return(0,$@); } # We only want to look at EffectiveId's (mostly) for these searches. @@ -505,8 +515,12 @@ sub FromSQL { $self->SUPER::Limit( FIELD => 'Type', OPERATOR => '=', VALUE => 'ticket'); } - # We never ever want to show deleted tickets - $self->SUPER::Limit(FIELD => 'Status' , OPERATOR => '!=', VALUE => 'deleted'); + # We don't want deleted tickets unless 'allow_deleted_search' is set + unless( $self->{'allow_deleted_search'} ) { + $self->SUPER::Limit(FIELD => 'Status', + OPERATOR => '!=', + VALUE => 'deleted'); + } # set SB's dirty flag