Merge branch 'master' into 2.1-merge

Author: limingxinleo

src/Console/ImportCommand.php

@@ -16,6 +16,7 @@
 use Hyperf\Utils\ApplicationContext;
 use Psr\EventDispatcher\ListenerProviderInterface;
 use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
 
 class ImportCommand extends Command
 {
@@ -40,16 +41,27 @@ public function handle()
     {
         define('SCOUT_COMMAND', true);
         $class = $this->input->getArgument('model');
+        $chunk = (int) $this->input->getOption('chunk');
+        $column = (string) $this->input->getOption('column');
         $model = new $class();
         $provider = ApplicationContext::getContainer()->get(ListenerProviderInterface::class);
         $provider->on(ModelsImported::class, function ($event) use ($class) {
+            /** @var ModelsImported $event */
             $key = $event->models->last()->getScoutKey();
             $this->line('<comment>Imported [' . $class . '] models up to ID:</comment> ' . $key);
         });
-        $model::makeAllSearchable();
+        $model::makeAllSearchable($chunk ?: null, $column ?: null);
         $this->info('All [' . $class . '] records have been imported.');
     }
 
+    protected function getOptions()
+    {
+        return [
+            ['column', 'c', InputOption::VALUE_OPTIONAL, 'Column used in chunking. (Default use primary key)'],
+            ['chunk', '', InputOption::VALUE_OPTIONAL, 'The number of records to import at a time (Defaults to configuration value: `scout.chunk.searchable`)'],
+        ];
+    }
+
     protected function getArguments()
     {
         return [

src/Searchable.php

@@ -111,16 +111,16 @@ public static function search(?string $query = '', ?\Closure $callback = null)
     /**
      * Make all instances of the model searchable.
      */
-    public static function makeAllSearchable()
+    public static function makeAllSearchable(?int $chunk = null, ?string $column = null)
     {
         $self = new static();
         $softDelete = static::usesSoftDelete() && config('scout.soft_delete', false);
         $self->newQuery()
             ->when($softDelete, function ($query) {
                 $query->withTrashed();
             })
-            ->orderBy($self->getKeyName())
-            ->searchable();
+            ->orderBy($column ?: $self->getKeyName())
+            ->searchable($chunk, $column);
     }
 
     /**

src/SearchableScope.php

@@ -33,12 +33,16 @@ public function apply(EloquentBuilder $builder, Model $model)
      */
     public function extend(EloquentBuilder $builder)
     {
-        $builder->macro('searchable', function (EloquentBuilder $builder, $chunk = null) {
-            $builder->chunk($chunk ?: config('scout.chunk.searchable', 500), function ($models) {
+        $builder->macro('searchable', function (EloquentBuilder $builder, $chunk = null, $column = null) {
+            $callback = function ($models) {
                 $models->filter->shouldBeSearchable()->searchable();
                 $dispatcher = ApplicationContext::getContainer()->get(EventDispatcherInterface::class);
                 $dispatcher->dispatch(new ModelsImported($models));
-            });
+            };
+
+            $chunk = $chunk ?: config('scout.chunk.searchable', 500);
+
+            $column ? $builder->chunkById($chunk, $callback, $column) : $builder->chunk($chunk, $callback);
         });
         $builder->macro('unsearchable', function (EloquentBuilder $builder, $chunk = null) {
             $builder->chunk($chunk ?: config('scout.chunk.unsearchable', 500), function ($models) {