summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan-debian@420.am>2012-03-08 17:07:18 -0800
committerIvan Kohler <ivan-debian@420.am>2012-03-08 17:07:18 -0800
commit1534a6ede9b49f7c268cc58c172ca7044ad4b4b7 (patch)
tree799c7107868a416212f7814502587c61933175c1
parent6c10ac1711ffc9d27985530d0ea39e343bc4587a (diff)
fix "Add package columns" in advanced customer report under MySQL, RT#16214
-rw-r--r--FS/FS/cust_main/Search.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 4da516b00..c5b5ff6d0 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -750,7 +750,7 @@ sub search {
if ($params->{'flattened_pkgs'}) {
- my $pkg_join = '';
+ #my $pkg_join = '';
if ($dbh->{Driver}->{Name} eq 'Pg') {
@@ -759,13 +759,14 @@ sub search {
} elsif ($dbh->{Driver}->{Name} =~ /^mysql/i) {
push @select, "GROUP_CONCAT(part_pkg.pkg SEPARATOR '|') as magic";
$addl_from .= ' LEFT JOIN cust_pkg USING ( custnum ) '; #Pg too w/flatpkg?
- $pkg_join .= ' LEFT JOIN part_pkg USING ( pkgpart ) ';
+ $addl_from .= ' LEFT JOIN part_pkg USING ( pkgpart ) ';
+ #$pkg_join .= ' LEFT JOIN part_pkg USING ( pkgpart ) ';
} else {
warn "warning: unknown database type ". $dbh->{Driver}->{Name}.
"omitting packing information from report.";
}
- my $header_query = "SELECT COUNT(cust_pkg.custnum = cust_main.custnum) AS count FROM cust_main $addl_from $pkg_join $extra_sql $pkgwhere group by cust_main.custnum order by count desc limit 1";
+ my $header_query = "SELECT COUNT(cust_pkg.custnum = cust_main.custnum) AS count FROM cust_main $addl_from $extra_sql $pkgwhere group by cust_main.custnum order by count desc limit 1";
my $sth = dbh->prepare($header_query) or die dbh->errstr;
$sth->execute() or die $sth->errstr;