Merge pull request #240 from misenhower/fix-import-connection

Use Laravel's query builder in the import command

Author: nticaric

src/Console/ImportCommand.php

@@ -5,6 +5,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Events\Dispatcher;
 use TeamTNT\TNTSearch\TNTSearch;
+use Illuminate\Support\Facades\Schema;
 
 class ImportCommand extends Command
 {
@@ -37,27 +38,27 @@ public function handle(Dispatcher $events)
         $tnt = new TNTSearch();
         $driver = $model->getConnectionName() ?: config('database.default');
         $config = config('scout.tntsearch') + config("database.connections.$driver");
-        $tablePrefix = $config['prefix'] ?? '';
-        $tableName = $tablePrefix.$model->getTable();
+        $db = app('db')->connection($driver);
 
         $tnt->loadConfig($config);
-        $tnt->setDatabaseHandle(app('db')->connection($driver)->getPdo());
+        $tnt->setDatabaseHandle($db->getPdo());
 
         $indexer = $tnt->createIndex($model->searchableAs().'.index');
         $indexer->setPrimaryKey($model->getKeyName());
 
-        $availableColumns = \Schema::getColumnListing($model->getTable());
+        $availableColumns = Schema::connection($driver)->getColumnListing($model->getTable());
         $desiredColumns = array_keys($model->toSearchableArray());
 
-        $fields = implode(', ', array_intersect($desiredColumns, $availableColumns));
+        $fields = array_intersect($desiredColumns, $availableColumns);
 
-        $query = "{$model->getKeyName()}, $fields";
+        $query = $db->table($model->getTable());
 
-        if ($fields == '') {
-            $query = '*';
+        if ($fields) {
+            $query->select($model->getKeyName())
+                ->addSelect($fields);
         }
 
-        $indexer->query("SELECT $query FROM {$tableName};");
+        $indexer->query($query->toSql());
 
         $indexer->run();
         $this->info('All ['.$class.'] records have been imported.');