Perl-DB-Upgradescripte refactoring: Bugfix #1

diff --git a/SL/DBUpgrade2.pm b/SL/DBUpgrade2.pm
index 86ae9fdee41ed75548aa7f1ace83ff59b6dcb4e4..d98627c563362906f280ef6958766d0bc16815ad 100644 (file)
--- a/SL/DBUpgrade2.pm
+++ b/SL/DBUpgrade2.pm
@@ -250,13 +250,11 @@ sub process_perl_script {
     file_name => $filename,
     tag       => $version_or_control->{tag},
     dbh       => $dbh,
     file_name => $filename,
     tag       => $version_or_control->{tag},
     dbh       => $dbh,

-    locale    => $::locale,

     myconfig  => \%dbup_myconfig,
   );
 
     myconfig  => \%dbup_myconfig,
   );
 

-  if (1 != $result) {
+  if (1 != ($result // 1)) {

     $dbh->rollback();
     $dbh->rollback();

-    $dbh->disconnect();

   }
 
   if (!defined($result)) {
   }
 
   if (!defined($result)) {

diff --git a/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl b/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
index 79df5f8018e6854d3e6f20bf12a4e988fed01f4e..3cb411b3b681efca92edb85360716c97445367c1 100644 (file)
--- a/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
+++ b/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
@@ -8,26 +8,16 @@ use utf8;
 
 use parent qw(SL::DBUpgrade2::Base);
 
 
 use parent qw(SL::DBUpgrade2::Base);
 

-sub do_one {
-  my ($self, $query) = @_;
-
-  if ($self->dbh->do($query)) {
-    $self->dbh->commit();
-  } else {
-    $self->dbh->rollback();
-  }
-}
-

 sub run {
   my ($self) = @_;
 
 sub run {
   my ($self) = @_;
 

-  $self->dbh($::auth->dbconnect);
-

   my @queries = ( qq|ALTER TABLE auth.group_rights ADD PRIMARY KEY (group_id, "right");|,
                   qq|ALTER TABLE auth.user_config  ADD PRIMARY KEY (user_id,  cfg_key);|,
                   qq|ALTER TABLE auth.user_group   ADD PRIMARY KEY (user_id,  group_id);|);
 
   my @queries = ( qq|ALTER TABLE auth.group_rights ADD PRIMARY KEY (group_id, "right");|,
                   qq|ALTER TABLE auth.user_config  ADD PRIMARY KEY (user_id,  cfg_key);|,
                   qq|ALTER TABLE auth.user_group   ADD PRIMARY KEY (user_id,  group_id);|);
 

-  $self->do_one($_) for @queries;
+  $self->db_query($_, 1) for @queries;
+
+  return 1;

 }
 
 1;
 }
 
 1;