[Rt-commit] [svn] r1535 - in rt/branches/3.3-TESTING: . lib/RT

[jesse at pallas.eruditorum.org]

Author: jesse
Date: Tue Sep 21 02:03:26 2004
New Revision: 1535

Modified:
   rt/branches/3.3-TESTING/   (props changed)
   rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
Log:
 r10334 at tinbook:  jesse | 2004-09-21T06:03:40.050504Z
 RT-Ticket: 6105
 RT-Status: resolved
 RT-UpdateType: correspond
 
 Refactored some TicketSQL stuff to bound the right thing in our ticketsql subclause
 
 
 


Modified: rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.3-TESTING/lib/RT/Tickets_Overlay.pm	Tue Sep 21 02:03:26 2004
@@ -894,7 +894,7 @@
     $TicketCFs = $self->{_sql_object_cf_alias}{$cfid};
   }
     else {
-        $TicketCFs = $self->{_sql_object_cf_alias}{$cfid} = $self->_SQLJoin(
+        $TicketCFs = $self->{_sql_object_cf_alias}{$cfid} = $self->Join(
             TYPE   => 'left',
             ALIAS1 => 'main',
             FIELD1 => 'id',
@@ -902,7 +902,7 @@
             FIELD2 => 'ObjectId'
         );
 
-    $self->_SQLLimit(
+    $self->Limit(
         LEFTJOIN        => $TicketCFs,
         FIELD => 'ObjectType',
         VALUE => ref($self->NewItem), # we want a single item, not a collection
@@ -910,20 +910,20 @@
     );
 
     if ($cfid) {
-    $self->_SQLLimit(
+    $self->Limit(
         LEFTJOIN        => $TicketCFs,
         FIELD           => 'CustomField',
         VALUE           => $cfid,
         ENTRYAGGREGATOR => 'AND'
     );
     } else {
-    my $cfalias = $self->_SQLJoin(
+    my $cfalias = $self->Join(
         ALIAS1        => $TicketCFs,
         FIELD1           => 'CustomField',
         TABLE2          => 'CustomFields',
         FIELD2          => 'id'
     );
-    $self->_SQLLimit(
+    $self->Limit(
         LEFTJOIN        => $cfalias,
         FIELD           => 'Name',
         VALUE           => $field,
@@ -933,7 +933,7 @@
     }
     }
 
-    $self->_OpenParen;
+    $self->_OpenParen if ($null_columns_ok);
 
     $self->_SQLLimit(
         ALIAS      => $TicketCFs,
@@ -953,8 +953,7 @@
             ENTRYAGGREGATOR => 'OR',
         );
   }
-
-  $self->_CloseParen;
+    $self->_CloseParen if ($null_columns_ok);
 
 }