CRM-14720 - smart groups based on postal code numeric ranges cause fatal

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index 04778d5076759b612a2bbc7e3b8393a8511732c2..f21943efa8cfb9073915f7db4579d6d7897a26f4 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -3515,7 +3515,7 @@ WHERE  $smartGroupClause
 
     // Handle numeric postal code range searches properly by casting the column as numeric
     if (is_numeric($value)) {
-      $field = 'ROUND(civicrm_address.postal_code)';
+      $field = "IF (civicrm_address.postal_code REGEXP '^[0-9]+$', CAST(civicrm_address.postal_code AS UNSIGNED), 0)";
       $val = CRM_Utils_Type::escape($value, 'Integer');
     }
     else {