X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDBUpgrade2%2FBase.pm;h=024282f6534973e6d9b130c92a09274fcf491fce;hb=832dce93297e0577b2f7acf6be3612adca7334d9;hp=09e4e5fff31c7d41d79872b97f3a8604c060c405;hpb=9466e9e0f60af5142b7afbdea1e17b3313881201;p=kivitendo-erp.git
diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm
index 09e4e5fff..024282f65 100644
--- a/SL/DBUpgrade2/Base.pm
+++ b/SL/DBUpgrade2/Base.pm
@@ -5,11 +5,14 @@ use strict;
use parent qw(Rose::Object);
use Carp;
+use Encode;
use English qw(-no_match_vars);
use File::Basename ();
use File::Copy ();
use File::Path ();
use List::MoreUtils qw(uniq);
+use SL::DBUtils qw(selectfirst_hashref_query);
+use version;
use Rose::Object::MakeMethods::Generic (
scalar => [ qw(dbh myconfig) ],
@@ -37,18 +40,34 @@ sub execute_script {
sub db_error {
my ($self, $msg) = @_;
- die $::locale->text("Database update error:") . "
$msg
" . $DBI::errstr;
+ die $::locale->text("Database update error:") . "
$msg
" . $self->db_errstr('DBI');
}
sub db_query {
- my ($self, $query, $may_fail) = @_;
+ my ($self, $query, %params) = @_;
- return if $self->dbh->do($query);
+ my $dbh = $params{dbh} || $self->dbh;
- $self->db_error($query) unless $may_fail;
+ return if $dbh->do($query, undef, @{ $params{bind} || [] });
- $self->dbh->rollback;
- $self->dbh->begin_work;
+ $self->db_error($query) unless $params{may_fail};
+
+ $dbh->rollback;
+ $dbh->begin_work;
+}
+
+sub db_errstr {
+ my ($self, $handle) = @_;
+
+ # DBD::Pg before 2.16.1 doesn't set the UTF-8 flag for error
+ # messages even if the connection has UTF-8 enabled. Therefore we
+ # have to convert it to Perl's internal encoding ourselves. See
+ # https://rt.cpan.org/Public/Bug/Display.html?id=53854
+
+ my $error = $handle ? $handle->errstr : $self->dbh->errstr;
+
+ return $error if version->new("$DBD::Pg::VERSION")->numify >= version->new("2.16.1")->numify;
+ return Encode::decode('utf-8', $error);
}
sub check_coa {
@@ -79,35 +98,71 @@ sub add_print_templates {
croak "File '${src_dir}/$_' does not exist" unless -f "${src_dir}/$_";
}
- my %users = $::auth->read_all_users;
- my @template_dirs = uniq map { $_ = $_->{templates}; s:/+$::; $_ } values %users;
-
- $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dirs " . join(' ', @template_dirs));
+ # can't use Rose or InstanceConf here because defaults might not be fully upgraded yet.
+ my $defaults = selectfirst_hashref_query($::form, $::form->get_standard_dbh, "SELECT * FROM defaults");
+ return 1 unless my $template_dir = $defaults->{template};
+ $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dir $template_dir");
foreach my $src_file (@files) {
- foreach my $template_dir (@template_dirs) {
- my $dest_file = $template_dir . '/' . $src_file;
+ my $dest_file = $template_dir . '/' . $src_file;
- if (-f $dest_file) {
- $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: dest_file exists, skipping: ${dest_file}");
- next;
- }
+ if (-f $dest_file) {
+ $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: dest_file exists, skipping: ${dest_file}");
+ next;
+ }
- my $dest_dir = File::Basename::dirname($dest_file);
+ my $dest_dir = File::Basename::dirname($dest_file);
- if ($dest_dir && !-d $dest_dir) {
- File::Path::make_path($dest_dir) or die "Cannot create directory '${dest_dir}': $!";
- }
+ if ($dest_dir && !-d $dest_dir) {
+ File::Path::make_path($dest_dir) or die "Cannot create directory '${dest_dir}': $!";
+ }
- File::Copy::copy($src_dir . '/' . $src_file, $dest_file) or die "Cannot copy '${src_dir}/${src_file}' to '${dest_file}': $!";
+ File::Copy::copy($src_dir . '/' . $src_file, $dest_file) or die "Cannot copy '${src_dir}/${src_file}' to '${dest_file}': $!";
- $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: copied '${src_dir}/${src_file}' to '${dest_file}'");
- }
+ $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: copied '${src_dir}/${src_file}' to '${dest_file}'");
}
return 1;
}
+sub drop_constraints {
+ my ($self, %params) = @_;
+
+ croak "Missing parameter 'table'" unless $params{table};
+ $params{type} ||= 'FOREIGN KEY';
+ $params{schema} ||= 'public';
+
+ my $constraints = $self->dbh->selectall_arrayref(<
}g;
+ $new_content =~ s{\n}{
}g;
+ $new_content = "
${new_content}
" if $new_content; + + $sth->execute($new_content, $row->{id}) if $new_content ne $row->{$column}; + } + + $sth->finish; +} + 1; __END__ @@ -204,13 +259,66 @@ C<$coa_name>. Outputs an error message C<$message> to the user and aborts execution. -=item C