[Rt-commit] rt branch, 4.0/search-tickets-by-queue, created. rt-4.0.6-267-gefe8bc7

[Ruslan Zakirov]

The branch, 4.0/search-tickets-by-queue has been created
        at  efe8bc7b153f7c29083405977444cffb9aef49ca (commit)

- Log -----------------------------------------------------------------
commit db66946956d94d6229f79be1808e7f1815613ca2
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Aug 16 20:37:58 2012 +0400

    failing tests for "Queue != 'Missing'" searches

diff --git a/t/ticket/search_by_queue.t b/t/ticket/search_by_queue.t
new file mode 100644
index 0000000..e8fd5de
--- /dev/null
+++ b/t/ticket/search_by_queue.t
@@ -0,0 +1,62 @@
+#!/usr/bin/perl -w
+
+use strict;
+use warnings;
+
+use RT::Test nodata => 1, tests => 34;
+use RT::Ticket;
+
+my $qa = RT::Test->load_or_create_queue( Name => 'Queue A' );
+ok $qa && $qa->id, 'loaded or created queue';
+
+my $qb = RT::Test->load_or_create_queue( Name => 'Queue B' );
+ok $qb && $qb->id, 'loaded or created queue';
+
+my @tickets = RT::Test->create_tickets(
+    {},
+    { Queue => $qa->id, Subject => 'a1', },
+    { Queue => $qa->id, Subject => 'a2', },
+    { Queue => $qb->id, Subject => 'b1', },
+    { Queue => $qb->id, Subject => 'b2', },
+);
+
+run_tests( \@tickets,
+    'Queue = "Queue A"' => { a1 => 1, a2 => 1, b1 => 0, b2 => 0 },
+    'Queue = '. $qa->id => { a1 => 1, a2 => 1, b1 => 0, b2 => 0 },
+    'Queue != "Queue A"' => { a1 => 0, a2 => 0, b1 => 1, b2 => 1 },
+    'Queue != '. $qa->id => { a1 => 0, a2 => 0, b1 => 1, b2 => 1 },
+
+    'Queue = "Queue B"' => { a1 => 0, a2 => 0, b1 => 1, b2 => 1 },
+    'Queue = '. $qb->id => { a1 => 0, a2 => 0, b1 => 1, b2 => 1 },
+    'Queue != "Queue B"' => { a1 => 1, a2 => 1, b1 => 0, b2 => 0 },
+    'Queue != '. $qb->id => { a1 => 1, a2 => 1, b1 => 0, b2 => 0 },
+
+    'Queue = "Bad Queue"' => { a1 => 0, a2 => 0, b1 => 0, b2 => 0 },
+    'Queue != "Bad Queue"' => { a1 => 1, a2 => 1, b1 => 1, b2 => 1 },
+);
+
+sub run_tests {
+    my @tickets = @{ shift() };
+    my %test = @_;
+    my $query_prefix = join ' OR ', map 'id = '. $_->id, @tickets;
+    foreach my $key ( sort keys %test ) {
+        my $tix = RT::Tickets->new(RT->SystemUser);
+        $tix->FromSQL( "( $query_prefix ) AND ( $key )" );
+
+        my $error = 0;
+
+        my $count = 0;
+        $count++ foreach grep $_, values %{ $test{$key} };
+        is($tix->Count, $count, "found correct number of ticket(s) by '$key'") or $error = 1;
+
+        my $good_tickets = 1;
+        while ( my $ticket = $tix->Next ) {
+            next if $test{$key}->{ $ticket->Subject };
+            diag $ticket->Subject ." ticket has been found when it's not expected";
+            $good_tickets = 0;
+        }
+        ok( $good_tickets, "all tickets are good with '$key'" ) or $error = 1;
+
+        diag "Wrong SQL query for '$key':". $tix->BuildSelectQuery if $error;
+    }
+}

commit efe8bc7b153f7c29083405977444cffb9aef49ca
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date:   Thu Aug 16 20:40:08 2012 +0400

    use 0 instead of NULL in object based _EnumLimit
    
    ->Id call returns undef for not existing object and resulting
    SQL can be 'main.column = NULL' or 'main.column != NULL'. Both
    variants return empty set (at least on mysql) what is wrong
    for negative condition.
    
    The most user visible example: 'Queue != "Queue That Does Not Exist"'

diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 6dd23e0..ee52307 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -374,7 +374,7 @@ sub _EnumLimit {
         my $class = "RT::" . $meta->[1];
         my $o     = $class->new( $sb->CurrentUser );
         $o->Load($value);
-        $value = $o->Id;
+        $value = $o->Id || 0;
     }
     $sb->_SQLLimit(
         FIELD    => $field,

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