From 63f3f092ba42ba59f1cdad8e10722ea41e8ccdaa Mon Sep 17 00:00:00 2001 From: Matthew Bucci Date: Mon, 30 Oct 2023 15:20:15 -0700 Subject: [PATCH] ensure we don't pass null to trim during ensureGroupByOrAggregate --- pg4wp/rewriters/SelectSQLRewriter.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pg4wp/rewriters/SelectSQLRewriter.php b/pg4wp/rewriters/SelectSQLRewriter.php index e56589a..90b6d37 100644 --- a/pg4wp/rewriters/SelectSQLRewriter.php +++ b/pg4wp/rewriters/SelectSQLRewriter.php @@ -267,11 +267,11 @@ class SelectSQLRewriter extends AbstractSQLRewriter return $sql; } - $selectClause = trim($matches[2]) ?? ''; - $fromClause = trim($matches[4]) ?? ''; - $whereClause = trim($matches[5]) ?? ''; - $orderClause = trim($matches[6]) ?? ''; - $limitClause = trim($matches[7]) ?? ''; + $selectClause = trim($matches[2] ?? ''); + $fromClause = trim($matches[4] ?? ''); + $whereClause = trim($matches[5] ?? ''); + $orderClause = trim($matches[6] ?? ''); + $limitClause = trim($matches[7] ?? ''); if (empty($selectClause) || empty($fromClause)) { return $sql;