Revert "Anpassung Upgrade-Script an neue Synthax"

[mfinanz.git] / sql / Pg-upgrade2 / rm_whitespaces.pl

diff --git a/sql/Pg-upgrade2/rm_whitespaces.pl b/sql/Pg-upgrade2/rm_whitespaces.pl
index c23489751126064a03cf79848cf97bf2bba412f7..51d2395ef30f24a79c4c448ef7dd67261187d767 100644 (file)
--- a/sql/Pg-upgrade2/rm_whitespaces.pl
+++ b/sql/Pg-upgrade2/rm_whitespaces.pl
@@ -1,39 +1,53 @@
 # @tag: rm_whitespaces
 # @description: Entfernt mögliche Leerzeichen am Anfang und Ende jeder Währung
 # @depends: release_3_0_0
-
-package SL::DBUpgrade2::rm_whitespaces;
-
-use parent qw(SL::DBUpgrade2::Base);
+# @charset: utf-8
 
 use utf8;
 use strict;
 
-sub run {
-  my ($self) = @_;
+die("This script cannot be run from the command line.") unless ($main::form);
+
+sub mydberror {
+  my ($msg) = @_;
+  die($dbup_locale->text("Database update error:") . "<br>$msg<br>" . $DBI::errstr);
+}
+
+sub do_query {
+  my ($query, $may_fail) = @_;
+
+  if (!$dbh->do($query)) {
+    mydberror($query) unless ($may_fail);
+    $dbh->rollback();
+    $dbh->begin_work();
+  }
+}
+
+
+sub do_update {
   my $query = qq|UPDATE ar SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
   $query = qq|UPDATE ap SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
   $query = qq|UPDATE oe SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
   $query = qq|UPDATE customer SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
   $query = qq|UPDATE delivery_orders SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
   $query = qq|UPDATE exchangerate SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
   $query = qq|UPDATE vendor SET curr = RTRIM(LTRIM(curr))|;
-  $self->db_query($query);
+  do_query($query);
 
   $query = qq|SELECT curr FROM defaults|;
-  my ($curr)     = $self->dbh->selectrow_array($query);
+  my ($curr)     = selectrow_query($self, $dbh, $query);
 
   $curr  =~ s/ //g;
 
   $query = qq|UPDATE defaults SET curr = '$curr'|;
-  $self->db_query($query);
+  do_query($query);
   return 1;
 };
 
-1;
+return do_update();