$rc = 0;
- if ($form->{dbversion} ne $dbversion) {
+ if (&update_available($myconfig{"dbdriver"}, $dbversion)) {
# update the tables
open FH, ">$userspath/nologin" or die "
sub process_query {
$main::lxdebug->enter_sub();
- my ($self, $form, $dbh, $filename) = @_;
+ my ($self, $form, $dbh, $filename, $version) = @_;
# return unless (-f $filename);
my $sth;
my @quote_chars;
+ $dbh->begin_work();
+
while (<FH>) {
# Remove DOS and Unix style line endings.
- s/[\r\n]//g;
+ chomp;
- # don't add comments or empty lines
- next if /^(--.*|\s+)$/;
+ # remove comments
+ s/--.*$//;
for (my $i = 0; $i < length($_); $i++) {
my $char = substr($_, $i, 1);
# Query is complete. Send it.
$sth = $dbh->prepare($query);
- $sth->execute || $form->dberror($query);
- $sth->finish;
+ if (!$sth->execute()) {
+ my $errstr = $dbh->errstr;
+ $sth->finish();
+ $dbh->rollback();
+ $form->dberror("The database update/creation did not succeed. The file ${filename} containing the following query failed:<br>${query}<br>" .
+ "The error message was: ${errstr}<br>" .
+ "All changes in that file have been reverted.");
+ }
+ $sth->finish();
$char = "";
$query = "";
}
}
+ if ($version) {
+ $dbh->do("UPDATE defaults SET version = " . $dbh->quote($version));
+ }
+ $dbh->commit();
+
close FH;
$main::lxdebug->leave_sub();
## LINET
sub calc_version {
- $main::lxdebug->enter_sub();
+ $main::lxdebug->enter_sub(2);
my (@v, $version, $i);
$version += $v[$i];
}
- $main::lxdebug->leave_sub();
+ $main::lxdebug->leave_sub(2);
return $version;
}
}
## /LINET
+sub update_available {
+ my ($dbdriver, $cur_version) = @_;
+
+ opendir SQLDIR, "sql/${dbdriver}-upgrade" or &error("", "sql/${dbdriver}-upgrade: $!");
+ my @upgradescripts =
+ grep(/$form->{dbdriver}-upgrade-\Q$cur_version\E.*\.sql/, readdir(SQLDIR));
+ closedir SQLDIR;
+
+ return ($#upgradescripts > -1);
+}
+
sub dbupdate {
$main::lxdebug->enter_sub();
if ($form->{dbupdate}) {
# read update scripts into memory
- opendir SQLDIR, "sql/." or $form - error($!);
+ opendir SQLDIR, "sql/" . $form->{dbdriver} . "-upgrade" or &error("", "sql/" . $form->{dbdriver} . "-upgrade : $!");
## LINET
@upgradescripts =
sort(cmp_script_version
$a =~ s/^$form->{dbdriver}-upgrade-|\.sql$//g;
my ($mindb, $maxdb) = split /-/, $a;
+ my $str_maxdb = $maxdb;
## LINET
$mindb = calc_version($mindb);
$maxdb = calc_version($maxdb);
last if ($version < $mindb);
# apply upgrade
- $self->process_query($form, $dbh, "sql/$upgradescript");
+ $main::lxdebug->message(DEBUG2, "Appliying Update $upgradescript");
+ $self->process_query($form, $dbh, "sql/" . $form->{"dbdriver"} . "-upgrade/$upgradescript", $str_maxdb);
$version = $maxdb;
my @conf = qw(acs address admin businessnumber charset company countrycode
currency dateformat dbconnect dbdriver dbhost dbport dboptions
- dbname dbuser dbpasswd email fax name numberformat password
+ dbname dbuser dbpasswd email fax name numberformat in_numberformat password
printer role sid signature stylesheet tel templates vclimit angebote bestellungen rechnungen
- anfragen lieferantenbestellungen einkaufsrechnungen steuernummer ustid duns menustyle);
+ anfragen lieferantenbestellungen einkaufsrechnungen steuernummer co_ustid duns menustyle);
$main::lxdebug->leave_sub();