4 files changed, 42 insertions, 25 deletions
diff --git a/rt/etc/upgrade/3.9.7/content b/rt/etc/upgrade/3.9.7/content
index 504ddf18f..9b48b4b51 100644
--- a/rt/etc/upgrade/3.9.7/content
+++ b/rt/etc/upgrade/3.9.7/content
@@ -1,24 +1,27 @@
+use strict;
+use warnings;
+
 my $move_attributes = sub {
     my ($table, $type, $column) = @_;
     my $query = "UPDATE $table SET $column = (SELECT Content FROM Attributes WHERE"
         ." Name = ? AND ObjectType = ? AND $table.id = Attributes.ObjectId)";
 
-    my $res = $RT::Handle->SimpleQuery( $query, $column, $type );
+    my $res = RT->DatabaseHandle->SimpleQuery( $query, $column, $type );
     unless ( $res ) {
-        $RT::Logger->error("Failed to move $column on $type from Attributes into $table table");
+        RT->Logger->error("Failed to move $column on $type from Attributes into $table table");
         return;
     }
 
     $query = 'DELETE FROM Attributes WHERE Name = ? AND ObjectType = ?';
-    $res = $RT::Handle->SimpleQuery( $query, $column, $type );
+    $res = RT->DatabaseHandle->SimpleQuery( $query, $column, $type );
     unless ( $res ) {
-        $RT::Logger->error("Failed to delete $column on $type from Attributes");
+        RT->Logger->error("Failed to delete $column on $type from Attributes");
         return;
     }
     return 1;
 };
 
