Merge pull request #102 from utopia-php/feat-check-if-collection-exists

Feat: check if collection exists in database

Author: kodumbeats

src/Database/Adapter.php

@@ -142,12 +142,14 @@ abstract public function create(string $name): bool;
 
     /**
      * Check if database exists
+     * Optionally check if collection exists in database
      *
-     * @param string $name
+     * @param string $database database name
+     * @param string $collection (optional) collection name
      *
      * @return bool
      */
-    abstract public function exists(string $name): bool;
+    abstract public function exists(string $database, string $collection = null): bool;
 
     /**
      * List Databases

src/Database/Adapter/MariaDB.php

@@ -49,27 +49,47 @@ public function create(string $name): bool
 
     /**
      * Check if database exists
+     * Optionally check if collection exists in database
      *
-     * @param string $name
+     * @param string $database database name
+     * @param string $collection (optional) collection name
      *
      * @return bool
      */
-    public function exists(string $name): bool
+    public function exists(string $database, string $collection = null): bool
     {
-        $name = $this->filter($name);
+        $database = $this->filter($database);
+
+        if (!\is_null($collection)) {
+            $collection = $this->filter($collection);
+
+            $select = 'TABLE_NAME';
+            $from = 'INFORMATION_SCHEMA.TABLES' ;
+            $where = 'TABLE_SCHEMA = :schema AND TABLE_NAME = :table';
+            $match = "{$this->getNamespace()}_{$collection}";
+        } else {
+            $select = 'SCHEMA_NAME';
+            $from = 'INFORMATION_SCHEMA.SCHEMATA' ;
+            $where = 'SCHEMA_NAME = :schema';
+            $match = $database;
+        }
 
         $stmt = $this->getPDO()
-            ->prepare("SELECT SCHEMA_NAME
-                FROM INFORMATION_SCHEMA.SCHEMATA
-                WHERE SCHEMA_NAME = :schema;");
-            
-        $stmt->bindValue(':schema', $name, PDO::PARAM_STR);
+            ->prepare("SELECT {$select}
+                FROM {$from}
+                WHERE {$where};");
+
+        $stmt->bindValue(':schema', $database, PDO::PARAM_STR);
+
+        if (!\is_null($collection)) {
+            $stmt->bindValue(':table', "{$this->getNamespace()}_{$collection}", PDO::PARAM_STR);
+        }
 
         $stmt->execute();
 
         $document = $stmt->fetch(PDO::FETCH_ASSOC);
 
-        return (($document['SCHEMA_NAME'] ?? '') == $name);
+        return (($document[$select] ?? '') === $match);
     }
 
     /**

src/Database/Adapter/MongoDB.php

@@ -47,16 +47,41 @@ public function create(string $name): bool
 
     /**
      * Check if database exists
+     * Optionally check if collection exists in database
      *
-     * @param string $name
+     * @param string $database database name
+     * @param string $collection (optional) collection name
      *
      * @return bool
      */
-    public function exists(string $name): bool
+    public function exists(string $database, string $collection = null): bool
     {
-        $name = $this->filter($name);
-        forEach ($this->getClient()->listDatabaseNames() as $key => $value) {
-            if ($name === $value) {
+        $database = $this->filter($database);
+
+        if (!\is_null($collection)) {
+            $collection = $this->filter($collection);
+
+            $match = "{$this->getNamespace()}_{$collection}";
+            $names = $this
+                ->getClient()
+                ->selectDatabase($database)
+                ->listCollectionNames([
+                    'filter' => [
+                        'name' => $match
+                    ]
+                ]);
+        } else {
+            $match = $database;
+            $names = $this->getClient()
+                ->listDatabaseNames([
+                    'filter' => [
+                        'name' => $match
+                    ]
+                ]);
+        }
+
+        foreach ($names as $name) {
+            if ($name === $match) {
                 return true;
             }
         }

src/Database/Database.php

@@ -280,12 +280,16 @@ public function createMetadata(): bool
 
     /**
      * Check if database exists
+     * Optionally check if collection exists in database
+     *
+     * @param string $database database name
+     * @param string $collection (optional) collection name
      *
      * @return bool
      */
-    public function exists(string $name): bool
+    public function exists(string $database, string $collection = null): bool
     {
-        return $this->adapter->exists($name);
+        return $this->adapter->exists($database, $collection);
     }
 
     /**

tests/Database/Base.php

@@ -57,15 +57,17 @@ public function testCreateExistsDelete()
     /**
      * @depends testCreateExistsDelete
      */
-    public function testCreateListDeleteCollection()
+    public function testCreateListExistsDeleteCollection()
     {
         $this->assertInstanceOf('Utopia\Database\Document', static::getDatabase()->createCollection('actors'));
 
         $this->assertCount(1, static::getDatabase()->listCollections());
+        $this->assertEquals(true, static::getDatabase()->exists($this->testDatabase, 'actors'));
 
         // Collection names should not be unique
         $this->assertInstanceOf('Utopia\Database\Document', static::getDatabase()->createCollection('actors2'));
         $this->assertCount(2, static::getDatabase()->listCollections());
+        $this->assertEquals(true, static::getDatabase()->exists($this->testDatabase, 'actors2'));
         $collection = static::getDatabase()->getCollection('actors2');
         $collection->setAttribute('name', 'actors'); // change name to one that exists
         $this->assertInstanceOf('Utopia\Database\Document', static::getDatabase()->updateDocument($collection->getCollection(), $collection->getId(), $collection));
@@ -75,6 +77,7 @@ public function testCreateListDeleteCollection()
         $this->assertEquals(false, static::getDatabase()->getCollection('actors')->isEmpty());
         $this->assertEquals(true, static::getDatabase()->deleteCollection('actors'));
         $this->assertEquals(true, static::getDatabase()->getCollection('actors')->isEmpty());
+        $this->assertEquals(false, static::getDatabase()->exists($this->testDatabase, 'actors'));
     }
 
     public function testCreateDeleteAttribute()