From 606775811c51b047d8e3f2652e17e1b8b195fa06 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 5 May 2020 20:32:17 -0400
Subject: [PATCH] dev/core#1563 - Fix schema map to use canonical field names

This fixes a bug in SchemaMapBuilder where it was accidentally using "unique names"
which do not map to the real names of db columns.
---
 Civi/Api4/Service/Schema/SchemaMapBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Civi/Api4/Service/Schema/SchemaMapBuilder.php b/Civi/Api4/Service/Schema/SchemaMapBuilder.php
index 66efeb3a85..74dc0f3453 100644
--- a/Civi/Api4/Service/Schema/SchemaMapBuilder.php
+++ b/Civi/Api4/Service/Schema/SchemaMapBuilder.php
@@ -70,8 +70,8 @@ class SchemaMapBuilder {
     /** @var \CRM_Core_DAO $daoName */
     foreach (AllCoreTables::get() as $daoName => $data) {
       $table = new Table($data['table']);
-      foreach ($daoName::fields() as $field => $fieldData) {
-        $this->addJoins($table, $field, $fieldData);
+      foreach ($daoName::fields() as $fieldData) {
+        $this->addJoins($table, $fieldData['name'], $fieldData);
       }
       $map->addTable($table);
       if (in_array($data['name'], $this->apiEntities)) {
-- 
2.25.1