Merge pull request #4 from silvanheller/feature/exists

Convenience not_exists_ok additions to truncate and drop

Author: Spiess

cottontaildb_client/cottontaildb_client.py

@@ -117,15 +117,19 @@ def create_entity(self, schema, entity, columns, exist_ok=False):
         response = self._ddl.CreateEntity(CreateEntityMessage(txId=self._tid, definition=entity_def))
         return self._parse_query_response(response)
 
-    def drop_entity(self, schema, entity):
+    def drop_entity(self, schema, entity, not_exist_ok=True):
         """Drops the given entity from the given schema."""
+        if not_exist_ok and entity not in [s.split('.')[-1] for s in self.list_entities(schema)]:
+            return
         schema_name = SchemaName(name=schema)
         entity_name = EntityName(schema=schema_name, name=entity)
         response = self._ddl.DropEntity(DropEntityMessage(txId=self._tid, entity=entity_name))
         return self._parse_query_response(response)
 
-    def truncate_entity(self, schema, entity):
+    def truncate_entity(self, schema, entity, not_exist_ok=True):
         """Truncates the specified entity."""
+        if not_exist_ok and entity not in [s.split('.')[-1] for s in self.list_entities(schema)]:
+            return
         schema_name = SchemaName(name=schema)
         entity_name = EntityName(schema=schema_name, name=entity)
         response = self._ddl.TruncateEntity(TruncateEntityMessage(txId=self._tid, entity=entity_name))

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cottontaildb-client
-version = 0.0.3
+version = 0.0.4
 author = Florian Spiess
 author_email = [email protected]
 description = A Cottontail DB gRPC client.

tests/test_cottontaildb_client.py

@@ -49,14 +49,21 @@ def test_create_drop_entity(self):
         self.client.drop_entity(TEST_SCHEMA, TEST_ENTITY)
         self.assert_not_in(TEST_ENTITY, self.client.list_entities(TEST_SCHEMA), 'entity was not dropped')
 
+    def test_drop_not_exists_entity(self):
+        self._create_schema()
+        self.client.drop_entity(TEST_SCHEMA, TEST_ENTITY)
+
+    def test_truncate_not_exists_entity(self):
+        self._create_schema()
+        self.client.truncate_entity(TEST_SCHEMA, TEST_ENTITY)
+
     def test_create_truncate_entity(self):
         self._create_schema()
         self._create_entity()
         self.assert_in(TEST_ENTITY, self.client.list_entities(TEST_SCHEMA), 'entity was not created')
         self.client.truncate_entity(TEST_SCHEMA, TEST_ENTITY)
         self.assert_in(TEST_ENTITY, self.client.list_entities(TEST_SCHEMA), 'entity was dropped')
 
-
     def test_insert(self):
         self._create_schema()
         self._create_entity()