Multiple connections can be established even if moved to Global.

Author: muhammetsafak

src/Database.php

@@ -37,6 +37,8 @@ class Database extends QueryBuilder
 
     private PDO $_pdo;
 
+    private bool $isGlobal = false;
+
     private static PDO $_globalPDO;
 
     private array $_credentials = [
@@ -75,7 +77,6 @@ class Database extends QueryBuilder
         'testMode'  => false,
     ];
 
-
     private array $_errors = [];
 
     private Validation $_validation;
@@ -97,7 +98,18 @@ public function __call($name, $arguments)
 
     final public function newInstance(array $credentials = []): Database
     {
-        return new self(empty($credentials) ? $this->_credentials : \array_merge($this->_credentials, $credentials));
+        $instance = new Database(empty($credentials) ? $this->_credentials : \array_merge($this->_credentials, $credentials));
+        $instance->isGlobal = false;
+
+        return $instance;
+    }
+
+    final public function clone(): Database
+    {
+        $clone = new self($this->_credentials);
+        $clone->isGlobal = $this->isGlobal;
+
+        return $clone;
     }
 
     final public function setCredentials(array $credentials): self
@@ -124,11 +136,12 @@ final public function getError(): array
     final public function connectionAsGlobal(): void
     {
         self::$_globalPDO = $this->getPDO();
+        $this->isGlobal = true;
     }
 
     final public function getPDO(): PDO
     {
-        if(isset(self::$_globalPDO)){
+        if(isset(self::$_globalPDO) && $this->isGlobal){
             return self::$_globalPDO;
         }
         if(!isset($this->_pdo)){

src/Facade/DB.php

@@ -158,6 +158,13 @@ public static function createImmutable(array $credentials): Database
         return self::$databaseInstance = new Database($credentials);
     }
 
+    public static function connect(array $credentials): Database
+    {
+        return isset(self::$databaseInstance)
+            ? self::getDatabase()->newInstance($credentials)
+            : self::createImmutable($credentials);
+    }
+
     private static function getDatabase(): Database
     {
         return self::$databaseInstance;

src/Helpers/Validation.php

@@ -147,7 +147,7 @@ protected function is_unique($data, $column, $schemaID = null): bool
         if($this->db->getSchemaID() === null){
             throw new ValidationException('You need a model with a PRIMARY KEY to use the is_unique validation.');
         }
-        $db = $this->db->newInstance();
+        $db = $this->db->clone();
         $db->reset();
         $parameters = Parameters::get(true);
         $db->select($db->getSchemaID())->offset(0)