[freeside-commits] branch master updated. c19528e2e137e19b0aa9649bd93d5f6eefa8760a

[Ivan]

The branch, master has been updated
       via  c19528e2e137e19b0aa9649bd93d5f6eefa8760a (commit)
      from  7bfad250feb5f1acc10b7f4b98b0efdd14c52be5 (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 c19528e2e137e19b0aa9649bd93d5f6eefa8760a
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu May 31 01:24:55 2012 -0700

    fix tax report under MySQL, RT#17856

diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index 6899fa4..de535aa 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -10,7 +10,7 @@ use List::Util qw(max);
 use Tie::IxHash;
 use Time::Local qw( timelocal timelocal_nocheck );
 use MIME::Entity;
-use FS::UID qw( getotaker dbh );
+use FS::UID qw( getotaker dbh driver_name );
 use FS::Misc qw( send_email );
 use FS::Record qw( qsearch qsearchs fields );
 use FS::CurrentUser;
@@ -3741,10 +3741,12 @@ sub _location_sql_where {
   my $or_empty_county   = " OR ( ? = '' AND $table.${prefix}county   IS NULL )";
   my $or_empty_state    = " OR ( ? = '' AND $table.${prefix}state    IS NULL )";
 
+  my $text = (driver_name =~ /^mysql/i) ? 'char' : 'text';
+
 #        ( $table.${prefix}city    = ? $or_empty_city   $ornull )
   "
-        ( $table.district = ? OR ? = '' OR CAST(? AS text) IS NULL )
-    AND ( $table.${prefix}city     = ? OR ? = '' OR CAST(? AS text) IS NULL )
+        ( $table.district = ? OR ? = '' OR CAST(? AS $text) IS NULL )
+    AND ( $table.${prefix}city     = ? OR ? = '' OR CAST(? AS $text) IS NULL )
     AND ( $table.${prefix}county   = ? $or_empty_county $ornull )
     AND ( $table.${prefix}state    = ? $or_empty_state  $ornull )
     AND   $table.${prefix}country  = ?

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

Summary of changes:
 FS/FS/cust_pkg.pm |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)