Several upgrades and bug fixes

Author: pdphilip

src/Connection.php

@@ -5,51 +5,53 @@
 use PDPhilip\Elasticsearch\DSL\Bridge;
 use Elasticsearch\ClientBuilder;
 use Illuminate\Database\Connection as BaseConnection;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
-use InvalidArgumentException;
-use phpDocumentor\Reflection\Types\Scalar;
 use RuntimeException;
 
 
 class Connection extends BaseConnection
 {
-
+    
     protected $client;
     protected $index;
     protected $maxSize;
     protected $indexPrefix;
-
-
+    
+    
     public function __construct(array $config)
     {
         $this->config = $config;
-
+        
         if (!empty($config['index_prefix'])) {
             $this->indexPrefix = $config['index_prefix'];
         }
-
+        
         $this->client = $this->buildConnection();
-
+        
         $this->useDefaultPostProcessor();
-
+        
         $this->useDefaultSchemaGrammar();
-
+        
         $this->useDefaultQueryGrammar();
-
+        
     }
-
+    
+    public function setIndexPrefix($newPrefix)
+    {
+        $this->indexPrefix = $newPrefix;
+    }
+    
     public function getIndexPrefix()
     {
         return $this->indexPrefix;
     }
-
-
+    
+    
     public function getTablePrefix()
     {
         return $this->getIndexPrefix();
     }
-
+    
     public function setIndex($index)
     {
         $this->index = $index;
@@ -58,98 +60,99 @@ public function setIndex($index)
                 $this->index = $this->indexPrefix.'_'.$index;
             }
         }
-
+        
         return $this->getIndex();
     }
-
+    
     public function getSchemaGrammar()
     {
         return new Schema\Grammar($this);
     }
-
+    
     public function getIndex()
     {
         return $this->index;
     }
-
+    
     public function setMaxSize($value)
     {
         $this->maxSize = $value;
     }
-
+    
     public function table($table, $as = null)
     {
-        return $this->setIndex($table);
+        $query = new Query\Builder($this, new Query\Processor());
+        
+        return $query->from($table);
     }
-
-
+    
     /**
      * @inheritdoc
      */
     public function getSchemaBuilder()
     {
         return new Schema\Builder($this);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function disconnect()
     {
         unset($this->connection);
     }
-
-
+    
+    
     /**
      * @inheritdoc
      */
     public function getDriverName()
     {
         return 'elasticsearch';
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultPostProcessor()
     {
         return new Query\Processor();
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultQueryGrammar()
     {
         return new Query\Grammar();
     }
-
+    
     /**
      * @inheritdoc
      */
     protected function getDefaultSchemaGrammar()
     {
         return new Schema\Grammar();
     }
-
-
+    
+    
     //----------------------------------------------------------------------
     // Connection Builder
     //----------------------------------------------------------------------
-
+    
     protected function buildConnection()
     {
         $type = config('database.connections.elasticsearch.auth_type') ?? null;
         $type = strtolower($type);
         if (!in_array($type, ['http', 'cloud', 'api'])) {
             throw new RuntimeException('Invalid [auth_type] in database config. Must be: http, cloud or api');
         }
-
+        
         return $this->{'_'.$type.'Connection'}();
-
+        
     }
-
+    
     protected function _httpConnection()
     {
         $hosts = config('database.connections.elasticsearch.hosts') ?? null;
@@ -163,10 +166,10 @@ protected function _httpConnection()
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
+        
         return $cb->build();
     }
-
+    
     protected function _cloudConnection()
     {
         $cloudId = config('database.connections.elasticsearch.cloud_id') ?? null;
@@ -184,11 +187,11 @@ protected function _cloudConnection()
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
+        
         return $cb->build();
     }
-
-
+    
+    
     protected function _apiConnection()
     {
         $apiId = config('database.connections.elasticsearch.api_id') ?? null;
@@ -198,19 +201,23 @@ protected function _apiConnection()
         if ($certPath) {
             $cb->setSSLVerification($certPath);
         }
-
+        
         return $cb->build();
     }
-
-
+    
+    
     //----------------------------------------------------------------------
     // Dynamic call routing to DSL bridge
     //----------------------------------------------------------------------
-
+    
     public function __call($method, $parameters)
     {
+        if (!$this->index) {
+            $this->index = $this->indexPrefix.'*';
+        }
+        
         $bridge = new Bridge($this->client, $this->index, $this->maxSize);
-
+        
         return $bridge->{'process'.Str::studly($method)}(...$parameters);
     }
 }