From ecf33be34c0a449ab203705a36497eefdd56febd Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Fri, 20 May 2022 08:40:27 +0200
Subject: [PATCH] PivotTable: Reset columns on the base query

---
 library/Icingadb/Data/PivotTable.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/Icingadb/Data/PivotTable.php b/library/Icingadb/Data/PivotTable.php
index 31ccd4e7..c19d50af 100644
--- a/library/Icingadb/Data/PivotTable.php
+++ b/library/Icingadb/Data/PivotTable.php
@@ -104,8 +104,7 @@ class PivotTable
             $this->order[$sort[0]] = $sort[1];
         }
 
-        // ipl/sql branch put-reset-methods-into-the trait is required for resetOrderBy().
-        $this->baseQuery = $query->setColumns($gridcols)->resetOrderBy();
+        $this->baseQuery = $query->resetColumns()->setColumns($gridcols)->resetOrderBy();
         $this->xAxisColumn = $xAxisColumn;
         $this->yAxisColumn = $yAxisColumn;
         $this->gridcols = $gridcols;