[Rt-commit] rt branch, 4.0/oracle-testing, updated. rt-4.0.7-61-g382fa92

[Thomas Sibley]

The branch, 4.0/oracle-testing has been updated
       via  382fa924aaf3666e823a1f36be95d36333e8cef6 (commit)
       via  370680c3b2802a9b894d590b3482a1f16c96bef9 (commit)
      from  959226ef2864c38bf7bb25e9b88a5fefed43a050 (commit)

Summary of changes:
 lib/RT/Tickets_SQL.pm  | 2 +-
 t/fts/indexed_oracle.t | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 370680c3b2802a9b894d590b3482a1f16c96bef9
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Apr 25 16:42:31 2013 -0700

    Configure an IndexName for Oracle FTS tests
    
    An IndexName became required with 8aad388 despite rt-fulltext-indexer's
    fallback of "rt_fts_index", which is the default name created by
    rt-setup-fulltext-index.  The test file failed because the indexer
    didn't update the index due to FTS being turned off by the config check.

diff --git a/t/fts/indexed_oracle.t b/t/fts/indexed_oracle.t
index 5d71712..6129ef9 100644
--- a/t/fts/indexed_oracle.t
+++ b/t/fts/indexed_oracle.t
@@ -7,7 +7,7 @@ use RT::Test tests => undef;
 plan skip_all => 'Not Oracle' unless RT->Config->Get('DatabaseType') eq 'Oracle';
 plan tests => 13;
 
-RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1 );
+RT->Config->Set( FullTextSearch => Enable => 1, Indexed => 1, IndexName => 'rt_fts_index' );
 
 setup_indexing();
 

commit 382fa924aaf3666e823a1f36be95d36333e8cef6
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Thu Apr 25 16:47:14 2013 -0700

    Avoid a warning; FIELD may not be passed to _SQLLimit
    
    This warning crops up when an Oracle FTS query is run.  The _SQLLimit
    provides a FUNCTION but no FIELD.

diff --git a/lib/RT/Tickets_SQL.pm b/lib/RT/Tickets_SQL.pm
index ec1bb49..9cea9ea 100644
--- a/lib/RT/Tickets_SQL.pm
+++ b/lib/RT/Tickets_SQL.pm
@@ -77,7 +77,7 @@ sub _InitSQL {
 
 sub _SQLLimit {
   my $self = shift;
-    my %args = (@_);
+    my %args = (FIELD => '', @_);
     if ($args{'FIELD'} eq 'EffectiveId' &&
          (!$args{'ALIAS'} || $args{'ALIAS'} eq 'main' ) ) {
         $self->{'looking_at_effective_id'} = 1;

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