[Rt-commit] rt branch, 4.4/drop-unused-columns, updated. rt-4.2.0-38-ge43f3de

[Shawn Moore]

The branch, 4.4/drop-unused-columns has been updated
       via  e43f3de0d28506334d8ce35a660b8dc85b3e73e1 (commit)
      from  614d3314616e4c939ef5df108187943bbd0a77e0 (commit)

Summary of changes:
 sbin/rt-setup-database.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit e43f3de0d28506334d8ce35a660b8dc85b3e73e1
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 15 22:31:27 2015 +0000

    Don't disconnect after begin step
    
        This isn't my ideal fix. In the interests of "similar things should
        act similarly", having action_insert explicitly disconnect from
        the database when the other commands do not is unfortunate. The
        disconnect code should probably move to be part of action_upgrade.

diff --git a/sbin/rt-setup-database.in b/sbin/rt-setup-database.in
index 995f590..2bc7167 100644
--- a/sbin/rt-setup-database.in
+++ b/sbin/rt-setup-database.in
@@ -414,8 +414,10 @@ sub action_insert {
 
     RT->System->AddUpgradeHistory($package => \%upgrade_data);
 
-    my $db_type = RT->Config->Get('DatabaseType');
-    $RT::Handle->Disconnect() unless $db_type eq 'SQLite';
+    if (!$args{begin_step}) {
+        my $db_type = RT->Config->Get('DatabaseType');
+        $RT::Handle->Disconnect() unless $db_type eq 'SQLite';
+    }
 
     return @ret;
 }

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