added isSystem option for CollectionHandler::drop

jsteemann · jsteemann · commit c213706a1a16 · 2016-10-24T15:20:05.000+02:00
diff --git a/lib/triagens/ArangoDb/CollectionHandler.php b/lib/triagens/ArangoDb/CollectionHandler.php
@@ -659,18 +659,24 @@ public function truncate($collection)
      * @throws Exception
      *
      * @param mixed $collection - collection id as string or number or collection object
+     * @param array $options - an array of options for the drop operation
      *
      * @return bool - always true, will throw if there is an error
      */
-    public function drop($collection)
+    public function drop($collection, $options = array())
     {
         $collectionName = $this->getCollectionName($collection);
 
         if ($this->isValidCollectionId($collectionName)) {
             throw new ClientException('Cannot alter a collection without a collection id');
         }
 
-        $this->getConnection()->delete(UrlHelper::buildUrl(Urls::URL_COLLECTION, [$collectionName]));
+        $appendix = '';
+        if (is_array($options) && isset($options['isSystem'])) {
+            $appendix = '?isSystem=' . UrlHelper::getBoolString($options['isSystem']);
+        }
+
+        $this->getConnection()->delete(UrlHelper::buildUrl(Urls::URL_COLLECTION, [$collectionName]) . $appendix);
 
         return true;
     }
diff --git a/tests/CollectionBasicTest.php b/tests/CollectionBasicTest.php
@@ -428,7 +428,7 @@ public function testCreateAndDeleteSystemCollectionWithoutCreatingObject()
         $name = '_ArangoDB_PHP_TestSuite_TestCollection_02';
 
         try {
-            $collectionHandler->drop($name);
+            $collectionHandler->drop($name, [ 'isSystem' => true ]);
         } catch (Exception $e) {
             //Silence the exception
         }
@@ -447,7 +447,7 @@ public function testCreateAndDeleteSystemCollectionWithoutCreatingObject()
         static::assertTrue($resultingCollectionProperties->getWaitForSync());
 
 
-        $collectionHandler->delete($name);
+        $collectionHandler->drop($name, [ 'isSystem' => true ]);
     }
 
 
diff --git a/tests/CollectionExtendedTest.php b/tests/CollectionExtendedTest.php
@@ -33,7 +33,7 @@ public function setUp()
         $this->documentHandler   = new DocumentHandler($this->connection);
 
         try {
-            $this->collectionHandler->delete('ArangoDB_PHP_TestSuite_TestCollection_01');
+            $this->collectionHandler->drop('ArangoDB_PHP_TestSuite_TestCollection_01');
         } catch (\Exception $e) {
             // don't bother us, if it's already deleted.
         }
@@ -112,6 +112,11 @@ public function testCreateGetAndDeleteSystemCollection()
         $collection->setName($name);
         $collection->setIsSystem(true);
 
+         try {
+            $collectionHandler->drop($name, [ 'isSystem' => true ]);
+        } catch (Exception $e) {
+            //Silence the exception
+        }
 
         $response = $collectionHandler->add($collection);
 
@@ -122,7 +127,7 @@ public function testCreateGetAndDeleteSystemCollection()
         $properties = $collectionHandler->getProperties($name);
         static::assertTrue($properties->getIsSystem(), '"isSystem" should be true!');
 
-        $response = $collectionHandler->delete($collection);
+        $response = $collectionHandler->drop($collection, [ 'isSystem' => true ]);
         static::assertTrue($response, 'Delete should return true!');
     }
 
diff --git a/tests/EdgeExtendedTest.php b/tests/EdgeExtendedTest.php
@@ -31,6 +31,19 @@ public function setUp()
         $this->collection        = new Collection();
         $this->collection->setName('ArangoDB_PHP_TestSuite_TestEdgeCollection_01');
         $this->collectionHandler->add($this->collection);
+
+        try {
+            $this->collectionHandler->drop('ArangoDB_PHP_TestSuite_EdgeCollection_01');
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+        
+        try {
+            $this->collectionHandler->drop('ArangoDB_PHP_TestSuite_Collection_01');
+        } catch (Exception $e) {
+            //Silence the exception
+        }
+
         $this->edgeHandler    = new EdgeHandler($this->connection);
         $this->edgeCollection = new Collection();
         $this->edgeCollection->setName('ArangoDBPHPTestSuiteTestEdgeCollection01');

Original file line number	Diff line number	Diff line change
`@@ -659,18 +659,24 @@ public function truncate($collection)`
`659`	`659`	`* @throws Exception`
`660`	`660`	`*`
`661`	`661`	`* @param mixed $collection - collection id as string or number or collection object`
	`662`	`+ * @param array $options - an array of options for the drop operation`
`662`	`663`	`*`
`663`	`664`	`* @return bool - always true, will throw if there is an error`
`664`	`665`	`*/`
`665`		`- public function drop($collection)`
	`666`	`+ public function drop($collection, $options = array())`
`666`	`667`	`{`
`667`	`668`	`$collectionName = $this->getCollectionName($collection);`
`668`	`669`
`669`	`670`	`if ($this->isValidCollectionId($collectionName)) {`
`670`	`671`	`throw new ClientException('Cannot alter a collection without a collection id');`
`671`	`672`	`}`
`672`	`673`
`673`		`- $this->getConnection()->delete(UrlHelper::buildUrl(Urls::URL_COLLECTION, [$collectionName]));`
	`674`	`+ $appendix = '';`
	`675`	`+ if (is_array($options) && isset($options['isSystem'])) {`
	`676`	`+ $appendix = '?isSystem=' . UrlHelper::getBoolString($options['isSystem']);`
	`677`	`+ }`
	`678`	`+`
	`679`	`+ $this->getConnection()->delete(UrlHelper::buildUrl(Urls::URL_COLLECTION, [$collectionName]) . $appendix);`
`674`	`680`
`675`	`681`	`return true;`
`676`	`682`	`}`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ public function testCreateAndDeleteSystemCollectionWithoutCreatingObject()`
`428`	`428`	`$name = '_ArangoDB_PHP_TestSuite_TestCollection_02';`
`429`	`429`
`430`	`430`	`try {`
`431`		`- $collectionHandler->drop($name);`
	`431`	`+ $collectionHandler->drop($name, [ 'isSystem' => true ]);`
`432`	`432`	`} catch (Exception $e) {`
`433`	`433`	`//Silence the exception`
`434`	`434`	`}`
`@@ -447,7 +447,7 @@ public function testCreateAndDeleteSystemCollectionWithoutCreatingObject()`
`447`	`447`	`static::assertTrue($resultingCollectionProperties->getWaitForSync());`
`448`	`448`
`449`	`449`
`450`		`- $collectionHandler->delete($name);`
	`450`	`+ $collectionHandler->drop($name, [ 'isSystem' => true ]);`
`451`	`451`	`}`
`452`	`452`
`453`	`453`