use List::MoreUtils qw(any);
use SL::Common;
+use SL::DBUtils;
use SL::Iconv;
use strict;
$db_charset ||= Common::DEFAULT_CHARSET;
- my $iconv = SL::Iconv::get_converter($file_charset, $db_charset);
+ my $iconv = SL::Iconv->new($file_charset, $db_charset);
$dbh->begin_work();
}
if (ref($version_or_control) eq "HASH") {
- $dbh->do("INSERT INTO schema_info (tag, login) VALUES (" . $dbh->quote($version_or_control->{"tag"}) . ", " . $dbh->quote($form->{"login"}) . ")");
+ $dbh->do("INSERT INTO " . $self->{schema} . "schema_info (tag, login) VALUES (" . $dbh->quote($version_or_control->{"tag"}) . ", " . $dbh->quote($form->{"login"}) . ")");
} elsif ($version_or_control) {
$dbh->do("UPDATE defaults SET version = " . $dbh->quote($version_or_control));
}
my @all_scripts = map { $_->{applied} = 0; $_ } $self->sort_dbupdate_controls;
- my $query = qq|SELECT tag FROM schema_info|;
+ my $query = qq|SELECT tag FROM | . $self->{schema} . qq|schema_info|;
my $sth = $dbh->prepare($query);
$sth->execute || $self->{form}->dberror($query);
while (my ($tag) = $sth->fetchrow_array()) {
return grep { !$_->{applied} } @all_scripts;
}
+sub apply_admin_dbupgrade_scripts {
+ my ($self, $called_from_admin) = @_;
+
+ return 0 if !$self->{auth};
+
+ my $dbh = $::auth->dbconnect;
+ my @unapplied_scripts = $self->unapplied_upgrade_scripts($dbh);
+
+ return 0 if !@unapplied_scripts;
+
+ my $db_charset = $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET;
+ $self->{form}->{login} ||= 'admin';
+
+ map { $_->{description} = SL::Iconv::convert($_->{charset}, $db_charset, $_->{description}) } values %{ $self->{all_controls} };
+
+ if ($called_from_admin) {
+ $self->{form}->{title} = $::locale->text('Dataset upgrade');
+ $self->{form}->header;
+ }
+
+ print $self->{form}->parse_html_template("dbupgrade/header", { dbname => $::auth->{DB_config}->{db} });
+
+ foreach my $control (@unapplied_scripts) {
+ $::lxdebug->message(LXDebug->DEBUG2(), "Applying Update $control->{file}");
+ print $self->{form}->parse_html_template("dbupgrade/upgrade_message2", $control);
+
+ $self->process_file($dbh, "sql/$self->{dbdriver}-upgrade2-auth/$control->{file}", $control, $db_charset);
+ }
+
+ print $self->{form}->parse_html_template("dbupgrade/footer", { is_admin => 1 }) if $called_from_admin;
+
+ return 1;
+}
+
sub _check_for_loops {
my ($form, $file_name, $controls, $tag, @path) = @_;
sub sort_dbupdate_controls {
my $self = shift;
+ $self->parse_dbupdate_controls unless $self->{all_controls};
+
return sort { ($a->{depth} <=> $b->{depth}) || ($a->{priority} <=> $b->{priority}) || ($a->{tag} cmp $b->{tag}) } values %{ $self->{all_controls} };
}