X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDBUpgrade2%2FBase.pm;h=34afeae54504abbb6dc1b319f7b626908cf27961;hb=fee5532a132c44dcfc1743393cba00c8e3397176;hp=6367911b9a8d610b183021d73565fab1801af1b0;hpb=0b5b835542cf5ff0ec074108ee7a62ecc00b1f87;p=kivitendo-erp.git diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm index 6367911b9..34afeae54 100644 --- a/SL/DBUpgrade2/Base.pm +++ b/SL/DBUpgrade2/Base.pm @@ -90,11 +90,9 @@ sub add_print_templates { croak "File '${src_dir}/$_' does not exist" unless -f "${src_dir}/$_"; } - my $template_dir = $::instance_conf->reload->get_templates; + return 1 unless my $template_dir = $::instance_conf->reload->get_templates; $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dir $template_dir"); - return 1 if !$template_dir; - foreach my $src_file (@files) { my $dest_file = $template_dir . '/' . $src_file; @@ -132,7 +130,7 @@ sub drop_constraints { AND (table_name = ?) SQL - $self->db_query(qq|ALTER TABLE auth."$params{table}" DROP CONSTRAINT "${_}"|) for map { $_->[0] } @{ $constraints }; + $self->db_query(qq|ALTER TABLE $params{schema}."$params{table}" DROP CONSTRAINT "${_}"|) for map { $_->[0] } @{ $constraints }; } 1;