[Rt-commit] r4579 - in rt/branches/3.7-EXPERIMENTAL: . sbin

[alexmv at bestpractical.com]

Author: alexmv
Date: Fri Feb 24 04:11:35 2006
New Revision: 4579

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
   rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay_SQL.pm
   rt/branches/3.7-EXPERIMENTAL/sbin/   (props changed)

Log:
 r9300 at zoq-fot-pik:  chmrr | 2006-02-24 04:10:40 -0500
  * Clean out records of internal joins so that ->FromSQL actually
 cleans out everything it needs to
  * Add svn:ignore for rt-clean-sessions


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay.pm	Fri Feb 24 04:11:35 2006
@@ -890,8 +890,8 @@
     # we cache joins chain per watcher type
     # if we limit by requestor then we shouldn't join requestors again
     # for sort or limit on other requestors
-    if ( $self->{'_watcher_join_users_alias'}{ $type || 'any' } ) {
-        return $self->{'_watcher_join_users_alias'}{ $type || 'any' };
+    if ( $self->{'_sql_watcher_join_users_alias'}{ $type || 'any' } ) {
+        return $self->{'_sql_watcher_join_users_alias'}{ $type || 'any' };
     }
 
 # we always have watcher groups for ticket
@@ -952,7 +952,7 @@
         TABLE2 => 'Users',
         FIELD2 => 'id'
     );
-    return $self->{'_watcher_join_users_alias'}{ $type || 'any' } = $users;
+    return $self->{'_sql_watcher_join_users_alias'}{ $type || 'any' } = $users;
 }
 
 =head2 _WatcherMembershipLimit

Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay_SQL.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay_SQL.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/Tickets_Overlay_SQL.pm	Fri Feb 24 04:11:35 2006
@@ -63,24 +63,14 @@
 sub _InitSQL {
   my $self = shift;
 
-  # How many of these do we actually still use?
-
-  # Private Member Variales (which should get cleaned)
-  $self->{'_sql_linksc'}        = 0;
-  $self->{'_sql_watchersc'}     = 0;
-  $self->{'_sql_keywordsc'}     = 0;
-  $self->{'_sql_subclause'}     = "a";
-  $self->{'_sql_first'}         = 0;
-  $self->{'_sql_opstack'}       = [''];
-  $self->{'_sql_linkalias'}    = undef;
+  # Private Member Variables (which should get cleaned)
   $self->{'_sql_transalias'}    = undef;
   $self->{'_sql_trattachalias'} = undef;
+  $self->{'_sql_cf_alias'}  = undef;
   $self->{'_sql_object_cf_alias'}  = undef;
-  $self->{'_sql_depth'}         = 0;
-  $self->{'_sql_localdepth'}    = 0;
+  $self->{'_sql_watcher_join_users_alias'} = undef;
   $self->{'_sql_query'}         = '';
   $self->{'_sql_looking_at'}    = {};
-  $self->{'_sql_columns_to_display'} = [];
 }
 
 sub _SQLLimit {
@@ -201,7 +191,6 @@
         }
         die "Unknown field '$key' in '$string'" unless $class;
 
-        $self->{_sql_localdepth} = 0;
 
         unless( $dispatch{ $class } ) {
             die "No dispatch method for class '$class'"