X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FDBUpgrade2%2FBase.pm;h=024282f6534973e6d9b130c92a09274fcf491fce;hb=2b8804456d1d3ee249a70d98679ea3a934b25a39;hp=6f0bb829c6d54833ebbd40aab6754da379d3475d;hpb=0d1bb5102f01eb03da55bc87b52ac52cd7ae7534;p=kivitendo-erp.git diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm index 6f0bb829c..024282f65 100644 --- a/SL/DBUpgrade2/Base.pm +++ b/SL/DBUpgrade2/Base.pm @@ -11,6 +11,8 @@ 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) ], @@ -57,8 +59,14 @@ sub db_query { 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); } @@ -90,30 +98,28 @@ 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; @@ -134,7 +140,27 @@ 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 }; +} + +sub convert_column_to_html { + my ($self, $table, $column) = @_; + + my $sth = $self->dbh->prepare(qq|UPDATE $table SET $column = ? WHERE id = ?|) || $self->dberror; + + foreach my $row (selectall_hashref_query($::form, $self->dbh, qq|SELECT id, $column FROM $table WHERE $column IS NOT NULL|)) { + next if !$row->{$column} || (($row->{$column} =~ m{^<[a-z]+>}) && ($row->{$column} =~ m{[a-z]+>$})); + + my $new_content = "" . $::request->presenter->escape($row->{$column}); + $new_content =~ s{\r}{}g; + $new_content =~ s{\n\n+}{
}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; @@ -260,8 +286,10 @@ be used. =item C