X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/a23454bb1b039a31b7f77710ff663fa9152d530c..714a28b162b86362a7e5d150211f0d85bf4ef1e4:/sql/Pg-upgrade2/rm_whitespaces.pl

diff --git a/sql/Pg-upgrade2/rm_whitespaces.pl b/sql/Pg-upgrade2/rm_whitespaces.pl
index 51d2395ef..c23489751 100644
--- a/sql/Pg-upgrade2/rm_whitespaces.pl
+++ b/sql/Pg-upgrade2/rm_whitespaces.pl
@@ -1,53 +1,39 @@
 # @tag: rm_whitespaces
 # @description: Entfernt mögliche Leerzeichen am Anfang und Ende jeder Währung
 # @depends: release_3_0_0
-# @charset: utf-8
 
-use utf8;
-use strict;
-
-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);
-}
+package SL::DBUpgrade2::rm_whitespaces;
 
-sub do_query {
-  my ($query, $may_fail) = @_;
-
-  if (!$dbh->do($query)) {
-    mydberror($query) unless ($may_fail);
-    $dbh->rollback();
-    $dbh->begin_work();
-  }
-}
+use parent qw(SL::DBUpgrade2::Base);
 
+use utf8;
+use strict;
 
-sub do_update {
+sub run {
+  my ($self) = @_;
   my $query = qq|UPDATE ar SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
   $query = qq|UPDATE ap SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
   $query = qq|UPDATE oe SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
   $query = qq|UPDATE customer SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
   $query = qq|UPDATE delivery_orders SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
   $query = qq|UPDATE exchangerate SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
   $query = qq|UPDATE vendor SET curr = RTRIM(LTRIM(curr))|;
-  do_query($query);
+  $self->db_query($query);
 
   $query = qq|SELECT curr FROM defaults|;
-  my ($curr)     = selectrow_query($self, $dbh, $query);
+  my ($curr)     = $self->dbh->selectrow_array($query);
 
   $curr  =~ s/ //g;
 
   $query = qq|UPDATE defaults SET curr = '$curr'|;
-  do_query($query);
+  $self->db_query($query);
   return 1;
 };
 
-return do_update();
+1;