[Rt-commit] r15675 - rt/branches/3.999-DANGEROUS/lib/RT/Model

[ruz at bestpractical.com]

Author: ruz
Date: Sun Aug 31 19:46:21 2008
New Revision: 15675

Modified:
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm
   rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm

Log:
* drop object_id column

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Group.pm	Sun Aug 31 19:46:21 2008
@@ -404,9 +404,7 @@
     my $principal = RT::Model::Principal->new;
     my ( $principal_id, $msg ) = $principal->create(
         principal_type => 'Group',
-        object_id      => '0'
     );
-    $principal->__set( column => 'object_id', value => $principal_id );
 
     $self->SUPER::create(
         id          => $principal_id,

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/Principal.pm	Sun Aug 31 19:46:21 2008
@@ -60,11 +60,8 @@
 
 use Jifty::DBI::Schema;
 use Jifty::DBI::Record schema {
-
     column principal_type => type is 'text';
-    column object_id      => type is 'integer';
     column disabled       => type is 'integer', default is '0';
-
 };
 
 sub table {'Principals'}

Modified: rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm	(original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Model/User.pm	Sun Aug 31 19:46:21 2008
@@ -224,7 +224,6 @@
     my $principal_id = $principal->create(
         principal_type => 'User',
         disabled       => $args{'disabled'},
-        object_id      => '0'
     );
 
     # If we couldn't create a principal Id, get the fuck out.
@@ -235,7 +234,6 @@
         return ( 0, _('Could not create user') );
     }
 
-    $principal->__set( column => 'object_id', value => $principal_id );
     delete $args{'disabled'};
 
     $self->SUPER::create( id => $principal_id, %args );
@@ -438,7 +436,6 @@
     my $principal = RT::Model::Principal->new( current_user => RT::CurrentUser->new( _bootstrap => 1 ) );
     my ( $principal_id, $pmsg ) = $principal->create(
         principal_type => 'User',
-        object_id      => '0',
         disabled       => '0'
     );
 
@@ -448,7 +445,6 @@
         Jifty->log->fatal( "Couldn't create a Principal on new user create. Strange things are afoot at the circle K: $pmsg" );
         return ( 0, 'Could not create user' );
     }
-    my ( $val, $msg ) = $principal->__set( column => 'object_id', value => $principal_id );
 
     my ( $status, $user_msg ) = $self->SUPER::create(
         id => $principal_id,