rt 4.2.13 ticket#13852

[freeside.git] / rt / lib / RT / SQL.pm

diff --git a/rt/lib/RT/SQL.pm b/rt/lib/RT/SQL.pm
index e696dd2..f470a91 100644 (file)
--- a/rt/lib/RT/SQL.pm
+++ b/rt/lib/RT/SQL.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -51,10 +51,6 @@ package RT::SQL;
 use strict;
 use warnings;
 
-use constant HAS_BOOLEAN_PARSER => do {
-    local $@;
-    eval { require Parse::BooleanLogic; 1 }
-};
 
 # States
 use constant VALUE       => 1;
@@ -68,9 +64,9 @@ my @tokens = qw[VALUE AGGREGATOR OPERATOR OPEN_PAREN CLOSE_PAREN KEYWORD];
 use Regexp::Common qw /delimited/;
 my $re_aggreg      = qr[(?i:AND|OR)];
 my $re_delim       = qr[$RE{delimited}{-delim=>qq{\'\"}}];
-my $re_value       = qr[[+-]?\d+|NULL|$re_delim];
+my $re_value       = qr[[+-]?\d+|(?i:NULL)|$re_delim];
 my $re_keyword     = qr[[{}\w\.]+|$re_delim];
-my $re_op          = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)]; # long to short
+my $re_op          = qr[=|!=|>=|<=|>|<|(?i:IS NOT)|(?i:IS)|(?i:NOT LIKE)|(?i:LIKE)|(?i:NOT STARTSWITH)|(?i:STARTSWITH)|(?i:NOT ENDSWITH)|(?i:ENDSWITH)]; # long to short
 my $re_open_paren  = qr[\(];
 my $re_close_paren = qr[\)];
 
@@ -92,6 +88,7 @@ sub ParseToArray {
 
 sub Parse {
     my ($string, $cb) = @_;
+    my $loc = sub {HTML::Mason::Commands::loc(@_)};
     $string = '' unless defined $string;
 
     my $want = KEYWORD | OPEN_PAREN;
@@ -128,7 +125,7 @@ sub Parse {
         unless ($current && $want & $current) {
             my $tmp = substr($string, 0, pos($string)- length($match));
             $tmp .= '>'. $match .'<--here'. substr($string, pos($string));
-            my $msg = "Wrong query, expecting a ". _BitmaskToString($want) ." in '$tmp'";
+            my $msg = $loc->("Wrong query, expecting a [_1] in '[_2]'", _BitmaskToString($want), $tmp);
             return $cb->{'Error'}->( $msg ) if $cb->{'Error'};
             die $msg;
         }
@@ -178,7 +175,7 @@ sub Parse {
             $want = AGGREG;
             $want |= CLOSE_PAREN if $depth;
         } else {
-            my $msg = "Query parser is lost";
+            my $msg = $loc->("Query parser is lost");
             return $cb->{'Error'}->( $msg ) if $cb->{'Error'};
             die $msg;
         }
@@ -187,15 +184,15 @@ sub Parse {
     } # while
 
     unless( !$last || $last & (CLOSE_PAREN | VALUE) ) {
-        my $msg = "Incomplete query, last element ("
-            . _BitmaskToString($last)
-            . ") is not CLOSE_PAREN or VALUE in '$string'";
+        my $msg = $loc->("Incomplete query, last element ([_1]) is not close paren or value in '[_2]'",
+                         _BitmaskToString($last),
+                         $string);
         return $cb->{'Error'}->( $msg ) if $cb->{'Error'};
         die $msg;
     }
 
     if( $depth ) {
-        my $msg = "Incomplete query, $depth paren(s) isn't closed in '$string'";
+        my $msg = $loc->("Incomplete query, [quant,_1,unclosed paren,unclosed parens] in '[_2]'", $depth, $string);
         return $cb->{'Error'}->( $msg ) if $cb->{'Error'};
         die $msg;
     }
@@ -215,88 +212,6 @@ sub _BitmaskToString {
     return join ' or ', @res;
 }
 
-sub PossibleCustomFields {
-    my %args = (Query => undef, CurrentUser => undef, @_);
-
-    my $cfs = RT::CustomFields->new( $args{'CurrentUser'} );
-    my $ocf_alias = $cfs->_OCFAlias;
-    $cfs->LimitToLookupType( 'RT::Queue-RT::Ticket' );
-
-    my $tree;
-    if ( HAS_BOOLEAN_PARSER ) {
-        $tree = Parse::BooleanLogic->filter(
-            RT::SQL::ParseToArray( $args{'Query'} ),
-            sub { $_[0]->{'key'} =~ /^Queue(?:\z|\.)/ },
-        );
-    }
-    if ( $tree && @$tree ) {
-        my $clause = 'QUEUES';
-        my $queue_alias = $cfs->Join(
-            TYPE   => 'LEFT',
-            ALIAS1 => $ocf_alias,
-            FIELD1 => 'ObjectId',
-            TABLE2 => 'Queues',
-            FIELD2 => 'id',
-        );
-        $cfs->_OpenParen($clause);
-        $cfs->Limit(
-            SUBCLAUSE       => $clause,
-            ENTRYAGGREGATOR => 'AND',
-            ALIAS           => $ocf_alias,
-            FIELD           => 'ObjectId',
-            VALUE           => 0,
-        );
-        $cfs->_OpenParen($clause);
-
-        my $ea = 'OR';
-        Parse::BooleanLogic->walk(
-            $tree,
-            {
-                open_paren  => sub { $cfs->_OpenParen($clause) },
-                close_paren => sub { $cfs->_CloseParen($clause) },
-                operator    => sub { $ea = $_[0] },
-                operand     => sub {
-                    my ($key, $op, $value) = @{$_[0]}{'key', 'op', 'value'};
-                    my (undef, @sub) = split /\./, $key;
-                    push @sub, $value =~ /\D/? 'Name' : 'id'
-                        unless @sub;
-                    
-                    die "Couldn't handle ". join('.', 'Queue', @sub) if @sub > 1;
-                    $cfs->Limit(
-                        SUBCLAUSE       => $clause,
-                        ENTRYAGGREGATOR => $ea,
-                        ALIAS           => $queue_alias,
-                        FIELD           => $sub[0],
-                        OPERATOR        => $op,
-                        VALUE           => $value,
-                    );
-                },
-            }
-        );
-
-        $cfs->_CloseParen($clause);
-        $cfs->_CloseParen($clause);
-    } else {
-        $cfs->Limit(
-            ENTRYAGGREGATOR => 'AND',
-            ALIAS           => $ocf_alias,
-            FIELD           => 'ObjectId',
-            OPERATOR        => 'IS NOT',
-            VALUE           => 'NULL',
-        );
-    }
-    return $cfs;
-}
-
-
-eval "require RT::SQL_Vendor";
-if ($@ && $@ !~ qr{^Can't locate RT/SQL_Vendor.pm}) {
-    die $@;
-};
-
-eval "require RT::SQL_Local";
-if ($@ && $@ !~ qr{^Can't locate RT/SQL_Local.pm}) {
-    die $@;
-};
+RT::Base->_ImportOverlays();
 
 1;