wip

Author: pascalbaljet

src/DatabaseGrammarFactory.php

@@ -29,16 +29,11 @@ public static function make(Connection $connection): SearchGrammarInterface
     {
         $driver = $connection->getDriverName();
 
-        switch ($driver) {
-            case 'mysql':
-            case 'mariadb':
-                return new MySqlSearchGrammar($connection);
-            case 'pgsql':
-                return new PostgreSqlSearchGrammar($connection);
-            case 'sqlite':
-                return new SQLiteSearchGrammar($connection);
-            default:
-                throw InvalidGrammarException::driverNotSupported($driver);
-        }
+        return match ($driver) {
+            'mysql', 'mariadb' => new MySqlSearchGrammar($connection),
+            'pgsql' => new PostgreSqlSearchGrammar($connection),
+            'sqlite' => new SQLiteSearchGrammar($connection),
+            default => throw InvalidGrammarException::driverNotSupported($driver),
+        };
     }
 }

src/Grammars/MySqlSearchGrammar.php

@@ -13,17 +13,14 @@
  */
 class MySqlSearchGrammar implements SearchGrammarInterface
 {
-    protected Connection $connection;
-
     protected MySqlGrammar $grammar;
 
     /**
      * Create a new MySQL search grammar instance.
      */
-    public function __construct(Connection $connection)
+    public function __construct(protected Connection $connection)
     {
-        $this->connection = $connection;
-        $this->grammar = new MySqlGrammar($connection);
+        $this->grammar = new MySqlGrammar($this->connection);
     }
 
     public function wrap(string|Expression $value): string

src/Grammars/PostgreSqlSearchGrammar.php

@@ -25,6 +25,14 @@ public function __construct(protected Connection $connection)
 
     public function wrap(string|Expression $value): string
     {
+        // Handle JSON columns specially for PostgreSQL
+        if (is_string($value) && str_contains($value, '->>')) {
+            // Split the JSON column path for proper wrapping
+            [$table_column, $jsonPath] = explode('->>', $value, 2);
+            // For PostgreSQL, we need to cast string columns to JSON first when using JSON operators
+            return "(" . $this->grammar->wrap($table_column) . ")::json->>" . $jsonPath;
+        }
+        
         return $this->grammar->wrap($value);
     }
 
@@ -33,6 +41,17 @@ public function wrap(string|Expression $value): string
      */
     public function caseInsensitive(string $column): string
     {
+        // Handle JSON columns by casting to text first for PostgreSQL
+        if (str_contains($column, '->>')) {
+            // First cast the base column to JSON, then extract the value, then cast to text
+            $parts = explode('->>', $column, 2);
+            if (count($parts) === 2) {
+                $baseColumn = $parts[0];
+                $jsonPath = $parts[1];
+                return "LOWER(({$baseColumn})::json->>{$jsonPath}::text)";
+            }
+        }
+        
         return "LOWER({$column})";
     }
 

src/Grammars/SQLiteSearchGrammar.php

@@ -13,17 +13,14 @@
  */
 class SQLiteSearchGrammar implements SearchGrammarInterface
 {
-    protected Connection $connection;
-
     protected SQLiteGrammar $grammar;
 
     /**
      * Create a new SQLite search grammar instance.
      */
-    public function __construct(Connection $connection)
+    public function __construct(protected Connection $connection)
     {
-        $this->connection = $connection;
-        $this->grammar = new SQLiteGrammar($connection);
+        $this->grammar = new SQLiteGrammar($this->connection);
     }
 
     public function wrap(string|Expression $value): string
@@ -46,7 +43,7 @@ public function coalesce(array $values): string
     {
         // SQLite requires at least 2 arguments for COALESCE
         if (count($values) === 1) {
-            return (string) $values[0];
+            return $values[0];
         }
 
         $valueList = implode(',', $values);

src/ModelToSearchThrough.php

@@ -6,14 +6,15 @@
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Expression;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 
 readonly class ModelToSearchThrough
 {
     /**
      * @param  Builder<Model>  $builder  Builder to search through
-     * @param  Collection<int, string>  $columns  The columns to search through
+     * @param  Collection<int, string|Expression>  $columns  The columns to search through
      * @param  string  $orderByColumn  Order column
      * @param  int  $key  Unique key of this instance
      * @param  bool  $fullText  Full-text search
@@ -59,7 +60,7 @@ public function getFreshBuilder(): Builder
     /**
      * Get a collection with all columns or relations to search through.
      *
-     * @return Collection<int, string>
+     * @return Collection<int, string|Expression>
      */
     public function getColumns(): Collection
     {
@@ -69,7 +70,7 @@ public function getColumns(): Collection
     /**
      * Create a new instance with different columns to search through.
      *
-     * @param  Collection<int, string>  $columns
+     * @param  Collection<int, string|Expression>  $columns
      */
     public function setColumns(Collection $columns): self
     {
@@ -88,11 +89,11 @@ public function setColumns(Collection $columns): self
      * Get a collection with all qualified columns
      * to search through.
      *
-     * @return Collection<int, string>
+     * @return Collection<int, string|Expression>
      */
     public function getQualifiedColumns(): Collection
     {
-        return $this->columns->map(fn (string $column) => $this->qualifyColumn($column));
+        return $this->columns->map(fn($column): \Illuminate\Database\Query\Expression|string => $column instanceof Expression ? $column : $this->qualifyColumn($column));
     }
 
     /**
@@ -125,6 +126,14 @@ public function qualifyColumn(string $column): string
         return $this->getModel()->qualifyColumn($column);
     }
 
+    /**
+     * Check if a column is a raw expression.
+     */
+    public function isRawExpression(mixed $column): bool
+    {
+        return $column instanceof Expression;
+    }
+
     /**
      * Get the qualified key name.
      */