Database Queries

midorikocak · Feb 4, 2020 · e5de444 · e5de444
1 parent 7a4f56c
commit e5de444
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 103 deletions.
diff --git a/.phpcs-cache b/.phpcs-cache
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -173,3 +173,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 - Nothing
 
+
+## [1.1.5] - 2020-02-03
+
+### Added
+- Database Query method
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Repository readAll signature.
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
+
diff --git a/README.md b/README.md
@@ -120,16 +120,14 @@ declare(strict_types=1);
 
 namespace midorikocak\nanodb;
 
+use midorikocak\querymaker\QueryInterface;
+
 interface RepositoryInterface
 {
     public function read(string $id);
 
-    public function readAll(
-            array $filter = [],
-            array $columns = ['*'],
-            ?int $limit = null,
-            ?int $offset = null
-        ): array;
+    public function readAll(?QueryInterface $query = null): array;
+
 
     public function save($item);
 
@@ -234,9 +232,9 @@ namespace midorikocak\nanodb;
 
 use Exception;
 
+use midorikocak\querymaker\QueryInterface;
+
 use function array_map;
-use function key;
-use function reset;
 
 class Users implements RepositoryInterface
 {
@@ -259,36 +257,15 @@ class Users implements RepositoryInterface
         return self::fromArray($data);
     }
 
-    public function readAll(
-        array $filter = [],
-        array $columns = ['*'],
-        ?int $limit = null,
-        ?int $offset = null
-    ):array    {
-        $db = $this->db->select('users', $columns);
-
-        if (!empty($filter)) {
-            $value = reset($filter);
-            $key = key($filter);
-            $db->where($key, $value);
-
-            unset($filter[key($filter)]);
-
-            foreach ($filter as $key => $value) {
-                $db->and($key, $value);
-            }
-        }
-
-        if ($limit) {
-            $this->db->limit($limit);
-        }
-
-        if ($limit && $offset) {
-            $this->db->offset($offset);
+    public function readAll(?QueryInterface $query = null): array
+    {
+        if ($query !== null) {
+            $db = $this->db->query($query);
+        } else {
+            $db = $this->db->select('users');
         }
-
         $db->execute();
-        return array_map(fn($data) => self::fromArray($data), $db->fetchAll());
+        return array_map(fn($data) => User::fromArray($data), $db->fetchAll());
     }
 
     /**

diff --git a/src/ArrayRepository.php b/src/ArrayRepository.php
@@ -6,10 +6,9 @@
 
 use Exception;
 use midorikocak\arraytools\ArrayValidator;
+use midorikocak\querymaker\QueryInterface;
 
 use function array_key_exists;
-use function key;
-use function reset;
 
 /**
  * Repository is a class that receives arrays as input data and returns array of arrays
@@ -78,34 +77,13 @@ public function read(?string $id = null): array
         return $this->db->fetch();
     }
 
-    public function readAll(
-        array $filter = [],
-        array $columns = ['*'],
-        ?int $limit = null,
-        ?int $offset = null
-    ): array {
-        $db = $this->db->select($this->tableName, $columns);
-
-        if (!empty($filter)) {
-            $value = reset($filter);
-            $key = key($filter);
-            $db->where($key, $value);
-
-            unset($filter[key($filter)]);
-
-            foreach ($filter as $key => $value) {
-                $db->and($key, $value);
-            }
-        }
-
-        if ($limit) {
-            $this->db->limit($limit);
-        }
-
-        if ($limit && $offset) {
-            $this->db->offset($offset);
+    public function readAll(?QueryInterface $query = null): array
+    {
+        if ($query !== null) {
+            $db = $this->db->query($query);
+        } else {
+            $db = $this->db->select($this->tableName);
         }
-
         $db->execute();
         return $db->fetchAll();
     }

diff --git a/src/Database.php b/src/Database.php
@@ -21,6 +21,13 @@ public function __construct(PDO $db)
         $this->db = $db;
     }
 
+    public function query(QueryInterface $queryMaker): self
+    {
+        $this->reset();
+        $this->queryMaker = $queryMaker;
+        return $this;
+    }
+
     public function select($table, array $columns = ['*']): self
     {
         $this->reset();

diff --git a/src/DatabaseInterface.php b/src/DatabaseInterface.php
@@ -4,6 +4,7 @@
 
 namespace midorikocak\nanodb;
 
+use midorikocak\querymaker\QueryInterface;
 use PDO;
 
 interface DatabaseInterface
@@ -41,4 +42,6 @@ public function execute(): bool;
     public function fetch(): array;
 
     public function fetchAll(): array;
+
+    public function query(QueryInterface $query);
 }
diff --git a/src/RepositoryInterface.php b/src/RepositoryInterface.php
@@ -4,6 +4,8 @@
 
 namespace midorikocak\nanodb;
 
+use midorikocak\querymaker\QueryInterface;
+
 interface RepositoryInterface
 {
     /**
@@ -14,12 +16,7 @@ public function read(string $id);
     /**
      * @return array[] | object[]
      */
-    public function readAll(
-        array $filter = [],
-        array $columns = ['*'],
-        ?int $limit = null,
-        ?int $offset = null
-    ): array;
+    public function readAll(?QueryInterface $query = null): array;
 
     /**
      * @param array|object $item if has id key or property, updates, else creates

diff --git a/tests/Users.php b/tests/Users.php
@@ -5,10 +5,9 @@
 namespace midorikocak\nanodb;
 
 use Exception;
+use midorikocak\querymaker\QueryInterface;
 
 use function array_map;
-use function key;
-use function reset;
 
 class Users implements RepositoryInterface
 {
@@ -28,36 +27,13 @@ public function read(string $id): User
         return User::fromArray($data);
     }
 
-    public function readAll(
-        array $filter = [],
-        array $columns = ['*'],
-        ?int $limit = null,
-        ?int $offset = null
-    ): array {
-        $db = $this->db->select('users', $columns);
-
-        //$db = $this->db->select('users', $columns);
-
-        if (!empty($filter)) {
-            $value = reset($filter);
-            $key = key($filter);
-            $db->where($key, $value);
-
-            unset($filter[key($filter)]);
-
-            foreach ($filter as $key => $value) {
-                $db->and($key, $value);
-            }
-        }
-
-        if ($limit) {
-            $this->db->limit($limit);
-        }
-
-        if ($limit && $offset) {
-            $this->db->offset($offset);
+    public function readAll(?QueryInterface $query = null): array
+    {
+        if ($query !== null) {
+            $db = $this->db->query($query);
+        } else {
+            $db = $this->db->select('users');
         }
-
         $db->execute();
         return array_map(fn($data) => User::fromArray($data), $db->fetchAll());
     }