[freeside-commits] branch master updated. 25b36e09790470f7c7b552f8b43ce5be972fb976

[Mark Wells]

The branch, master has been updated
       via  25b36e09790470f7c7b552f8b43ce5be972fb976 (commit)
      from  85fbf4faf43f7c8d38973304c2a0940275160a73 (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 25b36e09790470f7c7b552f8b43ce5be972fb976
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Jul 17 12:58:59 2014 -0700

    mysql compat fix, try again, #28895

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index 153390b..54b8e90 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -11,6 +11,7 @@ use Business::CreditCard;
 use Text::Template;
 use FS::Misc::DateTime qw( parse_datetime ); #for batch_import
 use FS::Record qw( dbh qsearch qsearchs );
+use FS::UID qw( driver_name );
 use FS::CurrentUser;
 use FS::payby;
 use FS::cust_main_Mixin;
@@ -1050,9 +1051,10 @@ sub process_upgrade_paybatch {
   ###
   # migrate batchnums from the misused 'paybatch' field to 'batchnum'
   ###
+  my $text = (driver_name =~ /^mysql/i) ? 'char' : 'text';
   my $search = FS::Cursor->new( {
     'table'     => 'cust_pay',
-    'addl_from' => ' JOIN pay_batch ON cust_pay.paybatch = CONCAT(pay_batch.batchnum) ',
+    'addl_from' => " JOIN pay_batch ON cust_pay.paybatch = CAST(pay_batch.batchnum AS $text) ",
   } );
   while (my $cust_pay = $search->fetch) {
     $cust_pay->set('batchnum' => $cust_pay->paybatch);

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

Summary of changes:
 FS/FS/cust_pay.pm |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)