X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=SL%2FDBUpgrade2%2FBase.pm;h=cd698c5e59b8d9b0c4cbecc3a878233858665bbc;hb=1b112bd36f0b592a999276b6eb8c90b2a5827998;hp=6367911b9a8d610b183021d73565fab1801af1b0;hpb=0b5b835542cf5ff0ec074108ee7a62ecc00b1f87;p=kivitendo-erp.git diff --git a/SL/DBUpgrade2/Base.pm b/SL/DBUpgrade2/Base.pm index 6367911b9..cd698c5e5 100644 --- a/SL/DBUpgrade2/Base.pm +++ b/SL/DBUpgrade2/Base.pm @@ -11,6 +11,9 @@ use File::Basename (); use File::Copy (); use File::Path (); use List::MoreUtils qw(uniq); +use SL::DBUtils qw(selectfirst_hashref_query); +use SL::Presenter::EscapedText qw(escape); +use version; use Rose::Object::MakeMethods::Generic ( scalar => [ qw(dbh myconfig) ], @@ -28,9 +31,10 @@ sub execute_script { die $EVAL_ERROR; } + my $auth = $file_name =~ m{/Pg-upgrade2-auth/} ? 'Auth::' : ''; my $package = delete $params{tag}; $package =~ s/[^a-zA-Z0-9_]+/_/g; - $package = "SL::DBUpgrade2::${package}"; + $package = "SL::DBUpgrade2::${auth}${package}"; $package->new(%params)->run; } @@ -57,8 +61,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,11 +100,11 @@ sub add_print_templates { croak "File '${src_dir}/$_' does not exist" unless -f "${src_dir}/$_"; } - my $template_dir = $::instance_conf->reload->get_templates; + # 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"); - return 1 if !$template_dir; - foreach my $src_file (@files) { my $dest_file = $template_dir . '/' . $src_file; @@ -132,7 +142,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 = "" . 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; @@ -258,8 +288,10 @@ be used. =item C