[freeside-commits] branch master updated. 860a0e1470854bf8b108fb0d269c60f4ace251df

[Jonathan Prykop]

The branch, master has been updated
       via  860a0e1470854bf8b108fb0d269c60f4ace251df (commit)
      from  d263de52c7c09e940bbe9d794dded878b98e789b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 860a0e1470854bf8b108fb0d269c60f4ace251df
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Fri Jul 24 22:35:26 2015 -0500

    RT#29833: MySQL error running Reports -> Packages -> Package Summary

diff --git a/httemplate/search/cust_pkg_summary.cgi b/httemplate/search/cust_pkg_summary.cgi
index c0eb699..76ca895 100644
--- a/httemplate/search/cust_pkg_summary.cgi
+++ b/httemplate/search/cust_pkg_summary.cgi
@@ -56,7 +56,8 @@ foreach my $column (keys %conds) {
   my $count_query = $h_search->{count_query};
 
   # push a select expression for the total packages with pkgpart=main.pkgpart
-  push @select, "($count_query AND h_cust_pkg.pkgpart = main.pkgpart) AS $column";
+  # (have to quote $column, otherwise mysql thinks before/after are keywords)
+  push @select, "($count_query AND h_cust_pkg.pkgpart = main.pkgpart) AS \"$column\"";
 
   # and query the total packages with pkgpart=any of the main.pkgparts
   my $total = FS::Record->scalar_sql($count_query . 

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

Summary of changes:
 httemplate/search/cust_pkg_summary.cgi |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)