From a6c51f5f173e5138308a6d07c454874e4eaa1470 Mon Sep 17 00:00:00 2001
From: Gregory Letellier <gregory_letellier@hotmail.com>
Date: Fri, 3 Nov 2023 08:58:42 +0100
Subject: [PATCH] =?UTF-8?q?renommage=20de=20l'objet=20DB=20en=20Connection?=
 =?UTF-8?q?,=20suppression=20de=20la=20variable=20priv=C3=A9e=20db=20dans?=
 =?UTF-8?q?=20le=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/{Db.php => Connection.php} |  6 +++---
 src/Model.php                  | 13 +++++--------
 src/QueryBuilder.php           |  4 ++--
 tests/DbTest.php               |  6 +++---
 4 files changed, 13 insertions(+), 16 deletions(-)
 rename src/{Db.php => Connection.php} (97%)

diff --git a/src/Db.php b/src/Connection.php
similarity index 97%
rename from src/Db.php
rename to src/Connection.php
index a599e98..8d977cb 100644
--- a/src/Db.php
+++ b/src/Connection.php
@@ -6,7 +6,7 @@ use Dotenv\Dotenv;
 use PDO;
 use PDOStatement;
 
-class Db
+class Connection
 {
     protected PDO $pdo;
     protected string $name;
@@ -170,7 +170,7 @@ class Db
     {
         foreach ($connections as $connection) {
             if (!isset(self::$instances[$connection])) {
-                self::$instances[$connection] = new Db($connection, $config);
+                self::$instances[$connection] = new Connection($connection, $config);
             }
         }         
     }
@@ -183,7 +183,7 @@ class Db
         } 
         if (isset(self::$instances[$connection])) {
             $instance = self::$instances[$connection];
-            if ($instance instanceof Db) {
+            if ($instance instanceof Connection) {
                 return self::$instances[$connection];
             }
         }   
diff --git a/src/Model.php b/src/Model.php
index 682cb01..65e0bd9 100644
--- a/src/Model.php
+++ b/src/Model.php
@@ -8,13 +8,11 @@ class Model
     protected array $updated;
     protected string $table;
     protected string $connection = "";
-    protected string $pk;
-    private ?Db $db;
+    protected string $pk; 
     private bool $new;
 
     public function __construct()
-    {
-        $this->db = null;
+    { 
         $this->new = true;
         $this->values = array();
         $this->updated = array();
@@ -64,13 +62,12 @@ class Model
     }
 
     public function save(): bool
-    {
-        $this->db = Db::getInstance($this->connection);
+    { 
         $ret = false;
         $qb = $this->newQueryBuilder();
         if ($this->new) {
             $query = $qb->getPreparedQuery($this->values);
-            $id = $this->db->insertQuery($query);
+            $id = Connection::getInstance($this->connection)->insertQuery($query);
             if ($id !== false) {
                 $this->values[$this->pk] = $id;
                 $this->new = false;
@@ -85,7 +82,7 @@ class Model
                         $data[$updatecol] = $this->values[$updatecol];
                     }
                     $query = $qb->getPreparedQuery($data, false);
-                    $ret = $this->db->updateQuery($query);
+                    $ret = Connection::getInstance($this->connection)->updateQuery($query);
                     if ($ret) {
                         $this->updated = [];
                     }
diff --git a/src/QueryBuilder.php b/src/QueryBuilder.php
index 5ff6b49..aaa64f3 100644
--- a/src/QueryBuilder.php
+++ b/src/QueryBuilder.php
@@ -4,7 +4,7 @@ namespace Kletellier\PdoWrapper;
 
 class QueryBuilder
 {
-    protected ?Db $db;
+    protected ?Connection $db;
     protected array $columns;
     protected array $wheres;
     protected array $orders;
@@ -197,7 +197,7 @@ class QueryBuilder
 
     private function getData(): mixed
     {
-        $this->db = Db::getInstance($this->connection);
+        $this->db = Connection::getInstance($this->connection);
         return $this->db->getSelectQuery($this->getQuery());
     }
 
diff --git a/tests/DbTest.php b/tests/DbTest.php
index a53d001..3c062b3 100644
--- a/tests/DbTest.php
+++ b/tests/DbTest.php
@@ -1,18 +1,18 @@
 <?php
 
 use Kletellier\PdoWrapper\Collection;
-use Kletellier\PdoWrapper\Db;
+use Kletellier\PdoWrapper\Connection;
 use Kletellier\PdoWrapper\EventDispatcher;
 use Kletellier\PdoWrapper\Model;
 use Kletellier\PdoWrapper\QueryBuilder;
 
 test("create db",function () {
     $config = ["conone" => ["TYPE"=>"sqlite", "DATABASE" => ":memory:" ], "contwo"=>["TYPE"=>"sqlite", "DATABASE" => ":memory:" ]];
-    $db = Db::init($config,["conone","contwo"]);
+    $db = Connection::init($config,["conone","contwo"]);
     $ret = $db->executeRawQuery("CREATE TABLE test (id INTEGER PRIMARY KEY AUTOINCREMENT, col1 VARCHAR, date1 DATETIME);");
     expect($ret)->toBe(true);
 
-    $db2 = Db::getInstance("contwo");
+    $db2 = Connection::getInstance("contwo");
     $ret = $db2->executeRawQuery("CREATE TABLE test (id INTEGER PRIMARY KEY AUTOINCREMENT, col1 VARCHAR, date1 DATETIME);");
     expect($ret)->toBe(true);
 });