From ebc6735270a4be64d7d4c75ab47f2d52d4c3e907 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@icinga.com>
Date: Tue, 31 May 2022 14:17:01 +0200
Subject: [PATCH] Use Query::columns() instead of ::setColumns()

Query::columns() is no longer additive and ::setColumns() will therefore
be removed.
---
 library/Icingadb/Common/Auth.php     | 2 +-
 library/Icingadb/Data/PivotTable.php | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/Icingadb/Common/Auth.php b/library/Icingadb/Common/Auth.php
index a7ab885e..8329e3e5 100644
--- a/library/Icingadb/Common/Auth.php
+++ b/library/Icingadb/Common/Auth.php
@@ -243,7 +243,7 @@ trait Auth
                         ...$values
                     );
 
-                    $query->setColumns($columns);
+                    $query->columns($columns);
                 }
             }
 
diff --git a/library/Icingadb/Data/PivotTable.php b/library/Icingadb/Data/PivotTable.php
index 31ccd4e7..2819e11b 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->columns($gridcols)->resetOrderBy();
         $this->xAxisColumn = $xAxisColumn;
         $this->yAxisColumn = $yAxisColumn;
         $this->gridcols = $gridcols;
@@ -254,7 +253,7 @@ class PivotTable
                 $columns[] = $this->gridcols[$xAxisHeader];
             }
 
-            $this->xAxisQuery->setColumns($columns);
+            $this->xAxisQuery->columns($columns);
 
             if ($this->xAxisFilter !== null) {
                 $this->xAxisQuery->filter($this->xAxisFilter);
@@ -303,7 +302,7 @@ class PivotTable
                 $columns[] = $this->gridcols[$yAxisHeader];
             }
 
-            $this->yAxisQuery->setColumns($columns);
+            $this->yAxisQuery->columns($columns);
 
             if ($this->yAxisFilter !== null) {
                 $this->yAxisQuery->filter($this->yAxisFilter);