Merge pull request #24993 from aydun/joinable_fix

Allow Joinables to be added to tables without specifying a base column
civicrm · Nov 17, 2022 · 2cd552f · 2cd552f
2 parents 1b43295 + 791b250
commit 2cd552f
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Civi/Api4/Service/Schema/Joinable/Joinable.php b/Civi/Api4/Service/Schema/Joinable/Joinable.php
@@ -104,13 +104,15 @@ public function __construct($targetTable, $targetColumn, $alias = NULL) {
    */
   public function getConditionsForJoin(string $baseTableAlias, string $targetTableAlias) {
     $conditions = [];
-    $conditions[] = sprintf(
-      '`%s`.`%s` =  `%s`.`%s`',
-      $baseTableAlias,
-      $this->baseColumn,
-      $targetTableAlias,
-      $this->targetColumn
-    );
+    if ($this->baseColumn && $this->targetColumn) {
+      $conditions[] = sprintf(
+        '`%s`.`%s` =  `%s`.`%s`',
+        $baseTableAlias,
+        $this->baseColumn,
+        $targetTableAlias,
+        $this->targetColumn
+      );
+    }
     $this->addExtraJoinConditions($conditions, $baseTableAlias, $targetTableAlias);
     return $conditions;
   }