tax_constraints: Nicht zu viele Einträge aus taxkeys löschen

diff --git a/sql/Pg-upgrade2/tax_constraints.pl b/sql/Pg-upgrade2/tax_constraints.pl
index 23d9b84b2c0fe4faa83bdaa15b55f39460fdfaec..cc2ccd2e46359f2ac9254da2b6ae66fc7330b1dd 100644 (file)
--- a/sql/Pg-upgrade2/tax_constraints.pl
+++ b/sql/Pg-upgrade2/tax_constraints.pl
@@ -193,20 +193,19 @@ SQL
   $sth->finish;
 
   for my $i (0 .. $rowcount-1){
   $sth->finish;
 
   for my $i (0 .. $rowcount-1){

-    $query= qq|
+    $query= <<SQL;

       DELETE FROM taxkeys tk1
       DELETE FROM taxkeys tk1

-      WHERE (SELECT count(*)
-            FROM taxkeys tk2
-            WHERE tk2.chart_id  = tk1.chart_id
-            AND   tk2.startdate = tk1.startdate) > 1
-      AND NOT tk1.id = (SELECT id
-                        FROM taxkeys
-                        WHERE chart_id  = | . $::form->{TAXKEYS}[$i]->{chart_id} . qq|
-                        AND   startdate = '| . $::form->{TAXKEYS}[$i]->{startdate} . qq|'
-                        LIMIT 1)
-|;
+      WHERE (tk1.chart_id  = ?)
+        AND (tk1.startdate = ?)
+        AND (tk1.id <> (
+          SELECT id
+          FROM taxkeys
+          WHERE (chart_id  = ?)
+          AND   (startdate = ?)
+          LIMIT 1))
+SQL

 
 

-    $self->db_query($query);
+    $self->db_query($query, bind => [ ($::form->{TAXKEYS}[$i]->{chart_id}, $::form->{TAXKEYS}[$i]->{startdate}) x 2 ]);

   }
 
   #END CHECK OF taxkeys
   }
 
   #END CHECK OF taxkeys