From 4daa22e234bec170832b893cc8d038e9d2aca6ea Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 31 May 2012 01:30:24 -0700 Subject: [PATCH] fix tax report under MySQL, RT#17856 --- FS/FS/cust_location.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index 1f07aa87c..2810dc957 100644 --- a/FS/FS/cust_location.pm +++ b/FS/FS/cust_location.pm @@ -4,7 +4,7 @@ use base qw( FS::geocode_Mixin FS::Record ); use strict; use vars qw( $import ); use Locale::Country; -use FS::UID qw( dbh ); +use FS::UID qw( dbh driver_name ); use FS::Record qw( qsearch ); #qsearchs ); use FS::Conf; use FS::prospect_main; @@ -507,9 +507,11 @@ sub in_county_sql { ('state') x $x, 'country'); + my $text = (driver_name =~ /^mysql/i) ? 'char' : 'text'; + my @where = ( - "cust_location.district = ? OR ? = '' OR CAST(? AS text) IS NULL", - "cust_location.city = ? OR ? = '' OR CAST(? AS text) IS NULL", + "cust_location.district = ? OR ? = '' OR CAST(? AS $text) IS NULL", + "cust_location.city = ? OR ? = '' OR CAST(? AS $text) IS NULL", "cust_location.county = ? OR (? = '' AND cust_location.county IS NULL) $ornull", "cust_location.state = ? OR (? = '' AND cust_location.state IS NULL ) $ornull", "cust_location.country = ?" -- 2.11.0