cast extended models when loading from database

composer.json

@@ -4,7 +4,8 @@
     "type": "library",
     "require": {
         "vlucas/phpdotenv": "^5.5",
-        "evenement/evenement": "^3.0"
+        "evenement/evenement": "^3.0",
+        "symfony/var-dumper": "^6.3"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.4",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7b31fc4374d54dc20d8f35625a8f74a7",
+    "content-hash": "ef49a4d31601e74941ecce68ae0ff3ff",
     "packages": [
         {
             "name": "evenement/evenement",
@@ -190,6 +190,73 @@
             ],
             "time": "2023-02-25T19:38:58+00:00"
         },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.4-dev"
+                },
+                "thanks": {
+                    "name": "symfony/contracts",
+                    "url": "https://github.com/symfony/contracts"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-23T14:45:45+00:00"
+        },
         {
             "name": "symfony/polyfill-ctype",
             "version": "v1.28.0",
@@ -438,6 +505,90 @@
             ],
             "time": "2023-01-26T09:26:14+00:00"
         },
+        {
+            "name": "symfony/var-dumper",
+            "version": "v6.3.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/var-dumper.git",
+                "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/999ede244507c32b8e43aebaa10e9fce20de7c97",
+                "reference": "999ede244507c32b8e43aebaa10e9fce20de7c97",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/console": "<5.4"
+            },
+            "require-dev": {
+                "ext-iconv": "*",
+                "symfony/console": "^5.4|^6.0",
+                "symfony/http-kernel": "^5.4|^6.0",
+                "symfony/process": "^5.4|^6.0",
+                "symfony/uid": "^5.4|^6.0",
+                "twig/twig": "^2.13|^3.0.4"
+            },
+            "bin": [
+                "Resources/bin/var-dump-server"
+            ],
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions/dump.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\VarDumper\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides mechanisms for walking through any arbitrary PHP variable",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "debug",
+                "dump"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/var-dumper/tree/v6.3.6"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-10-12T18:45:56+00:00"
+        },
         {
             "name": "vlucas/phpdotenv",
             "version": "v5.5.0",
@@ -3653,73 +3804,6 @@
             ],
             "time": "2023-08-16T10:10:12+00:00"
         },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "3.4-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-05-23T14:45:45+00:00"
-        },
         {
             "name": "symfony/filesystem",
             "version": "v6.3.1",

phpunit.xml

@@ -16,7 +16,7 @@
         </include>
     </coverage>
     <php>         
-        <env name="DB_TYPE" value="sqlite"/>
-        <env name="DB_DATABASE" value=":memory:"/> 
+        <env name="DB_DEFAULT_TYPE" value="sqlite"/>
+        <env name="DB_DEFAULT_DATABASE" value=":memory:"/> 
     </php>
 </phpunit>

src/Collection.php

@@ -3,10 +3,12 @@
 namespace Kletellier\PdoWrapper;
 
 use ArrayIterator;
+use Countable;
 use IteratorAggregate;
+use JsonSerializable;
 use Traversable;
 
-class Collection implements IteratorAggregate
+class Collection implements IteratorAggregate, Countable, JsonSerializable
 {
     private array $elements;
 
@@ -36,6 +38,19 @@ class Collection implements IteratorAggregate
         return count($this->elements) == 0;
     }
 
+    public function index($index): mixed
+    {
+        if (isset($this->elements[$index])) {
+            return $this->elements[$index];
+        }
+        return null;
+    }
+
+    public function random(): mixed
+    {
+        return array_rand($this->elements);
+    }
+
     public function reduce(callable $fn, mixed $initial): mixed
     {
         return array_reduce($this->elements, $fn, $initial);
@@ -43,8 +58,7 @@ class Collection implements IteratorAggregate
 
     public function map(callable $fn): Collection
     {
-        $tmp = array_map($fn, $this->elements);
-        return new Collection($tmp);
+        return new Collection(array_map($fn, $this->elements));
     }
 
     public function each(callable $fn): void
@@ -54,9 +68,24 @@ class Collection implements IteratorAggregate
 
     public function filter(callable $fn): Collection
     {
-        $tmp = array_filter($this->elements, $fn, ARRAY_FILTER_USE_BOTH);
-        $collect = new Collection($tmp);
-        return $collect;
+        return new Collection(array_filter($this->elements, $fn, ARRAY_FILTER_USE_BOTH));
+    }
+
+    public function pluck(string $key): Collection
+    {
+        return new Collection(array_map(function ($item) use ($key) {
+            if (is_object($item)) {
+                return isset($item->$key) ? $item->$key : null;
+            }
+            if (is_array($item)) {
+                return isset($item[$key]) ? $item[$key] : null;
+            }
+        }, $this->elements));
+    }
+
+    public function toArray(): array
+    {
+        return $this->elements;
     }
 
     public function empty(): bool
@@ -83,4 +112,9 @@ class Collection implements IteratorAggregate
     {
         return new ArrayIterator($this->elements);
     }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this->elements;
+    }
 }

