From 41b42190cd5c91f561fd9bc32735c23ba52f70fe Mon Sep 17 00:00:00 2001
From: colemanw <coleman@civicrm.org>
Date: Tue, 14 Nov 2023 13:40:29 -0500
Subject: [PATCH] APIv4 - Fix index interfering with HAVING

It's not always safe to delete items from the SELECT clause... so let's not.
Fixes dev/core#4017
---
 api/api.php                                   |  6 ++---
 ext/afform/core/afform.php                    |  1 -
 .../phpunit/api/v4/Action/SqlFunctionTest.php | 25 ++++++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/api/api.php b/api/api.php
index bc307f1596..4fd54bcfd9 100644
--- a/api/api.php
+++ b/api/api.php
@@ -79,9 +79,9 @@ function civicrm_api4(string $entity, string $action, array $params = [], $index
   if ($index && is_array($index)) {
     $indexCol = reset($index);
     $indexField = key($index);
-    // Index array indicates only 1 or 2 fields need to be selected (except for oddball "Setting" api)
-    if ($entity !== 'Setting' && property_exists($apiCall, 'select')) {
-      $apiCall->setSelect([$indexCol]);
+    // Automatically add index fields(s) to the SELECT clause
+    if ($entity !== 'Setting' && method_exists($apiCall, 'addSelect')) {
+      $apiCall->addSelect($indexCol);
       if ($indexField && $indexField != $indexCol) {
         $apiCall->addSelect($indexField);
       }
diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
index ad422e8aa1..e0ecada9c9 100644
--- a/ext/afform/core/afform.php
+++ b/ext/afform/core/afform.php
@@ -588,7 +588,6 @@ function afform_civicrm_referenceCounts($dao, &$counts) {
     try {
       $displays = civicrm_api4('SearchDisplay', 'get', [
         'where' => [['saved_search_id', '=', $dao->id]],
-        'select' => 'name',
       ], ['name']);
       foreach ($displays as $displayName) {
         $clauses[] = ['search_displays', 'CONTAINS', $dao->name . '.' . $displayName];
diff --git a/tests/phpunit/api/v4/Action/SqlFunctionTest.php b/tests/phpunit/api/v4/Action/SqlFunctionTest.php
index 232709eb0e..cc5d650459 100644
--- a/tests/phpunit/api/v4/Action/SqlFunctionTest.php
+++ b/tests/phpunit/api/v4/Action/SqlFunctionTest.php
@@ -174,19 +174,20 @@ class SqlFunctionTest extends Api4TestBase implements TransactionalInterface {
     $this->assertEquals(2, $result[0]['count']);
     $this->assertEquals(1, $result[1]['count']);
 
-    $result = Contribution::get(FALSE)
-      ->addGroupBy('contact_id')
-      ->addGroupBy('receive_date')
-      ->addSelect('contact_id')
-      ->addSelect('receive_date')
-      ->addSelect('SUM(total_amount)')
-      ->addOrderBy('receive_date')
-      ->addWhere('contact_id', '=', $cid)
-      ->addHaving('SUM(total_amount)', '>', 300)
-      ->execute();
+    $result = (array) civicrm_api4('Contribution', 'get', [
+      'checkPermissions' => FALSE,
+      'groupBy' => ['contact_id', 'receive_date'],
+      'select' => ['contact_id', 'DATE(receive_date)', 'SUM(total_amount)'],
+      'orderBy' => ['receive_date' => 'ASC'],
+      'where' => [
+        ['contact_id', '=', $cid],
+      ],
+      'having' => [
+        ['SUM(total_amount)', '>', 300],
+      ],
+    ], ['DATE:receive_date' => 'SUM:total_amount']);
     $this->assertCount(1, $result);
-    $this->assertStringStartsWith('2020-04-04', $result[0]['receive_date']);
-    $this->assertEquals(400, $result[0]['SUM:total_amount']);
+    $this->assertEquals(['2020-04-04' => 400], $result);
   }
 
   public function testComparisonFunctions(): void {
-- 
2.25.1