Delete data when basic data streams are deleted. Fixes #488

farmOS · Jan 19, 2022 · 7925b5c · 7925b5c
1 parent d161d22
commit 7925b5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- [Data is not deleted when a data stream entity is deleted #488](https://github.com/farmOS/farmOS/issues/488)
 - [Data does not immediately appear when posting to data streams #484](https://github.com/farmOS/farmOS/issues/484)
 - [Route "entity.data_stream.collection" does not exist. #486](https://github.com/farmOS/farmOS/issues/486)
 - Fix Quick Form help text so that it works with new multi-route approach.

diff --git a/modules/core/data_stream/data_stream.module b/modules/core/data_stream/data_stream.module
@@ -93,4 +93,11 @@ function data_stream_data_stream_delete(DataStreamInterface $data_stream) {
   \Drupal::database()->delete('asset__data_stream')
     ->condition('data_stream_target_id', $data_stream->id())
     ->execute();
+
+  // If this is a "basic" data stream, delete data associated with it.
+  if ($data_stream->bundle() == 'basic' && !empty($data_stream->id())) {
+    \Drupal::database()->delete('data_stream_basic')
+      ->condition('id', $data_stream->id())
+      ->execute();
+  }
 }