[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.7-950-gf78d5fd

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  f78d5fd99d12ef1a646b4efa4b277ed58a24e798 (commit)
      from  ee636e0905852d2f888ed165cfbe0fa358f92bfd (commit)

Summary of changes:
 etc/upgrade/3.9.1/content |    9 +++++++++
 etc/upgrade/3.9.7/content |   13 +++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit f78d5fd99d12ef1a646b4efa4b277ed58a24e798
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Mon Dec 20 13:03:46 2010 -0500

    Fix a bug in upgrades that caused the new columns on ACL to make the
    3.9.1 upgrades explode since the schema hadn't yet been updated.

diff --git a/etc/upgrade/3.9.1/content b/etc/upgrade/3.9.1/content
index c7bc535..bed3e74 100644
--- a/etc/upgrade/3.9.1/content
+++ b/etc/upgrade/3.9.1/content
@@ -1,6 +1,15 @@
 @Initial = (
     sub {
         use strict;
+        use RT::ACE;
+        {
+            package RT::ACE;
+            my $throwaway = RT::ACE->new(RT->SystemUser);
+            delete $TABLE_ATTR{'RT::ACE'}->{LastUpdated};
+            delete $TABLE_ATTR{'RT::ACE'}->{LastUpdatedBy};
+        }
+
+
         $RT::Logger->debug('Make sure templates all have known types');
 
         my $templates = RT::Templates->new(RT->SystemUser);
diff --git a/etc/upgrade/3.9.7/content b/etc/upgrade/3.9.7/content
index 9dfb114..7ca2744 100644
--- a/etc/upgrade/3.9.7/content
+++ b/etc/upgrade/3.9.7/content
@@ -20,6 +20,19 @@ my $move_attributes = sub {
 
 @Initial = (
     sub {
+        use RT::ACE;
+        {
+            # if we're coming from 3.8, we've gone and disabled attributes
+            # on the ACL table in 3.9.1 or so. Regenerating them is important
+            package RT::ACE;
+            my $throwaway = RT::ACE->new(RT->SystemUser);
+            delete $TABLE_ATTR{'RT::ACE'};
+            $throwaway = RT::ACE->new(RT->SystemUser);
+        }
+
+
+    },
+    sub {
         return $move_attributes->( 'Users', 'RT::User', 'AuthToken');
     },
     sub {

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