src/Connection.php

@@ -6,7 +6,7 @@ use Dotenv\Dotenv;
 use PDO;
 use PDOStatement;
 
-class Db
+class Connection
 {
     protected PDO $pdo;
     protected string $name;
@@ -18,16 +18,39 @@ class Db
     private string $database;
     private ?string $port;
     private ?string $host;
+    private ?string $charset;
     private string $error;
 
-    private function __construct($name, $dir)
+    private function __construct($name, $config)
     {
         $this->error = "";
         $this->name = $name;
-        $this->loadEnv($dir);
+        if (is_array($config)) {
+            $this->parseArray($config);
+        } else {
+            if (is_dir($config)) {
+                $this->loadEnv($config);
+            }
+        }
         $this->initPdo();
     }
 
+    private function parseArray($config)
+    {
+        try {
+            $key = (strtolower(trim($this->name)));
+            $this->type = isset($config[$key]["TYPE"]) ? $config[$key]["TYPE"] : null;
+            $this->user = isset($config[$key]["USER"]) ? $config[$key]["USER"] : null;
+            $this->host = isset($config[$key]["HOST"]) ? $config[$key]["HOST"] : null;
+            $this->password = isset($config[$key]["PASSWORD"]) ? $config[$key]["PASSWORD"] : null;
+            $this->database = isset($config[$key]["DATABASE"]) ? $config[$key]["DATABASE"] : null;
+            $this->port = isset($config[$key]["PORT"]) ? $config[$key]["PORT"] : null;
+            $this->charset = isset($config[$key]["CHARSET"]) ? $config[$key]["CHARSET"] : null;
+        } catch (\Throwable $th) {
+            $this->error = $th->getMessage();
+        }
+    }
+
     private function loadEnv($dir)
     {
         try {
@@ -49,6 +72,7 @@ class Db
             $this->password = isset($_ENV[$this->getKey("PASSWORD", $key)]) ? $_ENV[$this->getKey("PASSWORD", $key)] : null;
             $this->database = isset($_ENV[$this->getKey("DATABASE", $key)]) ? $_ENV[$this->getKey("DATABASE", $key)] : null;
             $this->port = isset($_ENV[$this->getKey("PORT", $key)]) ? $_ENV[$this->getKey("PORT", $key)] : null;
+            $this->charset = isset($_ENV[$this->getKey("CHARSET", $key)]) ? $_ENV[$this->getKey("CHARSET", $key)] : null;
         } catch (\Throwable $th) {
             $this->error = $th->getMessage();
         }
@@ -63,6 +87,7 @@ class Db
     {
         $this->getConnString();
         $this->pdo = new PDO($this->connstring, $this->user, $this->password);
+        $this->pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
         $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
 
@@ -95,10 +120,19 @@ class Db
         return $stmt;
     }
 
+    private function getMySQLOptions()
+    {
+        $ret = "";
+        if ($this->charset) {
+            $ret .= ";charset=" . $this->charset;
+        }
+        return $ret;
+    }
+
     private function getConnString()
     {
         $this->connstring = match ($this->type) {
-            "mysql"  => "mysql:host=" . $this->host . ":" . $this->port . ";dbname=" . $this->database,
+            "mysql"  => "mysql:host=" . $this->host . ":" . $this->port . ";dbname=" . $this->database . $this->getMySQLOptions() ,
             "sqlite" => "sqlite:" . $this->database,
         };
     }
@@ -109,13 +143,13 @@ class Db
         return $stmt->execute();
     }
 
-    public function getSelectQuery(Query $query): mixed
+    public function getSelectQuery(Query $query, $fetchmode = PDO::FETCH_ASSOC): mixed
     {
         $stmt = $this->pdo->prepare($query->getQuery());
         $stmt = $this->bindParams($stmt, $query->getData());
         EventDispatcher::emit("on.query", $query);
         $stmt->execute();
-        return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        return $stmt->fetchAll($fetchmode);
     }
 
     public function updateQuery(Query $query): bool
@@ -139,26 +173,53 @@ class Db
         }
     }
 
