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
1 change: 1 addition & 0 deletions src/DocumentDbTests/Indexes/computed_indexes.cs
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ index definition was executed in postgresql.

StoreOptions(_ =>
{
_.RegisterFSharpOptionValueTypes();
var columns = new Expression<Func<Target, object>>[]
{
x => x.FSharpDateOption,
Expand Down
16 changes: 16 additions & 0 deletions src/Marten/StoreOptions.MemberFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ public bool TryResolve(IQueryableMember parent, StoreOptions options, MemberInfo
return false;
}

if (valueType.OuterType.IsGenericType
&& valueType.OuterType.GetGenericTypeDefinition() == typeof(FSharpOption<>)
&& isSpecialFSharpOptionDateType(valueType.SimpleType))
{
member = null;
return false;
}

Type baseType;
if (valueType.OuterType.IsGenericType && valueType.OuterType.GetGenericTypeDefinition() == typeof(FSharpOption<>))
{
Expand All @@ -170,4 +178,12 @@ public bool TryResolve(IQueryableMember parent, StoreOptions options, MemberInfo

return true;
}

private static bool isSpecialFSharpOptionDateType(Type simpleType)
{
return simpleType == typeof(DateTime)
|| simpleType == typeof(DateTimeOffset)
|| simpleType == typeof(DateOnly)
|| simpleType == typeof(TimeOnly);
}
}
Loading