X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=sql%2FPg-upgrade2-auth%2Fauth_schema_normalization_1.pl;h=c39b97d503924f3a0bca7a01305a58496bc29d83;hb=a258467b6ffbaa2bc7be78e5c564ed07c9aa5341;hp=79df5f8018e6854d3e6f20bf12a4e988fed01f4e;hpb=347f2cff58f8d798bb0fe52495fb09b4e08db036;p=kivitendo-erp.git

diff --git a/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl b/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
index 79df5f801..c39b97d50 100644
--- a/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
+++ b/sql/Pg-upgrade2-auth/auth_schema_normalization_1.pl
@@ -1,33 +1,23 @@
 # @tag: auth_schema_normalization_1
 # @description: Auth-Datenbankschema Normalisierungen Teil 1
 # @depends:
-package SL::DBUpgrade2::auth_schema_normalization_1;
+package SL::DBUpgrade2::Auth::auth_schema_normalization_1;
 
 use strict;
 use utf8;
 
 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) = @_;
 
-  $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);|);
 
-  $self->do_one($_) for @queries;
+  $self->db_query($_, may_fail => 1) for @queries;
+
+  return 1;
 }
 
 1;