Skip to content

Commit

Permalink
Fix for the combo of managed list partition tables and the command li…
Browse files Browse the repository at this point in the history
…ne usage for patching
  • Loading branch information
jeremydmiller committed Sep 25, 2024
1 parent b5940c3 commit 09e6ffc
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<Version>7.28.1</Version>
<Version>7.28.2</Version>
<LangVersion>12.0</LangVersion>
<Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
<PackageIconUrl>https://martendb.io/logo.png</PackageIconUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/Marten.CommandLine/Marten.CommandLine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<PackageReference Include="JasperFx.CodeGeneration.Commands" Version="3.5.3" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
<PackageReference Include="Oakton" Version="6.2.1" />
<PackageReference Include="Weasel.CommandLine" Version="7.9.0" />
<PackageReference Include="Weasel.CommandLine" Version="7.11.1" />
</ItemGroup>
<Import Project="../../Analysis.Build.props"/>
</Project>
2 changes: 1 addition & 1 deletion src/Marten/Marten.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PackageReference Include="Polly.Core" Version="8.3.1" />
<PackageReference Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
<PackageReference Include="Weasel.Postgresql" Version="7.11.0" />
<PackageReference Include="Weasel.Postgresql" Version="7.11.1" />
</ItemGroup>

<!--SourceLink specific settings-->
Expand Down
5 changes: 4 additions & 1 deletion src/Marten/Schema/MartenManagedTenantListPartitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Threading;
using System.Threading.Tasks;
using JasperFx.Core.Reflection;
using Marten.Events;
using Marten.Storage;
using Marten.Storage.Metadata;
using Npgsql;
Expand Down Expand Up @@ -35,7 +36,9 @@ public MartenManagedTenantListPartitions(StoreOptions options, string? schemaNam

public void Apply(DocumentMapping mapping)
{
if (mapping.TenancyStyle == TenancyStyle.Conjoined || mapping.DocumentType.HasAttribute<SingleTenantedAttribute>())
if (mapping is EventQueryMapping) return;

if (mapping.TenancyStyle == TenancyStyle.Conjoined && !mapping.DocumentType.HasAttribute<SingleTenantedAttribute>())
{
mapping.Partitioning =
new ListPartitioning { Columns = [TenantIdColumn.Name] }.UsePartitionManager(Partitions);
Expand Down

0 comments on commit 09e6ffc

Please sign in to comment.