Skip to content

fix: apply DateTime to DATE mapping #633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdahps wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −1
Open

fix: apply DateTime to DATE mapping #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad5c9e2
fix: apply DateTime to DATE mapping
sdahps Dec 5, 2025
85fcffa
Merge branch 'main' into date-only-migrations
olavloite Jan 16, 2026
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
10 changes: 10 additions & 0 deletions Google.Cloud.EntityFrameworkCore.Spanner/Storage/Internal/SpannerDateDateTimeTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
using System;

namespace Google.Cloud.EntityFrameworkCore.Spanner.Storage.Internal;

internal class SpannerDateDateTimeTypeMapping : SpannerDateTypeMapping
{
public SpannerDateDateTimeTypeMapping() : base(typeof(DateTime))
{
}
}
9 changes: 8 additions & 1 deletion Google.Cloud.EntityFrameworkCore.Spanner/Storage/Internal/SpannerDateTypeMapping.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ internal class SpannerDateTypeMapping : RelationalTypeMapping
v => SpannerDate.FromDateTime(v));

public SpannerDateTypeMapping()
: this(typeof(SpannerDate))
{ }

protected SpannerDateTypeMapping(System.Type clrType)
: base(new RelationalTypeMappingParameters(
new CoreTypeMappingParameters(typeof(SpannerDate), s_converter),
new CoreTypeMappingParameters(clrType,
// use converter only for SpannerDate; DateTime maps directly
clrType == typeof(SpannerDate) ? s_converter : null
),
"DATE", StoreTypePostfix.None, System.Data.DbType.Date))
{ }

Expand Down
7 changes: 7 additions & 0 deletions Google.Cloud.EntityFrameworkCore.Spanner/Storage/Internal/SpannerTypeMappingSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ private static readonly BoolTypeMapping s_bool
= new SpannerBoolTypeMapping(SpannerDbType.Bool.ToString());

private static readonly SpannerDateTypeMapping s_date = new SpannerDateTypeMapping();
private static readonly SpannerDateDateTimeTypeMapping s_dateTimeDate = new SpannerDateDateTimeTypeMapping();

private static readonly SpannerDateOnlyTypeMapping s_dateonly = new ();

Expand Down Expand Up @@ -327,6 +328,12 @@ private RelationalTypeMapping FindRawMapping(RelationalTypeMappingInfo mappingIn
if (_storeTypeMappings.TryGetValue(storeTypeName, out var mapping)
|| _storeTypeMappings.TryGetValue(storeTypeNameBase, out mapping))
{
// if DateTime is being used to map to DATE we need to use the default DateTime<>DateTime mapping instead of trying to use DateTime<>SpannerDate
Copy link

@gemini-code-assist gemini-code-assist bot Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This comment is a bit misleading. The mapping being returned is for DateTime to the store type DATE, not a DateTime<>DateTime mapping. This logic is special handling for when a DateTime property is explicitly configured to map to a DATE column. A clearer comment would help future maintainers understand this specific logic.

// When mapping DateTime to DATE, use a specific mapping for DateTime. The default DATE mapping is for SpannerDate and uses a converter.

if (mapping == s_date && clrType == typeof(DateTime))
{
return s_dateTimeDate;
}

if (clrType == null
|| mapping.ClrType == clrType
|| mapping.Converter?.ProviderClrType == clrType)
Expand Down
Loading