[Rt-commit] rt branch, 3.8-trunk, updated. e3a933d870fd3dc05a8148a0589900c4c426c937

[Ruslan Zakirov]

The branch, 3.8-trunk has been updated
       via  e3a933d870fd3dc05a8148a0589900c4c426c937 (commit)
       via  db561f34a702c3c1f20928b74b10fdd13cd43f56 (commit)
      from  3243faf3a9f23fdb314ef17eeef4f513e280ede6 (commit)

Summary of changes:
 lib/RT/Report/Tickets.pm |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit db561f34a702c3c1f20928b74b10fdd13cd43f56
Author: Ruslan Zakirov <Ruslan.Zakirov at gmail.com>
Date:   Fri Jul 24 01:52:41 2009 +0400

    alias is required when we build report by dates
    
    For example we have Created in many tables, using it without alias
    is ambiguose. Thanks to Chris Loos for reporting.

diff --git a/lib/RT/Report/Tickets.pm b/lib/RT/Report/Tickets.pm
index a192ec4..349216e 100644
--- a/lib/RT/Report/Tickets.pm
+++ b/lib/RT/Report/Tickets.pm
@@ -185,16 +185,17 @@ sub _FieldToFunction {
 
     if ($field =~ /^(.*)(Daily|Monthly|Annually)$/) {
         my ($field, $grouping) = ($1, $2);
+        my $alias = $args{'ALIAS'} || 'main';
         # Pg 8.3 requires explicit casting
         $field .= '::text' if RT->Config->Get('DatabaseType') eq 'Pg';
         if ( $grouping =~ /Daily/ ) {
-            $args{'FUNCTION'} = "SUBSTR($field,1,10)";
+            $args{'FUNCTION'} = "SUBSTR($alias.$field,1,10)";
         }
         elsif ( $grouping =~ /Monthly/ ) {
-            $args{'FUNCTION'} = "SUBSTR($field,1,7)";
+            $args{'FUNCTION'} = "SUBSTR($alias.$field,1,7)";
         }
         elsif ( $grouping =~ /Annually/ ) {
-            $args{'FUNCTION'} = "SUBSTR($field,1,4)";
+            $args{'FUNCTION'} = "SUBSTR($alias.$field,1,4)";
         }
     } elsif ( $field =~ /^(?:CF|CustomField)\.{(.*)}$/ ) { #XXX: use CFDecipher method
         my $cf_name = $1;

commit e3a933d870fd3dc05a8148a0589900c4c426c937
Merge: db561f3... 3243faf...
Author: Ruslan Zakirov <Ruslan.Zakirov at gmail.com>
Date:   Fri Jul 24 02:08:16 2009 +0400

    Merge branch '3.8-trunk' of git+ssh://diesel.bestpractical.com/git/rt into 3.8-trunk


-----------------------------------------------------------------------