Merge remote-tracking branch 'origin/dev' into dev-l9

Author: pdphilip

src/DSL/QueryBuilder.php

@@ -313,6 +313,9 @@ private function _parseCondition($condition): array
                 case 'not_between':
                     $queryPart = ['bool' => ['must_not' => ['range' => [$field => ['gte' => $operand[0], 'lte' => $operand[1]]]]]];
                     break;
+                case 'phrase':
+                    $queryPart = ['match_phrase' => [$field => $operand]];
+                    break;
                 case 'nested':
                     $queryPart = [
                         'nested' => [

src/Eloquent/Docs/ModelDocs.php

@@ -19,6 +19,9 @@
  * @method search(array $columns = '*')
  * @method query(array $columns = '*')
  *
+ * @method  $this where(string $column, string $value)
+ * @method  $this whereIn(string $column, array $values)
+ * @method  $this wherePhrase(string $column, string $value)
  * @method  $this filterGeoBox(string $column, array $topLeftCoords, array $bottomRightCoords)
  * @method  $this filterGeoPoint(string $column, string $distance, array $point)
  * @method  $this whereRegex(string $column, string $regex)

src/Query/Builder.php

@@ -323,7 +323,25 @@ public function whereNotNestedObject($column, $callBack, $scoreMode = 'avg')
         return $this;
     }
 
-    
+    /**
+     * @param $column
+     * @param $value
+     *
+     * @return $this
+     */
+    public function wherePhrase($column, $value)
+    {
+        $boolean = 'and';
+        $this->wheres[] = [
+            'column'   => $column,
+            'type'     => 'Basic',
+            'value'    => $value,
+            'operator' => 'phrase',
+            'boolean'  => $boolean,
+        ];
+        
+        return $this;
+    }
 
 
     //----------------------------------------------------------------------

src/Schema/IndexBlueprint.php

@@ -88,9 +88,9 @@ public function geo($field): Definitions\FieldDefinition
         return $this->addField('geo_point', $field);
     }
 
-    public function nested($field): Definitions\FieldDefinition
+    public function nested($field, $params = []): Definitions\FieldDefinition
     {
-        return $this->addField('nested', $field);
+        return $this->addField('nested', $field, $params);
     }
 
     public function alias($field, $path): Definitions\FieldDefinition
@@ -118,6 +118,10 @@ public function map($key, $value): void
         $this->parameters['map'][$key] = $value;
     }
 
+    public function field($type, $field, array $parameters = [])
+    {
+        return $this->addField($type, $field, $parameters);
+    }
 
     //----------------------------------------------------------------------
     // Definitions
@@ -173,12 +177,12 @@ public function buildIndexModify(Connection $connection)
 
     public function increments($column)
     {
-        return $this->addField('text', $column);
+        return $this->addField('keyword', $column);
     }
 
     public function string($column)
     {
-        return $this->addField('text', $column);
+        return $this->addField('keyword', $column);
     }