Default limit from model

- Default limit comes from model
- removed default property type casting as to be inline with Laravel

Author: pdphilip

src/Connection.php

@@ -328,6 +328,11 @@ protected function getDefaultPostProcessor(): Query\Processor
         return new Query\Processor;
     }
 
+    public function getDefaultLimit(): int
+    {
+        return $this->defaultQueryLimit;
+    }
+
     // ----------------------------------------------------------------------
     // Connection Setters
     // ----------------------------------------------------------------------

src/Eloquent/ElasticsearchModel.php

@@ -32,13 +32,33 @@ trait ElasticsearchModel
 
     protected ?Relation $parentRelation;
 
-    protected int $defaultLimit = 1000;
+    /**
+     * The default results limit for the model.
+     *
+     * @var int
+     */
+    protected $defaultLimit = 0;
 
-    protected array $mappingMap = [];
+    /**
+     * The default field mapping that will be used to validate keyword fields
+     *
+     * @var array
+     */
+    protected $mappingMap = [];
 
-    protected bool $generatesUniqueIds = false;
+    /**
+     * Model generates unique ids or Elasticsearch generates them.
+     *
+     * @var bool
+     */
+    protected $generatesUniqueIds = false;
 
-    protected bool $storeIdInDocument = false;
+    /**
+     * Option to store the id in the document.
+     *
+     * @var bool
+     */
+    protected $storeIdInDocument = false;
 
     // ----------------------------------------------------------------------
     // Meta

src/Eloquent/Model.php

@@ -26,7 +26,12 @@ public function __construct(array $attributes = [])
         if (empty($this->attributes['id']) && $this->generatesUniqueIds) {
             $this->attributes['id'] = $this->newUniqueId();
         }
-        $this->meta = new ModelMeta($this->getTable(), $this->getConnection()->getTablePrefix());
+        $connection = $this->getConnection();
+        $this->meta = new ModelMeta($this->getTable(), $connection->getTablePrefix());
+        if (! $this->defaultLimit) {
+            $this->defaultLimit = $connection->getDefaultLimit();
+        }
+
     }
 
     public function getTable()

src/Query/Builder.php

@@ -2076,12 +2076,17 @@ public function withSuffix(string $suffix): self
 
     public function getLimit(): int
     {
-        return $this->getSetLimit() > 0 ? $this->getSetLimit() : $this->connection->defaultQueryLimit;
+        return $this->getSetLimit() ?? $this->getDefaultLimit() ?? $this->connection->getDefaultLimit();
     }
 
-    public function getSetLimit(): int
+    public function getSetLimit(): ?int
     {
-        return $this->options()->get('limit', $this->limit) ?? 0;
+        return $this->options()->get('limit', $this->limit) ?? null;
+    }
+
+    public function getDefaultLimit(): ?int
+    {
+        return $this->options()->get('default_limit', $this->limit) ?? null;
     }
 
     protected function hasProcessedSelect(): bool

src/Query/Grammar.php

@@ -205,7 +205,7 @@ public function compileSelect($query): array
 
                 }
                 $dsl->setBody(['aggs'], $this->compileNestedTermAggregations($fields, $query, $aggs));
-                $dsl->setBody(['size'], $query->getSetLimit());
+                $dsl->setBody(['size'], $query->getSetLimit() ?? 0);
                 $dsl->unsetBody(['sort']);
             } else {
                 // else nothing to aggregate - just a normal query as all records will be distinct anyway
@@ -1053,7 +1053,7 @@ protected function compileCategorizeTextAggregation(Builder $builder, array $agg
     protected function compileCompositeAggregation(Builder $builder, array $aggregation): array
     {
         $sources = $aggregation['args'];
-        $size = $builder->getSetLimit();
+        $size = $builder->getSetLimit() ?? 0;
         $afterKey = $builder->afterKey ?? null;
         $options = $aggregation['options'] ?? [];
 

tests/Models/Post.php

@@ -16,7 +16,7 @@ class Post extends Model
 
     protected static $unguarded = true;
 
-    protected array $mappingMap = [
+    protected $mappingMap = [
         'comments.country' => 'comments.country.keyword',
         'comments.likes' => 'comments.likes',
     ];

tests/Models/User.php

@@ -33,7 +33,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         'member_status' => MemberStatus::class,
     ];
 
-    protected array $mappingMap = [
+    protected $mappingMap = [
         'title' => 'title.keyword',
     ];