uuid primary key support

tarantool-php · Aug 2, 2021 · d4e8edb · d4e8edb
1 parent 1fa6c0e
commit d4e8edb
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 8 deletions.
diff --git a/src/Repository.php b/src/Repository.php
@@ -189,8 +189,9 @@ public function find($params = [], $one = false)
         $params = $this->normalize($params);
 
         if (array_key_exists('id', $params)) {
-            if (array_key_exists($params['id'], $this->persisted)) {
-                $instance = $this->persisted[$params['id']];
+            $key = (string) $params['id'];
+            if (array_key_exists($key, $this->persisted)) {
+                $instance = $this->persisted[$key];
                 return $one ? $instance : [$instance];
             }
         }
@@ -229,8 +230,14 @@ public function find($params = [], $one = false)
         return $this->results[$cacheKey] = $result;
     }
 
-    public function forget(int $id): self
+    public function forget($id): self
     {
+        if ($id instanceof Entity) {
+            $id = $this->space->getInstanceKey($id);
+        }
+
+        $id = (string) $id;
+
         if (array_key_exists($id, $this->persisted)) {
             $instance = $this->persisted[$id];
             unset($this->keys[$instance]);
@@ -244,7 +251,7 @@ public function forget(int $id): self
 
     public function getInstance(array $tuple): Entity
     {
-        $key = $this->space->getTupleKey($tuple);
+        $key = (string) $this->space->getTupleKey($tuple);
 
         if (array_key_exists($key, $this->persisted)) {
             return $this->persisted[$key];
@@ -326,7 +333,7 @@ public function remove($params = []): self
 
     public function removeEntity(Entity $instance): self
     {
-        $key = $this->space->getInstanceKey($instance);
+        $key = (string) $this->space->getInstanceKey($instance);
 
         if (!array_key_exists($key, $this->original)) {
             return $this;
@@ -372,7 +379,7 @@ public function removeEntity(Entity $instance): self
 
     public function save(Entity $instance): Entity
     {
-        $key = $this->space->getInstanceKey($instance);
+        $key = (string) $this->space->getInstanceKey($instance);
         $client = $this->getMapper()->getClient();
 
         if (array_key_exists($key, $this->persisted)) {
@@ -478,7 +485,7 @@ private function addDefaultValues(Entity $instance): Entity
 
     public function getOriginal(Entity $instance): ?array
     {
-        $key = $this->space->getInstanceKey($instance);
+        $key = (string) $this->space->getInstanceKey($instance);
 
         if (array_key_exists($key, $this->original)) {
             return $this->original[$key];

diff --git a/tests/UuidTest.php b/tests/UuidTest.php
@@ -15,7 +15,31 @@
 
 class UuidTest extends TestCase
 {
-    public function test()
+    public function testPrimaryKey()
+    {
+        $mapper = $this->createMapper();
+        $this->clean($mapper);
+
+        $mapper->getSchema()->createSpace('test_space', [
+            'is_sync'       => true,
+            'engine'        => 'memtx',
+            'properties'    => [
+                'id' => 'uuid',
+            ],
+        ])
+        ->addIndex([ 'fields' => 'id' ]);
+
+        $uuid = Uuid::v4();
+
+        $instance = $mapper->create('test_space', [
+            'id' => $uuid,
+        ]);
+
+        $mapper->getRepository('test_space')->forget($instance);
+        $this->assertNotNull($mapper->findOne('test_space', $uuid));
+    }
+
+    public function testBasics()
     {
         $mapper = $this->createMapper();
         $this->clean($mapper);