Working with multiple Clickhouse instances in a project, backward compatibility with old static::getClient

src/BaseModel.php

@@ -167,7 +167,7 @@ class BaseModel
     public static function insert(array $rows): Statement
     {
         $instance = new static();
-        return $instance->getClient()->insert($instance->getTableForInserts(), $rows);
+        return $instance->getThisClient()->insert($instance->getTableForInserts(), $rows);
     }
 
     /**
@@ -180,7 +180,7 @@ class BaseModel
     public static function insertBulk(array $rows, array $columns = []): Statement
     {
         $instance = new static();
-        return $instance->getClient()->insert($instance->getTableForInserts(), $rows, $columns);
+        return $instance->getThisClient()->insert($instance->getTableForInserts(), $rows, $columns);
     }
 
     /**
@@ -193,7 +193,7 @@ class BaseModel
     {
         $rows = array_map('static::prepareFromRequest', $rows, $columns);
         $instance = new static();
-        return $instance->getClient()->insert($instance->getTableForInserts(), $rows, $columns);
+        return $instance->getThisClient()->insert($instance->getTableForInserts(), $rows, $columns);
     }
 
     /**
@@ -212,7 +212,7 @@ class BaseModel
             }
         }
         $instance = new static();
-        return $instance->getClient()->insertAssocBulk($instance->getTableForInserts(), $rows);
+        return $instance->getThisClient()->insertAssocBulk($instance->getTableForInserts(), $rows);
     }
 
     /**
@@ -256,7 +256,7 @@ class BaseModel
     public static function select($select = ['*']): Builder
     {
         $instance = new static();
-        return (new Builder($instance->getClient()))->select($select)->from($instance->getTable());
+        return (new Builder($instance->getThisClient()))->select($select)->from($instance->getTable());
     }
 
     /**
@@ -328,13 +328,13 @@ class BaseModel
             $sql .= " FINAL";
         }
 
-        return $instance->getClient()->write($sql);
+        return $instance->getThisClient()->write($sql);
     }
 
     public static function truncate(): Statement
     {
         $instance = new static();
-        return $instance->getClient()->write('TRUNCATE TABLE ' . $instance->getTableSources());
+        return $instance->getThisClient()->write('TRUNCATE TABLE ' . $instance->getTableSources());
     }
 
     /**
@@ -347,7 +347,7 @@ class BaseModel
     public static function where($column, $operator = null, $value = null, string $concatOperator = Operator::AND): Builder
     {
         $instance = new static();
-        $builder = (new Builder($instance->getClient()))->select(['*'])
+        $builder = (new Builder($instance->getThisClient()))->select(['*'])
             ->from($instance->getTable())
             ->setSourcesTable($instance->getTableSources());
         if (is_null($value)) {
@@ -367,7 +367,7 @@ class BaseModel
     public static function whereRaw(string $expression): Builder
     {
         $instance = new static();
-        return (new Builder($instance->getClient()))->select(['*'])
+        return (new Builder($instance->getThisClient()))->select(['*'])
             ->from($instance->getTable())
             ->setSourcesTable($instance->getTableSources())
             ->whereRaw($expression);

src/Builder.php

@@ -31,7 +31,7 @@ class Builder extends BaseBuilder
     public function __construct(Client $client = null)
     {
         $this->grammar = new Grammar();
-        $this->client = $client ?? $this->getClient();
+        $this->client = $client ?? $this->getThisClient();
     }
 
     /**

src/Migration.php

@@ -33,6 +33,6 @@ class Migration extends BaseMigration
                 return new Statement(new CurlerRequest());
             }
         }
-        return $instance->getClient()->write($sql, $bindings);
+        return $instance->getThisClient()->write($sql, $bindings);
     }
 }

src/WithClient.php

@@ -7,8 +7,17 @@ use Illuminate\Support\Facades\DB;
 
 trait WithClient
 {
-    public function getClient(): Client
+    public function getThisClient(): Client
     {
         return DB::connection($this->connection)->getClient();
     }
+
+    /**
+     * @return Client
+     * @deprecated use $this->getThisClient() instead
+     */
+    public static function getClient(): Client
+    {
+        return DB::connection((new static())->connection)->getClient();
+    }
 }