[Rt-commit] rt branch, 4.2/query-like-search, updated. rt-4.2.9-4-g9874337

[Dave Goehrig]

The branch, 4.2/query-like-search has been updated
       via  98743370ca4d82f5f2ce3a29573d5d2c55503e24 (commit)
      from  205a1d97730a638d8489735bffe1737715f85f41 (commit)

Summary of changes:
 lib/RT/Test.pm           | 1 +
 lib/RT/Tickets.pm        | 2 +-
 t/ticket/sort-by-queue.t | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 98743370ca4d82f5f2ce3a29573d5d2c55503e24
Author: root <dave at bestpractical.com>
Date:   Wed Dec 21 16:32:46 2016 +0000

    Fixing queue ordering

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index e4950fd..388a9ef 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -389,6 +389,7 @@ Set( \$LogToSTDERR , "warning");
 Set( \$LogToFile, 'debug' );
 Set( \$LogDir, q{$tmp{'directory'}} );
 Set( \$LogToFileNamed, 'rt.debug.log' );
+Set( \$StatementLog, 1 );
 END
 }
 
diff --git a/lib/RT/Tickets.pm b/lib/RT/Tickets.pm
index 4fd1a8b..e5d9456 100644
--- a/lib/RT/Tickets.pm
+++ b/lib/RT/Tickets.pm
@@ -1300,7 +1300,7 @@ sub OrderByCols {
                 next;
             }
 
-            if ( $meta->[0] eq 'ENUM' && ($meta->[1]||'') eq 'Queue' ) {
+            if ( $meta->[0] eq 'QUEUE' ) {
                 my $alias = $self->Join(
                     TYPE   => 'LEFT',
                     ALIAS1 => 'main',
diff --git a/t/ticket/sort-by-queue.t b/t/ticket/sort-by-queue.t
index f54ccf7..648e944 100644
--- a/t/ticket/sort-by-queue.t
+++ b/t/ticket/sort-by-queue.t
@@ -40,6 +40,7 @@ sub run_tests {
             my $error = 0;
             my $tix = RT::Tickets->new( RT->SystemUser );
             $tix->FromSQL( $query );
+	    print STDERR $test->{'Order'} . "\n";
             $tix->OrderBy( FIELD => $test->{'Order'}, ORDER => $order );
 
             ok($tix->Count, "found ticket(s)")
@@ -49,8 +50,10 @@ sub run_tests {
             while ( my $t = $tix->Next ) {
                 my $tmp;
                 if ( $order eq 'ASC' ) {
+		    print STDERR  "ASC $last vs " . $t->Subject . "\n";
                     $tmp = ((split( /,/, $last))[0] cmp (split( /,/, $t->Subject))[0]);
                 } else {
+		    print STDERR  "DESC $last vs " . $t->Subject . "\n";
                     $tmp = -((split( /,/, $last))[-1] cmp (split( /,/, $t->Subject))[-1]);
                 }
                 if ( $tmp > 0 ) {
@@ -84,3 +87,4 @@ sub run_tests {
 run_tests();
 
 @tickets = ();
+

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