Merge pull request #16900 from colemanw/api4fix

APIv4 - bugfix in select query
civicrm · Mar 26, 2020 · 53cd146 · 53cd146
2 parents f7c335b + 0553996
commit 53cd146
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php b/Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php
@@ -110,11 +110,10 @@ private function formatJoinResults(&$joinResults, $query, $alias) {
    * @return array
    */
   private function getNtoManyJoinSelects(Api4SelectQuery $query) {
-    $fkAliases = $query->getFkSelectAliases();
     $joinedDotSelects = array_filter(
       $query->getSelect(),
-      function ($select) use ($fkAliases, $query) {
-        return isset($fkAliases[$select]) && array_filter($query->getPathJoinTypes($select));
+      function ($select) use ($query) {
+        return strpos($select, '.') && array_filter($query->getPathJoinTypes($select));
       }
     );
 

diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php
@@ -394,7 +394,7 @@ protected function joinFK($key) {
       $col = ($lastLink instanceof CustomGroupJoinable) ? $lastLink->getSqlColumn($field) : $field;
       // Check Permission on field.
       if ($this->checkPermissions && !empty($this->apiFieldSpec[$prefix . $field]['permission']) && !\CRM_Core_Permission::check($this->apiFieldSpec[$prefix . $field]['permission'])) {
-        return;
+        continue;
       }
       $this->fkSelectAliases[$pathString . '.' . $field] = sprintf('%s.%s', $lastLink->getAlias(), $col);
     }