Merge branch 'b-3.6.1' of ../kivitendo-erp_20220811

[kivitendo-erp.git] / sql / Pg-upgrade2-auth / auth_schema_normalization_1.pl

diff --git a/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl b/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
index 78726cc679aef21874ae923df04840df9d7fb7a6..c39b97d503924f3a0bca7a01305a58496bc29d83 100644 (file)
--- a/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
+++ b/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
@@ -1,30 +1,23 @@
-#!/usr/bin/perl
 # @tag: auth_schema_normalization_1
 # @description: Auth-Datenbankschema Normalisierungen Teil 1
 # @depends:
+package SL::DBUpgrade2::Auth::auth_schema_normalization_1;
 
 use strict;
+use utf8;
 
-sub do_one {
-  my ($dbh, $query) = @_;
+use parent qw(SL::DBUpgrade2::Base);
 
-  if ($dbh->do($query)) {
-    $dbh->commit();
-  } else {
-    $dbh->rollback();
-  }
-}
-
-sub do_all {
-  my $dbh = $::auth->dbconnect();
+sub run {
+  my ($self) = @_;
 
   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);|);
 
-  do_one($dbh, $_) for @queries;
-}
+  $self->db_query($_, may_fail => 1) for @queries;
 
-do_all();
+  return 1;
+}
 
 1;