From 0f7babcceed45fa0d21c494726d8dc4a98bd41d0 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 4 Feb 2020 09:12:17 -0500 Subject: [PATCH] APIv4 Organize debug sql into a single array --- Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php | 2 +- Civi/Api4/Query/Api4SelectQuery.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php b/Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php index 44476c5916..84dbca9e79 100644 --- a/Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php +++ b/Civi/Api4/Event/Subscriber/PostSelectQuerySubscriber.php @@ -245,7 +245,7 @@ class PostSelectQuerySubscriber implements EventSubscriberInterface { $sql = $newSelect . substr($sql, strpos($sql, "\nFROM")); if (is_array($query->debugOutput)) { - $query->debugOutput['join_sql'][] = $sql; + $query->debugOutput['sql'][] = $sql; } $relatedResults = []; diff --git a/Civi/Api4/Query/Api4SelectQuery.php b/Civi/Api4/Query/Api4SelectQuery.php index 3556aaca8e..4181543bbc 100644 --- a/Civi/Api4/Query/Api4SelectQuery.php +++ b/Civi/Api4/Query/Api4SelectQuery.php @@ -113,7 +113,7 @@ class Api4SelectQuery extends SelectQuery { $results = []; $sql = $this->query->toSQL(); if (is_array($this->debugOutput)) { - $this->debugOutput['main_sql'] = $sql; + $this->debugOutput['sql'][] = $sql; } $query = \CRM_Core_DAO::executeQuery($sql); -- 2.25.1