X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDBUpgrade2%2FBase.pm;h=100652e15e985c070cce283bb9138bc9b3da10f4;hb=e90048c8180f32f52f3f12ee52eb7269c4b27fcf;hp=2c1e111140cc63d25d15294c3f5f05e92aedba74;hpb=245d5036b6fbc2c9e4692244aff22d5188771e09;p=kivitendo-erp.git
diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm
index 2c1e11114..100652e15 100644
--- a/SL/DBUpgrade2/Base.pm
+++ b/SL/DBUpgrade2/Base.pm
@@ -5,6 +5,7 @@ use strict;
use parent qw(Rose::Object);
use Carp;
+use Encode;
use English qw(-no_match_vars);
use File::Basename ();
use File::Copy ();
@@ -37,18 +38,28 @@ 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, %params) = @_;
- return if $self->dbh->do($query, undef, @{ $params{bind} || [] });
+ my $dbh = $params{dbh} || $self->dbh;
+
+ return if $dbh->do($query, undef, @{ $params{bind} || [] });
$self->db_error($query) unless $params{may_fail};
- $self->dbh->rollback;
- $self->dbh->begin_work;
+ $dbh->rollback;
+ $dbh->begin_work;
+}
+
+sub db_errstr {
+ my ($self, $handle) = @_;
+
+ my $error = $handle ? $handle->errstr : $self->dbh->errstr;
+
+ return Encode::decode('utf-8', $error);
}
sub check_coa {
@@ -79,35 +90,51 @@ 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;
+ my $template_dir = $::instance_conf->reload->get_templates;
+ $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dir $template_dir");
- $::lxdebug->message(LXDebug::DEBUG1(), "add_print_templates: template_dirs " . join(' ', @template_dirs));
+ return 1 if !$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(<db_query(qq|ALTER TABLE $params{schema}."$params{table}" DROP CONSTRAINT "${_}"|) for map { $_->[0] } @{ $constraints };
+}
+
1;
__END__
@@ -221,6 +248,46 @@ current transaction will be rolled back, a new one will be started.
An optional array reference containing bind parameter for the query.
+=item C
+
+The database handle to use. If undefined then C<$self-Edbh> will
+be used.
+
+=back
+
+=item C
+
+Returns the last database from C<$handle> error message encoded in
+Perl's internal encoding. The PostgreSQL DBD leaves the UTF-8 flag off
+for error messages even if the C attribute is set.
+
+C<$handle> is optional and can be one of three things:
+
+=over 2
+
+=item 1. A database or statement handle. In that case
+C<$handle-Eerrstr> is used.
+
+=item 2. The string 'DBI'. In that case C<$DBI::errstr> is used.
+
+=item 3. If it is undefined then C<$self-Edbh-Eerrstr> is
+used.
+
+=back
+
+=item C
+
+Drops all constraints of a type (e.g. foreign keys) on a table. One
+parameter is mandatory: C. Optional parameters include:
+
+=over 2
+
+=item * C -- if missing defaults to C
+
+=item * C -- if missing defaults to C. Must be one of
+the values contained in the C
+view in the C column.
+
=back
=item C