[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-873-g64b18c0

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  64b18c0f0478cbcdf2f07d00394fbe2b77fbf818 (commit)
       via  fc6d255d8bf69f37c81dc5620ad0064c336827fe (commit)
      from  b7fa9126e802e6a5544bfc446d49f0fbb6f5ccb3 (commit)

Summary of changes:
 lib/RT/Tickets_Overlay.pm |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit fc6d255d8bf69f37c81dc5620ad0064c336827fe
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Sun Sep 26 11:42:13 2010 -0400

    put the oracle check at the beginning of an oracle special-case

diff --git a/lib/RT/Tickets_Overlay.pm b/lib/RT/Tickets_Overlay.pm
index a6981c1..05b4592 100755
--- a/lib/RT/Tickets_Overlay.pm
+++ b/lib/RT/Tickets_Overlay.pm
@@ -576,9 +576,9 @@ sub _StringLimit {
     # FIXME:
     # Valid Operators:
     #  =, !=, LIKE, NOT LIKE
-    if ( (!defined $value || !length $value)
+    if ( RT->Config->Get('DatabaseType') eq 'Oracle'
+        && (!defined $value || !length $value)
         && lc($op) ne 'is' && lc($op) ne 'is not'
-        && RT->Config->Get('DatabaseType') eq 'Oracle'
     ) {
         my $negative = 1 if $op eq '!=' || $op =~ /^NOT\s/;
         $op = $negative? 'IS NOT': 'IS';

commit 64b18c0f0478cbcdf2f07d00394fbe2b77fbf818
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Sun Sep 26 11:42:30 2010 -0400

    remove a temporary variable and weird definition in a conditional that
    perlcritic bitched about

diff --git a/lib/RT/Tickets_Overlay.pm b/lib/RT/Tickets_Overlay.pm
index 05b4592..814f8aa 100755
--- a/lib/RT/Tickets_Overlay.pm
+++ b/lib/RT/Tickets_Overlay.pm
@@ -580,8 +580,11 @@ sub _StringLimit {
         && (!defined $value || !length $value)
         && lc($op) ne 'is' && lc($op) ne 'is not'
     ) {
-        my $negative = 1 if $op eq '!=' || $op =~ /^NOT\s/;
-        $op = $negative? 'IS NOT': 'IS';
+        if ($op eq '!=' || $op =~ /^NOT\s/i) {
+            $op = 'IS NOT';
+        } else {
+            $op = 'IS';
+        }
         $value = 'NULL';
     }
 

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