Add getAll operation

Author: marcgeurts

docs/roadmap.md

@@ -52,7 +52,7 @@
 | db                     | ✓ | ✓ | |
 | table                  | ✓ | ✓ | |
 | get                    | ✓ | ✓ | |
-| getAll                 | ✓ | ✓ | |
+| getAll                 | ✘ | ✓ | |
 | between                | ✘ | ✘ | |
 | filter                 | ✓ | ✓ | |
 | Joins                  | ✘ | ✘ | |

src/Query/Operation/AbstractOperation.php

@@ -32,6 +32,14 @@ public function filter(array $predicate): OperationInterface
         return new Filter($this->rethink, $this->message, $this, $predicate);
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getAll(...$keys): OperationInterface
+    {
+        return new GetAll($this->rethink, $this->message, $this, $keys);
+    }
+
     /**
      * @inheritdoc
      */

src/Query/Operation/Filter.php

@@ -14,6 +14,7 @@ class Filter extends AbstractOperation
      * @var array
      */
     private $predicate;
+
     /**
      * @var QueryInterface
      */

src/Query/Operation/Get.php

@@ -12,7 +12,7 @@
 class Get extends AbstractQuery
 {
     /**
-     * @var string
+     * @var string|int
      */
     private $key;
 

src/Query/Operation/GetAll.php

@@ -0,0 +1,59 @@
+<?php
+declare(strict_types = 1);
+
+namespace TBolier\RethinkQL\Query\Operation;
+
+use TBolier\RethinkQL\Message\MessageInterface;
+use TBolier\RethinkQL\Query\QueryInterface;
+use TBolier\RethinkQL\RethinkInterface;
+use TBolier\RethinkQL\Types\Term\TermType;
+
+class GetAll extends AbstractOperation
+{
+    /**
+     * @var array
+     */
+    private $keys;
+
+    /**
+     * @var QueryInterface
+     */
+    private $query;
+
+    /**
+     * @param RethinkInterface $rethink
+     * @param MessageInterface $message
+     * @param QueryInterface $query
+     * @param array $keys
+     */
+    public function __construct(
+        RethinkInterface $rethink,
+        MessageInterface $message,
+        QueryInterface $query,
+        array $keys
+    ) {
+        parent::__construct($rethink, $message);
+
+        $this->query = $query;
+        $this->keys = $keys;
+        $this->rethink = $rethink;
+        $this->message = $message;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function toArray(): array
+    {
+        return [
+            TermType::GET_ALL,
+            [
+                $this->query->toArray(),
+                [
+                    TermType::MAKE_ARRAY,
+                    $this->keys,
+                ],
+            ],
+        ];
+    }
+}

src/Query/Operation/OperationInterface.php

@@ -25,6 +25,12 @@ public function delete(): QueryInterface;
      */
     public function filter(array $predicate): OperationInterface;
 
+    /**
+     * @param array $keys
+     * @return OperationInterface
+     */
+    public function getAll(...$keys): OperationInterface;
+
     /**
      * @param array $elements
      * @return QueryInterface

src/Query/Table.php

@@ -39,9 +39,9 @@ public function __construct(string $name, RethinkInterface $rethink, MessageInte
     /**
      * @inheritdoc
      */
-    public function get($value): AbstractQuery
+    public function get($key): AbstractQuery
     {
-        return new Get($this->rethink, $this->message, $this, $value);
+        return new Get($this->rethink, $this->message, $this, $key);
     }
 
     /**

src/Query/TableInterface.php

@@ -8,8 +8,8 @@
 interface TableInterface extends OperationInterface
 {
     /**
-     * @param string|int $value
+     * @param string|int $key
      * @return AbstractQuery
      */
-    public function get($value): AbstractQuery;
+    public function get($key): AbstractQuery;
 }

src/Types/Term/TermType.php

@@ -104,8 +104,8 @@ class TermType
     public const INDEX_RENAME       = 156;
     public const FUNCALL            = 64;
     public const BRANCH             = 65;
-    public const OR = 66;
-    public const AND = 67;
+    public const OR                 = 66;
+    public const AND                = 67;
     public const FOR_EACH           = 68;
     public const FUNC               = 69;
     public const ASC                = 73;

test/integration/Query/AbstractTableTest.php

@@ -30,16 +30,16 @@ public function tearDown()
 
 
     /**
-     * @param int $documentId
+     * @param int|string $id
      * @return ResponseInterface
      */
-    protected function insertDocument(int $documentId): ResponseInterface
+    protected function insertDocument($id): ResponseInterface
     {
         $res = $this->r()
             ->table('tabletest')
             ->insert([
-                'id' => $documentId,
-                'title' => 'Test document '.$documentId,
+                'id' => $id,
+                'title' => 'Test document '.$id,
                 'description' => 'A document description.',
             ])
             ->run();