-@Initial = (
+our @Initial = (
     sub {
         return $move_attributes->( 'Users', 'RT::User', 'AuthToken');
     },
@@ -26,7 +29,7 @@ my $move_attributes = sub {
         return $move_attributes->( 'CustomFields', 'RT::CustomField', 'RenderType');
     },
     sub {
-        my $cfs = RT::CustomFields->new($RT::SystemUser);
+        my $cfs = RT::CustomFields->new( RT->SystemUser );
         $cfs->UnLimit;
         $cfs->FindAllRows;
         while ( my $cf = $cfs->Next ) {
@@ -39,10 +42,10 @@ my $move_attributes = sub {
             next unless $attr;
             $cf->SetBasedOn($attr->Content);
         }
-        $query = 'DELETE FROM Attributes WHERE Name = ? AND ObjectType = ?';
-        $res = $RT::Handle->SimpleQuery( $query, 'BasedOn', 'RT::CustomField' );
+        my $query = 'DELETE FROM Attributes WHERE Name = ? AND ObjectType = ?';
+        my $res = RT->DatabaseHandle->SimpleQuery( $query, 'BasedOn', 'RT::CustomField' );
         unless ( $res ) {
-            $RT::Logger->error("Failed to delete BasedOn CustomFields from Attributes");
+            RT->Logger->error("Failed to delete BasedOn CustomFields from Attributes");
             return;
         }
         return 1;
@@ -52,9 +55,9 @@ my $move_attributes = sub {
             or return;
 
         my $query = "UPDATE CustomFields SET ValuesClass = NULL WHERE ValuesClass = ?";
-        my $res = $RT::Handle->SimpleQuery( $query, 'RT::CustomFieldValues' );
+        my $res = RT->DatabaseHandle->SimpleQuery( $query, 'RT::CustomFieldValues' );
         unless ( $res ) {
-            $RT::Logger->error("Failed to replace default with NULLs");
+            RT->Logger->error("Failed to replace default with NULLs");
             return;
         }
         return 1;
@@ -68,13 +71,13 @@ my $move_attributes = sub {
             my $queue = RT::Queue->new( RT->SystemUser );
             $queue->Load( $qid );
             unless ( $queue->id ) {
-                $RT::Logger->warning("Couldn't load queue #$qid. Skipping...");
+                RT->Logger->warning("Couldn't load queue #$qid. Skipping...");
                 next;
             }
 
             my ($status, $msg) = $queue->SetSubjectTag($tag);
             unless ( $status ) {
-                $RT::Logger->error("Couldn't set subject tag for queue #$qid: $msg");
+                RT->Logger->error("Couldn't set subject tag for queue #$qid: $msg");
                 next;
             }
         }
diff --git a/rt/etc/upgrade/3.9.7/schema.Oracle b/rt/etc/upgrade/3.9.7/schema.Oracle
index 3c75c917d..70b4a12f9 100644
--- a/rt/etc/upgrade/3.9.7/schema.Oracle
+++ b/rt/etc/upgrade/3.9.7/schema.Oracle
@@ -1,6 +1,12 @@
 ALTER TABLE Users ADD AuthToken VARCHAR2(16) NULL;
-ALTER TABLE CustomFields ADD BasedOn NUMBER(11,0) NULL;
-ALTER TABLE CustomFields ADD RenderType VARCHAR2(64) NULL;
-ALTER TABLE CustomFields ADD ValuesClass VARCHAR2(64) NULL;
-ALTER TABLE Queues ADD SubjectTag VARCHAR2(120) NULL;
-ALTER TABLE Queues ADD Lifecycle VARCHAR2(32) NULL;
+
+ALTER TABLE CustomFields ADD(
+    BasedOn NUMBER(11,0) NULL,
+    RenderType VARCHAR2(64) NULL,
+    ValuesClass VARCHAR2(64) NULL
+);
+
+ALTER TABLE Queues ADD(
+    SubjectTag VARCHAR2(120) NULL,
+    Lifecycle VARCHAR2(32) NULL
+);
diff --git a/rt/etc/upgrade/3.9.7/schema.Pg b/rt/etc/upgrade/3.9.7/schema.Pg
index 1704fa673..d6fe7cca6 100644
--- a/rt/etc/upgrade/3.9.7/schema.Pg
+++ b/rt/etc/upgrade/3.9.7/schema.Pg
@@ -1,6 +1,10 @@
 ALTER TABLE Users ADD COLUMN AuthToken VARCHAR(16) NULL;
-ALTER TABLE CustomFields ADD COLUMN BasedOn INTEGER NULL;
-ALTER TABLE CustomFields ADD COLUMN RenderType VARCHAR(64) NULL;
-ALTER TABLE CustomFields ADD COLUMN ValuesClass VARCHAR(64) NULL;
-ALTER TABLE Queues ADD COLUMN SubjectTag VARCHAR(120) NULL;
-ALTER TABLE Queues ADD COLUMN Lifecycle VARCHAR(32) NULL;
+
+ALTER TABLE CustomFields
+    ADD COLUMN BasedOn INTEGER NULL,
+    ADD COLUMN RenderType VARCHAR(64) NULL,
+    ADD COLUMN ValuesClass VARCHAR(64) NULL;
+
+ALTER TABLE Queues
+    ADD COLUMN SubjectTag VARCHAR(120) NULL,
+    ADD COLUMN Lifecycle VARCHAR(32) NULL;
diff --git a/rt/etc/upgrade/3.9.7/schema.mysql b/rt/etc/upgrade/3.9.7/schema.mysql
index 4cbed6cc7..0e61d6422 100644
--- a/rt/etc/upgrade/3.9.7/schema.mysql
+++ b/rt/etc/upgrade/3.9.7/schema.mysql
@@ -1,6 +1,10 @@
 ALTER TABLE Users ADD COLUMN AuthToken VARCHAR(16) CHARACTER SET ascii NULL;
-ALTER TABLE CustomFields ADD COLUMN BasedOn INTEGER NULL,
+
+ALTER TABLE CustomFields
+    ADD COLUMN BasedOn INTEGER NULL,
     ADD COLUMN RenderType VARCHAR(64) NULL,
     ADD COLUMN ValuesClass VARCHAR(64) CHARACTER SET ascii NULL;
-ALTER TABLE Queues ADD COLUMN SubjectTag VARCHAR(120) NULL,
+
+ALTER TABLE Queues
+    ADD COLUMN SubjectTag VARCHAR(120) NULL,
     ADD COLUMN Lifecycle VARCHAR(32) NULL;