Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/DocumentDbTests/Bugs/Bug_3778_schema_name_issue.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Threading.Tasks;
using JasperFx;
using Marten.Testing;
using Marten.Testing.Harness;
using Xunit;

namespace DocumentDbTests.Bugs;

public class Bug_3778_schema_name_issue: OneOffConfigurationsContext
{
private string Schema = "pprd";

[Fact]
public async Task TestSchemaNameEndingWith_d_BeingCutOff_In_Index()
{
StoreOptions(options =>
{
options.Connection(ConnectionSource.ConnectionString);
options.AutoCreateSchemaObjects = AutoCreate.All;
options.DatabaseSchemaName = Schema;
options.Schema.For<User3778>()
.Index(d => d.Created);
});

await theStore.EnsureStorageExistsAsync(typeof(User3778));
}
}

public record User3778(Guid Id, string Name, DateTimeOffset Created);
6 changes: 3 additions & 3 deletions src/Marten/Linq/Members/DateTimeMember.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public DateTimeMember(StoreOptions options, IQueryableMember parent, Casing casi

public override string SelectorForDuplication(string pgType)
{
return TypedLocator.Replace("d.", "");
return TypedLocator.Replace("d.data ->", "data ->");
}
}

Expand All @@ -27,7 +27,7 @@ public DateOnlyMember(StoreOptions options, IQueryableMember parent, Casing casi

public override string SelectorForDuplication(string pgType)
{
return TypedLocator.Replace("d.", "");
return TypedLocator.Replace("d.data ->", "data ->");
}

}
Expand All @@ -41,7 +41,7 @@ public TimeOnlyMember(StoreOptions options, IQueryableMember parent, Casing casi

public override string SelectorForDuplication(string pgType)
{
return TypedLocator.Replace("d.", "");
return TypedLocator.Replace("d.data ->", "data ->");
}

}
2 changes: 1 addition & 1 deletion src/Marten/Linq/Members/DateTimeOffsetMember.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public DateTimeOffsetMember(StoreOptions options, IQueryableMember parent, Casin

public override string SelectorForDuplication(string pgType)
{
return TypedLocator.Replace("d.", "");
return TypedLocator.Replace("d.data ->", "data ->");
}

public override ISqlFragment CreateComparison(string op, ConstantExpression constant)
Expand Down
9 changes: 5 additions & 4 deletions src/Marten/Schema/ComputedIndex.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,12 @@ private IEnumerable<string> buildColumns()
casing = Casings.Default;
}

var sql = member.MemberType.IsEnumerable()
? member is ChildCollectionMember ? member.TypedLocator : member.RawLocator
: member.TypedLocator;
var rawLocator = member.RawLocator.Replace("d.data ->", "data ->");
var typedLocator = member.TypedLocator.Replace("d.data ->", "data ->");

sql = sql.Replace("d.", "");
var sql = member.MemberType.IsEnumerable()
? member is ChildCollectionMember ? typedLocator : rawLocator
: typedLocator;

switch (casing)
{
Expand Down
3 changes: 1 addition & 2 deletions src/Marten/Schema/NgramIndex.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ protected override string deriveIndexName()

private static string GetDataConfig(DocumentMapping mapping, MemberInfo[] members)
{
var dataConfig = $"{mapping.QueryMembers.MemberFor(members).TypedLocator.Replace("d.", "")}";

var dataConfig = $"{mapping.QueryMembers.MemberFor(members).TypedLocator.Replace("d.data ->", "data ->")}";
return $"{dataConfig}";
}
}
Loading