-    public static function init($dir, array $connections = ["default"])
+    public function beginTransaction(): bool
     {
-        self::fillInstances($dir, $connections);
+        if ($this->pdo) {
+            return $this->pdo->beginTransaction();
+        }
+        return false;
+    }
+
+    public function commit(): bool
+    {
+        if ($this->pdo) {
+            return $this->pdo->commit();
+        }
+        return false;
+    }
+
+    public function rollback(): bool
+    {
+        if ($this->pdo) {
+            return $this->pdo->rollBack();
+        }
+        return false;
+    }
+
+    public static function init($config, array $connections = ["default"])
+    {
+        self::fillInstances($config, $connections);
         return self::getInstance();
     }
 
-    private static function fillInstances($dir, array $connections)
+    private static function fillInstances($config, array $connections)
     {
         foreach ($connections as $connection) {
             if (!isset(self::$instances[$connection])) {
-                self::$instances[$connection] = new Db($connection, $dir);
+                self::$instances[$connection] = new Connection($connection, $config);
             }
         }
     }
 
-    public static function getInstance($connection = "default")
+    public static function getInstance($connection = "")
     {
+        if ($connection == "" && count(self::$instances) > 0) {
+            $connection = array_keys(self::$instances)[0];
+        }
         if (isset(self::$instances[$connection])) {
             $instance = self::$instances[$connection];
-            if ($instance instanceof Db) {
+            if ($instance instanceof Connection) {
                 return self::$instances[$connection];
             }
         }
@@ -169,4 +230,14 @@ class Db
     {
         return $this->error;
     }
+
+    public function getPdo()
+    {
+        return $this->pdo;
+    }
+
+    public function getDriverType()
+    {
+        return $this->type;
+    }
 }

src/Expression.php

@@ -25,9 +25,21 @@ class Expression
         if ($operator == "between" && count($this->value) == 2) {
             return "(" . $this->condition . " "  . $this->operator . " ? AND ? )";
         }
+        if ($operator == "notnull") {
+            return "(" . $this->condition . " IS NOT NULL )";
+        }
+        if ($operator == "isnull") {
+            return "(" . $this->condition . " IS NULL )";
+        }
         return "(" . $this->condition . " "  . $this->operator . " ? )";
     }
 
