Merge pull request #15446 from Zanzofily/fix/query-builder-text-const…

…raints-pgsql Fix: QueryBuilder's TextConstraint for Postgres
filamentphp · Jan 31, 2025 · 9141746 · 9141746
2 parents ebfe69b + 4660d73
commit 9141746
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 20 deletions.
diff --git a/...tables/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/ContainsOperator.php b/...tables/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/ContainsOperator.php
@@ -61,12 +61,18 @@ public function apply(Builder $query, string $qualifiedColumn): Builder
 
         $isPostgres = $databaseConnection->getDriverName() === 'pgsql';
 
-        if ((Str::lower($qualifiedColumn) !== $qualifiedColumn) && $isPostgres) {
-            $qualifiedColumn = (string) str($qualifiedColumn)->wrap('"');
-        }
-
         if ($isPostgres) {
-            $qualifiedColumn = new Expression("lower({$qualifiedColumn}::text)");
+            [$table, $column] = explode('.', $qualifiedColumn);
+
+            if (Str::lower($table) !== $table) {
+                $table = (string) str($table)->wrap('"');
+            }
+
+            if (Str::lower($column) !== $column) {
+                $column = (string) str($column)->wrap('"');
+            }
+
+            $qualifiedColumn = new Expression("lower({$table}.{$column}::text)");
             $text = Str::lower($text);
         }
 

diff --git a/...tables/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/EndsWithOperator.php b/...tables/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/EndsWithOperator.php
@@ -61,12 +61,18 @@ public function apply(Builder $query, string $qualifiedColumn): Builder
 
         $isPostgres = $databaseConnection->getDriverName() === 'pgsql';
 
-        if ((Str::lower($qualifiedColumn) !== $qualifiedColumn) && $isPostgres) {
-            $qualifiedColumn = (string) str($qualifiedColumn)->wrap('"');
-        }
-
         if ($isPostgres) {
-            $qualifiedColumn = new Expression("lower({$qualifiedColumn}::text)");
+            [$table, $column] = explode('.', $qualifiedColumn);
+
+            if (Str::lower($table) !== $table) {
+                $table = (string) str($table)->wrap('"');
+            }
+
+            if (Str::lower($column) !== $column) {
+                $column = (string) str($column)->wrap('"');
+            }
+
+            $qualifiedColumn = new Expression("lower({$table}.{$column}::text)");
             $text = Str::lower($text);
         }
 

diff --git a/...s/tables/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/EqualsOperator.php b/...s/tables/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/EqualsOperator.php
@@ -61,12 +61,18 @@ public function apply(Builder $query, string $qualifiedColumn): Builder
 
         $isPostgres = $databaseConnection->getDriverName() === 'pgsql';
 
-        if ((Str::lower($qualifiedColumn) !== $qualifiedColumn) && $isPostgres) {
-            $qualifiedColumn = (string) str($qualifiedColumn)->wrap('"');
-        }
-
         if ($isPostgres) {
-            $qualifiedColumn = new Expression("lower({$qualifiedColumn}::text)");
+            [$table, $column] = explode('.', $qualifiedColumn);
+
+            if (Str::lower($table) !== $table) {
+                $table = (string) str($table)->wrap('"');
+            }
+
+            if (Str::lower($column) !== $column) {
+                $column = (string) str($column)->wrap('"');
+            }
+
+            $qualifiedColumn = new Expression("lower({$table}.{$column}::text)");
             $text = Str::lower($text);
         }
 

diff --git a/...bles/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/StartsWithOperator.php b/...bles/src/Filters/QueryBuilder/Constraints/TextConstraint/Operators/StartsWithOperator.php
@@ -61,12 +61,18 @@ public function apply(Builder $query, string $qualifiedColumn): Builder
 
         $isPostgres = $databaseConnection->getDriverName() === 'pgsql';
 
-        if ((Str::lower($qualifiedColumn) !== $qualifiedColumn) && $isPostgres) {
-            $qualifiedColumn = (string) str($qualifiedColumn)->wrap('"');
-        }
-
         if ($isPostgres) {
-            $qualifiedColumn = new Expression("lower({$qualifiedColumn}::text)");
+            [$table, $column] = explode('.', $qualifiedColumn);
+
+            if (Str::lower($table) !== $table) {
+                $table = (string) str($table)->wrap('"');
+            }
+
+            if (Str::lower($column) !== $column) {
+                $column = (string) str($column)->wrap('"');
+            }
+
+            $qualifiedColumn = new Expression("lower({$table}.{$column}::text)");
             $text = Str::lower($text);
         }