Refactor query string handling and add tests

Refactored query string methods to accept flexible column and option arguments, updated internal naming for consistency, and improved the DslFactory to simplify query string payload construction. Removed legacy simple_query_string support and added the 'type' option for query string types. Added comprehensive tests for query string functionality, including field selection, options, and edge cases.

Author: pdphilip

src/Query/Builder.php

@@ -1568,43 +1568,44 @@ public function orSearchNotFuzzyPrefix($query, mixed $columns = null, $options =
      *
      * @throws Exception
      */
-    public function searchQueryString(mixed $query, string|array $columns = '*', $options = []): self
+    public function searchQueryString(mixed $query, mixed $columns = null, $options = []): self
     {
         return $this->_buildQueryStringWheres($columns, $query, 'and', false, $options);
     }
 
     /**
      * @throws Exception
      */
-    public function orSearchQueryString(mixed $query, string|array $columns = '*', $options = []): self
+    public function orSearchQueryString(mixed $query, mixed $columns = null, $options = []): self
     {
         return $this->_buildQueryStringWheres($columns, $query, 'or', false, $options);
     }
 
     /**
      * @throws Exception
      */
-    public function searchNotQueryString(mixed $query, string|array $columns = '*', $options = []): self
+    public function searchNotQueryString(mixed $query, mixed $columns = null, $options = []): self
     {
         return $this->_buildQueryStringWheres($columns, $query, 'and', true, $options);
     }
 
     /**
      * @throws Exception
      */
-    public function orSearchNotQueryString(mixed $query, string|array $columns = '*', $options = []): self
+    public function orSearchNotQueryString(mixed $query, mixed $columns = null, $options = []): self
     {
         return $this->_buildQueryStringWheres($columns, $query, 'or', true, $options);
     }
 
     /**
      * @throws Exception
      */
-    private function _buildQueryStringWheres($column, $value, $boolean, $not, $options): self
+    private function _buildQueryStringWheres($columns, $value, $boolean, $not, $options): self
     {
         $type = 'QueryString';
+        [$columns, $options] = $this->extractSearch($columns, $options, 'querystring');
         $options = $this->setOptions($options, 'querystring')->toArray();
-        $this->wheres[] = compact('column', 'value', 'type', 'boolean', 'not', 'options');
+        $this->wheres[] = compact('columns', 'value', 'type', 'boolean', 'not', 'options');
 
         return $this;
     }

src/Query/DSL/DslFactory.php

@@ -267,21 +267,16 @@ public static function functionScore(array $query, string $functionType, array $
         ];
     }
 
-    public static function queryString(string|array $field, mixed $query, array $options = [])
+    public static function queryString(mixed $query, mixed $fields, array $options = [])
     {
-        $fields = is_array($field) ? $field : [$field];
-        $type = 'query_string';
-        if (! empty($options['simple_query_string'])) {
-            $type = 'simple_query_string';
+        $payload['query'] = (string) $query;
+        if ($fields) {
+            $payload['fields'] = is_array($fields) ? $fields : [$fields];
         }
-        unset($options['simple_query_string']);
 
         return [
-            $type => array_merge(
-                [
-                    'query' => (string) $query,
-                    'fields' => $fields,
-                ],
+            'query_string' => array_merge(
+                $payload,
                 $options
             ),
         ];

src/Query/Grammar.php

@@ -723,11 +723,11 @@ protected function compileWhereSearch(Builder $builder, array $where): array
 
     private function compileWhereQueryString(Builder $builder, array $where)
     {
-        $fields = $where['column'];
+        $fields = $where['columns'];
         $query = $where['value'];
         $options = $where['options'] ?? [];
 
-        return DslFactory::queryString($fields, $query, $options);
+        return DslFactory::queryString($query, $fields, $options);
     }
 
     /**

src/Query/ManagesOptions.php

@@ -75,7 +75,7 @@ public function extractOptionsWithNot($type, $column, $value, $boolean, $not, $o
         return [$column, $value, $not, $boolean, $options];
     }
 
-    public function extractSearch($columns = null, $options = []): array
+    public function extractSearch($columns = null, $options = [], $as = 'search'): array
     {
         if ($options) {
             return [$columns, $options];
@@ -87,7 +87,7 @@ public function extractSearch($columns = null, $options = []): array
             return [$columns, $options];
         }
         if (is_array($columns)) {
-            $isOptions = $this->validatePossibleOptions($columns, 'search');
+            $isOptions = $this->validatePossibleOptions($columns, $as);
             if ($isOptions) {
                 $options = $columns;
                 $columns = null;

src/Query/Options/QueryStringOptions.php

@@ -6,6 +6,7 @@
  * QueryStringOptions for Query String Queries.
  *
  *
+ * @method $this type(string $value) //Options: best_fields, most_fields, cross_fields, phrase, phrase_prefix, bool_prefix
  * @method $this allowLeadingWildcard(bool $value)
  * @method $this analyzeWildcard(bool $value)
  * @method $this analyzer(string $analyzer)
@@ -24,13 +25,13 @@
  * @method $this quoteFieldSuffix(string $value)
  * @method $this rewrite(string $value)
  * @method $this timeZone(string $value)
- * @method $this simpleQueryString(bool $value)
  */
 class QueryStringOptions extends QueryOptions
 {
     public function allowedOptions(): array
     {
         return [
+            'type',
             'allow_leading_wildcard',
             'analyze_wildcard',
             'analyzer',
@@ -51,12 +52,6 @@ public function allowedOptions(): array
             'quote_field_suffix',
             'rewrite',
             'time_zone',
-            'simple_query_string',
         ];
     }
-
-    public function asSimple()
-    {
-        $this->simpleQueryString(true);
-    }
 }

tests/Models/Product.php

@@ -25,6 +25,7 @@ public static function executeSchema()
 
         $schema->dropIfExists('products');
         $schema->create('products', function (Blueprint $table) {
+            $table->integer('price');
             $table->date('created_at');
             $table->date('updated_at');
         });