+    public function hasData()
+    {
+        $operator = trim(strtolower($this->operator));
+        return (in_array($operator, ["isnull","notnull"])) ? false : true;
+    }
+
     public function getCondition()
     {
         return $this->condition;

src/Model.php

@@ -2,25 +2,39 @@
 
 namespace Kletellier\PdoWrapper;
 
-class Model
+use JsonSerializable;
+
+class Model implements JsonSerializable
 {
     protected mixed $values;
     protected array $updated;
-    protected string $table;
-    protected string $connection = "default";
+    protected string $table = "";
+    protected string $connection = "";
     protected string $pk;
-    private ?Db $db;
     private bool $new;
+    private bool $ro;
 
-    public function __construct()
+    public function __construct($ro = false)
     {
-        $this->db = null;
         $this->new = true;
         $this->values = array();
         $this->updated = array();
         $this->pk = "id";
+        $this->ro = $ro;
+        $this->initTable();
+    }
+
+    private function initTable(): void
+    {
+        if (!$this->ro) {
+            if ($this->table == "") {
                 $this->table =  $this->getDefaultTableName();
             }
+        } else {
+            $this->table = "ReadOnlyModel";
+            $this->pk = "__idpk";
+        }
+    }
 
     public function getTable(): string
     {
@@ -33,6 +47,11 @@ class Model
         return $this;
     }
 
+    public function getValues(): array
+    {
+        return $this->values;
+    }
+
     public function getPk(): string
     {
         return $this->pk;
@@ -63,14 +82,25 @@ class Model
         return $this;
     }
 
+    public function find(mixed $key): mixed
+    {
+        $qb = $this->newQueryBuilder(get_class($this));
+        $find = $qb->find($key);
+        if ($find !== null) {
+            $this->fillData($find->getValues());
+            return $this;
+        }
+        return null;
+    }
+
     public function save(): bool
     {
-        $this->db = Db::getInstance($this->connection);
         $ret = false;
-        $qb = $this->newQueryBuilder();
+        if (!$this->ro) {
+            $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,19 +115,20 @@ 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 = [];
                         }
                     }
                 }
             }
+        }
         return $ret;
     }
 
-    public function newQueryBuilder(): QueryBuilder
+    public function newQueryBuilder($className): QueryBuilder
     {
-        return new QueryBuilder($this->table, $this->pk, $this->connection);
+        return new QueryBuilder($this->table, $this->pk, $this->connection, $className);
     }
 
     public function __set($name, $value): void
@@ -108,6 +139,27 @@ class Model
         }
     }
 
+    public function __isset($name): bool
+    {
+        if (method_exists($this, $name)) {
+            return true;
+        } else {
+            return isset($this->values[$name]);
+        }
+    }
+
+    public static function getClassName()
+    {
+        return static::class;
+    }
+
+    public static function q(): QueryBuilder
+    {
+        $cls = self::getClassName();
+        $ist = new static();
+        return $ist->newQueryBuilder($cls);
+    }
+
     public function __get($name): mixed
     {
         if (isset($this->values[$name])) {
@@ -125,4 +177,9 @@ class Model
 
         return $table;
     }
+
+    public function jsonSerialize(): mixed
+    {
+        return $this->values;
+    }
 }

src/QueryBuilder.php

@@ -4,24 +4,29 @@ namespace Kletellier\PdoWrapper;
 
 class QueryBuilder
 {
-    protected ?Db $db;
     protected array $columns;
     protected array $wheres;
+    protected array $orwheres;
     protected array $orders;
     protected array $groupby;
     protected string $table;
+    protected string $classname;
     protected string $connection;
     protected string $pk;
     protected ?int $take;
     protected ?int $offset;
     protected string $raw_query;
+    protected bool $distinct;
 
-    public function __construct($table, $pk = "id", $connection = "default")
+    public const MODE_AND = 0;
+    public const MODE_OR = 1;
+
+    public function __construct($table, $pk = "id", $connection = "", $classname = "")
     {
+        $this->classname = $classname;
         $this->table = $table;
         $this->pk = $pk;
         $this->connection = $connection;
-        $this->db = null;
         $this->reset();
     }
 
@@ -29,10 +34,12 @@ class QueryBuilder
     {
         $this->columns = [];
         $this->wheres = [];
+        $this->orwheres = [];
         $this->orders = [];
         $this->groupby = [];
         $this->offset = null;
         $this->take = null;
+        $this->distinct = false;
         $this->raw_query = "";
     }
 
@@ -54,6 +61,12 @@ class QueryBuilder
         return $this;
     }
 
