[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.7-290-g9ec507e

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  9ec507e62ecea047bdbc9792f3274c248a2a2626 (commit)
       via  ce37fc8ae3360140589b83c7274ae356ea5c6eb3 (commit)
      from  1a79e58bad3b7cc4a91e16b7554c9474e18648dc (commit)

Summary of changes:
 lib/RT/I18N.pm            |    6 ++++--
 lib/RT/Test.pm            |    1 +
 lib/RT/Tickets_Overlay.pm |   29 ++++++++++++-----------------
 3 files changed, 17 insertions(+), 19 deletions(-)

- Log -----------------------------------------------------------------
commit ce37fc8ae3360140589b83c7274ae356ea5c6eb3
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Mar 26 17:57:41 2010 +0300

    properly apply entry aggregator on Content searches
    
    only when DontSearchFileAttachments option is
    enabled

diff --git a/lib/RT/Tickets_Overlay.pm b/lib/RT/Tickets_Overlay.pm
index 486d0cd..e8d350d 100755
--- a/lib/RT/Tickets_Overlay.pm
+++ b/lib/RT/Tickets_Overlay.pm
@@ -723,7 +723,7 @@ sub _TransLimit {
     # them all into the same subclause when you have (A op B op C) - the
     # way they get parsed in the tree they're in different subclauses.
 
-    my ( $self, $field, $op, $value, @rest ) = @_;
+    my ( $self, $field, $op, $value, %rest ) = @_;
 
     unless ( $self->{_sql_transalias} ) {
         $self->{_sql_transalias} = $self->Join(
@@ -749,41 +749,36 @@ sub _TransLimit {
         );
     }
 
-    $self->_OpenParen;
-
     #Search for the right field
     if ( $field eq 'Content' and RT->Config->Get('DontSearchFileAttachments') ) {
-       $self->_SQLLimit(
-			ALIAS         => $self->{_sql_trattachalias},
-			FIELD         => 'Filename',
-			OPERATOR      => 'IS',
-			VALUE         => 'NULL',
-			SUBCLAUSE     => 'contentquery',
-			ENTRYAGGREGATOR => 'AND',
-		       );
-       $self->_SQLLimit(
+        $self->_OpenParen;
+        $self->_SQLLimit(
+			%rest,
 			ALIAS         => $self->{_sql_trattachalias},
 			FIELD         => $field,
 			OPERATOR      => $op,
 			VALUE         => $value,
 			CASESENSITIVE => 0,
-			@rest,
+		       );
+        $self->_SQLLimit(
 			ENTRYAGGREGATOR => 'AND',
-			SUBCLAUSE     => 'contentquery',
+			ALIAS           => $self->{_sql_trattachalias},
+			FIELD           => 'Filename',
+			OPERATOR        => 'IS',
+			VALUE           => 'NULL',
 		       );
+        $self->_CloseParen;
     } else {
         $self->_SQLLimit(
+			%rest,
 			ALIAS         => $self->{_sql_trattachalias},
 			FIELD         => $field,
 			OPERATOR      => $op,
 			VALUE         => $value,
 			CASESENSITIVE => 0,
-			ENTRYAGGREGATOR => 'AND',
-			@rest
         );
     }
 
-    $self->_CloseParen;
 
 }
 

commit 9ec507e62ecea047bdbc9792f3274c248a2a2626
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Fri Mar 26 21:06:50 2010 +0300

    untie may fail

diff --git a/lib/RT/I18N.pm b/lib/RT/I18N.pm
index 2206b51..7f56886 100755
--- a/lib/RT/I18N.pm
+++ b/lib/RT/I18N.pm
@@ -139,8 +139,10 @@ sub LoadLexicons {
         my $lex = *{ ${'RT::I18N::'. $k }{'Lexicon'} }{HASH};
         # run fetch to force load
         my $tmp = $lex->{'foo'};
-        # untie that has to lower fetch impact
-        untie %$lex if tied %$lex;
+        # XXX: untie may fail with "untie attempted
+        # while 1 inner references still exist"
+        # TODO: untie that has to lower fetch impact
+        # untie %$lex if tied %$lex;
     }
 }
 
diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index a5ca328..b8d1683 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -225,6 +225,7 @@ Set( \$WebPort , $port);
 Set( \$WebBaseURL , "http://localhost:\$WebPort");
 Set( \$LogToSyslog , undef);
 Set( \$LogToScreen , "warning");
+Set( \$RTAddressRegexp , qr/^bad_re_that_doesnt_match\$/);
 Set( \$MailCommand, 'testfile');
 };
     if ( $ENV{'RT_TEST_DB_SID'} ) { # oracle case

-----------------------------------------------------------------------