From 47cef480fbdc2b02d6e0271e36a5bcd8774a3271 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 2 Mar 2020 14:25:23 -0500
Subject: [PATCH] Fix "no such field" failure in SmartGroup upgrade

Calling api get with no return fields specified is always risky during upgrades because upgrades can add/drop columns.
---
 CRM/Upgrade/Incremental/SmartGroups.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CRM/Upgrade/Incremental/SmartGroups.php b/CRM/Upgrade/Incremental/SmartGroups.php
index 011c75a4cd..70c272511d 100644
--- a/CRM/Upgrade/Incremental/SmartGroups.php
+++ b/CRM/Upgrade/Incremental/SmartGroups.php
@@ -232,12 +232,11 @@ class CRM_Upgrade_Incremental_SmartGroups {
    * @return mixed
    */
   protected function getSearchesWithField($field) {
-    $savedSearches = civicrm_api3('SavedSearch', 'get', [
+    return civicrm_api3('SavedSearch', 'get', [
       'options' => ['limit' => 0],
       'form_values' => ['LIKE' => "%{$field}%"],
+      'return' => ['id', 'form_values'],
     ])['values'];
-    return $savedSearches;
-
   }
 
   /**
-- 
2.25.1