Check if tenant id is not empty before adding parameter to query

src/EventSourcingTests/delete_single_event_stream.cs

@@ -75,6 +75,39 @@ public async Task delete_stream_by_guid_id_conjoined_tenancy()
         }
     }
 
+    [Fact]
+    public async Task delete_stream_by_guid_id_conjoined_tenancy_with_no_tenant_id()
+    {
+        StoreOptions(opts => opts.Events.TenancyStyle = TenancyStyle.Conjoined);
+
+        var stream1 = Guid.NewGuid();
+        var stream2 = Guid.NewGuid();
+
+        using (var session = theStore.LightweightSession())
+        {
+            var joined = new MembersJoined { Members = new[] { "Rand", "Matt", "Perrin", "Thom" } };
+            var departed = new MembersDeparted { Members = new[] { "Thom" } };
+
+            session.Events.Append(stream1, joined, departed);
+
+            var joined2 = new MembersJoined { Members = new[] { "Rand", "Matt", "Perrin", "Thom" } };
+            var departed2 = new MembersDeparted { Members = new[] { "Thom" } };
+
+            session.Events.Append(stream2, joined2, departed2);
+
+            await session.SaveChangesAsync();
+        }
+
+        await theStore.Advanced.Clean.DeleteSingleEventStreamAsync(stream1);
+
+        using (var session = theStore.LightweightSession())
+        {
+            var events = session.Events.QueryAllRawEvents().ToList();
+            events.All(x => x.StreamId == stream2)
+                .ShouldBeTrue();
+        }
+    }
+
     [Fact]
     public async Task delete_stream_by_guid_id_async()
     {

src/Marten/Storage/MartenDatabase.DocumentCleaner.cs

@@ -180,39 +180,6 @@ IF EXISTS(SELECT * FROM information_schema.tables
 ";
     }
 
-    private void DeleteSingleEventStream<T>(T streamId, string? tenantId = null)
-    {
-        if (typeof(T) != Options.EventGraph.GetStreamIdType())
-        {
-            throw new ArgumentException(
-                $"{nameof(streamId)} should  be of type {Options.EventGraph.GetStreamIdType()}", nameof(streamId));
-        }
-
-        using var conn = CreateConnection();
-        var streamsWhere = "id = :id";
-        var eventsWhere = "stream_id = :id";
-
-        if (Options.Events.TenancyStyle == TenancyStyle.Conjoined)
-        {
-            var tenantPart = " AND tenant_id = :tenantId";
-            streamsWhere += tenantPart;
-            eventsWhere += tenantPart;
-        }
-
-        var cmd = conn.CreateCommand(
-            $"delete from {Options.Events.DatabaseSchemaName}.mt_events where {eventsWhere};delete from {Options.Events.DatabaseSchemaName}.mt_streams where {streamsWhere}");
-        cmd.AddNamedParameter("id", streamId);
-
-        if (Options.Events.TenancyStyle == TenancyStyle.Conjoined && tenantId.IsNotEmpty())
-        {
-            cmd.AddNamedParameter("tenantId", tenantId);
-        }
-
-        conn.Open();
-
-        cmd.ExecuteNonQuery();
-    }
-
     private async Task DeleteSingleEventStreamAsync<T>(T streamId, string? tenantId = null,
         CancellationToken ct = default)
     {
@@ -226,7 +193,7 @@ private async Task DeleteSingleEventStreamAsync<T>(T streamId, string? tenantId
         var streamsWhere = "id = :id";
         var eventsWhere = "stream_id = :id";
 
-        if (Options.Events.TenancyStyle == TenancyStyle.Conjoined)
+        if (Options.Events.TenancyStyle == TenancyStyle.Conjoined && tenantId.IsNotEmpty())
         {
             var tenantPart = " AND tenant_id = :tenantId";
             streamsWhere += tenantPart;