+    public function distinct()
+    {
+        $this->distinct = true;
+        return $this;
+    }
+
     public function orderBy($columns, $sort = "ASC")
     {
         if (is_array($columns)) {
@@ -100,6 +113,18 @@ class QueryBuilder
         return $this;
     }
 
+    public function whereNotNull($condition)
+    {
+        $this->wheres[] = new Expression($condition, "notnull", "");
+        return $this;
+    }
+
+    public function whereNull($condition)
+    {
+        $this->wheres[] = new Expression($condition, "isnull", "");
+        return $this;
+    }
+
     public function where($condition, $operator, $value = null)
     {
         if ($value === null) {
@@ -110,12 +135,28 @@ class QueryBuilder
         return $this;
     }
 
+    public function orWhere($condition, $operator, $value = null)
+    {
+        if ($value === null) {
+            $this->orwheres[] = new Expression($condition, "=", $operator);
+        } else {
+            $this->orwheres[] = new Expression($condition, $operator, $value);
+        }
+        return $this;
+    }
+
     public function whereRaw(string $raw)
     {
         $this->wheres[] = $raw;
         return $this;
     }
 
+    public function orWhereRaw(string $raw)
+    {
+        $this->orwheres[] = $raw;
+        return $this;
+    }
+
     public function find($id): mixed
     {
         $this->reset();
@@ -124,7 +165,7 @@ class QueryBuilder
         $this->columns = ["*"];
         $data = $this->getData();
         if (count($data) > 0) {
-            return $this->prepareModels($data)[0];
+            return $this->prepareModels($data)->first();
         }
         return null;
     }
@@ -169,16 +210,20 @@ class QueryBuilder
     {
         $ret = array();
         foreach ($data as $row) {
+            if ($this->classname != "") {
+                $model = new $this->classname();
+            } else {
                 $model = new Model();
+            }
+
             $ret[] = $model->setPk($this->pk)->setTable($this->table)->fillData($row);
         }
-        return $ret;
+        return new Collection($ret);
     }
 
     private function getData(): mixed
     {
-        $this->db = Db::getInstance($this->connection);
-        return $this->db->getSelectQuery($this->getQuery());
+        return Connection::getInstance($this->connection)->getSelectQuery($this->getQuery());
     }
 
     private function getConstructedQuery(): Query
@@ -192,13 +237,20 @@ class QueryBuilder
         }
 
         $columns = implode(",", $this->columns);
-        $query = "SELECT " . $columns . " FROM " . $this->table ;
+        $distinct = ($this->distinct) ?  " DISTINCT " : "";
+        $query = "SELECT " . $distinct . " " . $columns . " FROM " . $this->table ;
 
         $where = $this->getWhere();
+        $Orwhere = $this->getWhere(QueryBuilder::MODE_OR);
+
         $this->fillData($ret);
 
+        if ($where != "" && $Orwhere != "") {
+            $Orwhere = " OR " . $Orwhere;
+        }
+
         if ($where != "") {
-            $query .= " WHERE " . $where;
+            $query .= " WHERE " . $where . $Orwhere;
         }
 
         $query .= $this->getClause("GROUP By", $this->groupby);
@@ -211,17 +263,27 @@ class QueryBuilder
 
     private function fillData(Query &$query): void
     {
-        foreach ($this->wheres as $expression) {
+        foreach (array_merge($this->wheres, $this->orwheres) as $expression) {
             if ($expression instanceof Expression) {
+                if ($expression->hasData()) {
                     $query->addData($expression->getValue());
                 }
             }
         }
+    }
 
-    private function getWhere(): string
+    private function getWhere(int $mode = QueryBuilder::MODE_AND): string
     {
         $where = "";
-        foreach ($this->wheres as $expression) {
+        $collection = match ($mode) {
+            QueryBuilder::MODE_AND => $this->wheres,
+            QueryBuilder::MODE_OR => $this->orwheres,
+        };
+        $keyword = match ($mode) {
+            QueryBuilder::MODE_AND => " AND ",
+            QueryBuilder::MODE_OR => " OR ",
+        };
+        foreach ($collection as $expression) {
             $sw = "";
             if ($expression instanceof Expression) {
                 $sw = $expression->raw();
@@ -232,7 +294,7 @@ class QueryBuilder
                 }
             }
             if ($where != "" && $sw != "") {
-                $where .= " AND ";
+                $where .= " $keyword ";
             }
             $where .= $sw;
         }

tests/CollectionTest.php

@@ -14,6 +14,8 @@ test("collection", function () {
     expect($coll->count())->toBe(11);
     expect($coll->first())->toBe(0);
     expect($coll->last())->toBe(10);
+    expect($coll->index(1))->toBe(1);
+    expect($coll->random())->toBeGreaterThanOrEqual(0)->toBeLessThanOrEqual(11);
 
     $filt = $coll->filter(function($item){ return $item<5;});    
     expect($filt)->toBeInstanceOf(Collection::class);
@@ -48,5 +50,29 @@ test("collection", function () {
         return $item + $carry;
     },$init);
     expect($reduce)->toBe(55);
+
+    $array = $coll->toArray();
+    expect($array)->toBeArray();
+    expect(count($array))->toBe(11);
+
+    $obj = new \stdClass();
+    $obj->key = "test";
+    $obj->val = 1;
+
+    $obj2 = new \stdClass();
+    $obj2->key = "test2";
+    $obj2->val = 2;
+
+    $collo = new Collection([$obj,$obj2]);
+    expect($collo)->toBeInstanceOf(Collection::class);
+    expect(count($collo))->toBe(2);
+
+    $json = json_encode($collo);
+    expect($json)->toBeJson();
+    
+    $pluck = $collo->pluck("key");
+    expect($pluck)->toBeInstanceOf(Collection::class);
+    expect(count($pluck))->toBe(2);
+    expect($pluck->first())->toBe("test");
 });
  

tests/DbTest.php

@@ -1,17 +1,18 @@
 <?php
 
-use Kletellier\PdoWrapper\Db;
+use Kletellier\PdoWrapper\Collection;
+use Kletellier\PdoWrapper\Connection;
 use Kletellier\PdoWrapper\EventDispatcher;
 use Kletellier\PdoWrapper\Model;
 use Kletellier\PdoWrapper\QueryBuilder;
 
 test("create db",function () {
-    $dir = getcwd(); 
-    $db = Db::init($dir,["default","contwo"]);
+    $config = ["conone" => ["TYPE"=>"sqlite", "DATABASE" => ":memory:" ], "contwo"=>["TYPE"=>"sqlite", "DATABASE" => ":memory:" ]];
+    $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);
 });
@@ -34,6 +35,32 @@ test("insert row",function () {
     expect($ret2)->toBe(true);
 });
 
+test("model find", function() {
+    $row = new Model();
+    $row->setTable("test");
+
+    $res = $row->find(1);
+    expect($res->id)->toBe(1);
+    expect($row->col1)->toBe("test");
+
+    $res = $row->find(15);
+    expect($res)->toBe(null); 
+
+    $row->col1 = "test2";
+    $res = $row->save();
+    expect($res)->toBe(true);
+
+    $row->col1 = "test";
+    $res = $row->save();
+    expect($res)->toBe(true);
+
+    $json = json_encode($row);
+    expect($json)->toBeJson();
+
+    $obj = json_decode($json);
+    expect($obj->col1)->toBe("test");
+});
+
 test("querybuilder", function() {
     $qb = new QueryBuilder("test");
     $row = $qb->find(1);
@@ -45,49 +72,90 @@ test("querybuilder", function() {
     $qb->reset();
     $rows = $qb->where("id",1)->columns("*")->get();
 
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(1);
 
     $qb->reset();
     $rows = $qb->where("id",">",2)->columns("*")->get();
 
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(0);
 
     $qb->reset();
     $rows = $qb->whereRaw("id = 1")->columns("*")->get();
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(1);
 
     $qb->reset();
     $rows = $qb->whereRaw("id = 1")->get();
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(1);
+
+    $qb->reset();
+    $rows = $qb->distinct()->get();
+    expect(count($rows))->toBe(2);
+
+    $qb->reset();
+    $rows = $qb->whereNotNull("col1")->get();
+    expect(count($rows))->toBe(2);    
+
+    $qb->reset();
+    $rows = $qb->where("id",1)->orWhere("id",2)->get();
+    expect(count($rows))->toBe(2);   
+});
+
+test("extending model",function()
+{
+    $class = "Test";
+    $code = "class $class extends \Kletellier\PdoWrapper\Model {}";
+    eval($code);
+
+    $qbs = Test::q(); 
+    expect($qbs)->toBeInstanceOf(QueryBuilder::class);
+
+    $row = $qbs->find(1);
+    expect($row->id)->toBe(1);
+    expect($row->col1)->toBe("test");
+
+    expect($row)->toBeInstanceOf(Test::class);
 });
 
 test("order by", function(){
     $qb = new QueryBuilder("test");
     $rows = $qb->orderBy("id","DESC")->get();
 
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(2);
 
-    expect($rows[0]->col1)->toBe("test2");
+    expect($rows->first()->col1)->toBe("test2");
 });
 
 test("group by", function(){
     $qb = new QueryBuilder("test");
     $rows = $qb->columns("COUNT(*) as Nb")->get();
 
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(1);
-    expect($rows[0]->Nb)->toBe(2);
+    expect($rows->first()->Nb)->toBe(2);
 
     $qb->reset();
     $rows = $qb->columns("COUNT(*) as Nb")->groupBy("id")->get();
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(2);
-    expect($rows[0]->Nb)->toBe(1);
+    expect($rows->first()->Nb)->toBe(1);
+});
+
+test("isset",function()
+{
+    $q = new QueryBuilder("test");
+    $row = $q->where("id",1)->get()->first();
+ 
+    expect($row->id)->toBe(1);
+    expect($row->col1)->toBe("test");
+
+    expect(isset($row->col1))->toBe(true);
+    expect(isset($row->col2))->toBe(false);
+    expect(isset($row->find))->toBe(true);
 });
 
 test("update row", function() {
@@ -99,9 +167,9 @@ test("update row", function() {
 
     $qb->reset();
     $rows = $qb->where("id",1)->columns("*")->get();
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(1);
-    expect($rows[0]->col1)->toBe("testupdate");
+    expect($rows->first()->col1)->toBe("testupdate");
 });
 
 test("event", function() {
@@ -134,15 +202,31 @@ test("where array", function() {
     $between = $qb->whereBetween("id",2,3)->get();
     expect(count($between))->toBe(2);
 
-    expect($between[0]->id)->toBe(2);
+    expect($between->first()->id)->toBe(2);
 
     $qb->reset();
     $in = $qb->whereIn("id",[2,3])->get();
     expect(count($in))->toBe(2);
-    expect($in[0]->id)->toBe(2);
+    expect($in->first()->id)->toBe(2);
 
 });
 
+test("is null", function(){
+    $row4 = new Model();
+    $row4->setTable("test");
+    $row4->col1 = null;
+    $row4->date1 = new \DateTime();
+    $ret4 = $row4->save();
+    expect($ret4)->toBe(true);
+
+    $qb = new QueryBuilder("test");
+    $rows = $qb->whereNull("col1")->get();
+
+    expect($rows)->toBeInstanceOf(Collection::class);
+    expect(count($rows))->toBe(1);
+    expect($rows->first()->col1)->toBe(null);
+});
+
 test("second connection", function() {
     $row = new Model();
     $row->setConnection("contwo");
@@ -164,6 +248,6 @@ test("second connection", function() {
     $qb = new QueryBuilder("test","id","contwo");
     $rows = $qb->get();
 
-    expect($rows)->toBeArray();
+    expect($rows)->toBeInstanceOf(Collection::class);
     expect(count($rows))->toBe(2);
 });