From: Sven Schöling <s.schoeling@linet-services.de>
Date: Mon, 31 Aug 2009 15:32:24 +0000 (+0200)
Subject: Und noch ein Bug: renamed columns
X-Git-Tag: release-2.6.1beta1~310
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=0ade2438400535b4b5d969244ff1b23daddaf3fb;p=kivitendo-erp.git

Und noch ein Bug: renamed columns
---

diff --git a/SL/IC.pm b/SL/IC.pm
index d654d008b..c9511b4db 100644
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -847,21 +847,18 @@ sub all_parts {
     my $joins_needed = shift;
     sub {
       my ($col, $group) = @_;
-      $renamed_columns{$col} ||= $col;
-
       my @coalesce_tokens =
-        map { ($_->[1] || 'p.') . $_->[0] }
+        map  { ($_->[1] || 'p.') . $_->[0] }
         grep { !$_->[2] || $joins_needed->{$_->[2]} }
         grep { $_->[0] eq $col }
-        @column_override,
-        [ $col, $table_prefix{$col} ];
+        @column_override, [ $col, $table_prefix{$col} ];
 
-      my $coalesce   = scalar @coalesce_tokens > 1;
+      my $coalesce = scalar @coalesce_tokens > 1;
       return ($coalesce
         ? sprintf 'COALESCE(%s)', join ', ', @coalesce_tokens
         : shift                              @coalesce_tokens)
-        . ($group && $coalesce
-        ?  " AS $renamed_columns{$col}"
+        . ($group && ($coalesce || $renamed_columns{$col})
+        ?  " AS " . ($renamed_columns{$col} || $col)
         : '');
     }
   };