Skip to content
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.

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

added translatons for TimeSpan.Total* members #1917

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@

using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.Storage;

namespace Pomelo.EntityFrameworkCore.MySql.Query.Internal
{
public class MySqlMemberTranslatorProvider : RelationalMemberTranslatorProvider
{
public MySqlMemberTranslatorProvider([NotNull] RelationalMemberTranslatorProviderDependencies dependencies)
public MySqlMemberTranslatorProvider(
[NotNull] RelationalMemberTranslatorProviderDependencies dependencies,
IRelationalTypeMappingSource typeMappingSource)
: base(dependencies)
{
var sqlExpressionFactory = (MySqlSqlExpressionFactory)dependencies.SqlExpressionFactory;
Expand All @@ -17,7 +20,7 @@ public MySqlMemberTranslatorProvider([NotNull] RelationalMemberTranslatorProvide
new IMemberTranslator[] {
new MySqlDateTimeMemberTranslator(sqlExpressionFactory),
new MySqlStringMemberTranslator(sqlExpressionFactory),
new MySqlTimeSpanMemberTranslator(sqlExpressionFactory),
new MySqlTimeSpanMemberTranslator(sqlExpressionFactory, typeMappingSource),
});
}
}
Expand Down
68 changes: 52 additions & 16 deletions src/EFCore.MySql/Query/Internal/MySqlTimeSpanMemberTranslator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Microsoft.EntityFrameworkCore.Diagnostics;
using Microsoft.EntityFrameworkCore.Query;
using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
using Microsoft.EntityFrameworkCore.Storage;

namespace Pomelo.EntityFrameworkCore.MySql.Query.Internal
{
Expand All @@ -21,11 +22,27 @@ public class MySqlTimeSpanMemberTranslator : IMemberTranslator
{ nameof(TimeSpan.Seconds), ("second", 1) },
{ nameof(TimeSpan.Milliseconds), ("microsecond", 1000) },
};

private static readonly Dictionary<string, double> _totalTimePartMapping
= new Dictionary<string, double>
{
{ nameof(TimeSpan.TotalDays), 24 * 60 * 60 },
{ nameof(TimeSpan.TotalHours), 60 * 60 },
{ nameof(TimeSpan.TotalMinutes), 60 },
{ nameof(TimeSpan.TotalSeconds), 1 },
{ nameof(TimeSpan.TotalMilliseconds), 0.001 },
{ nameof(TimeSpan.TotalNanoseconds), 0.001 * 0.001 * 0.001 },
};

private readonly MySqlSqlExpressionFactory _sqlExpressionFactory;
private readonly IRelationalTypeMappingSource _typeMappingSource;

public MySqlTimeSpanMemberTranslator(MySqlSqlExpressionFactory sqlExpressionFactory)
public MySqlTimeSpanMemberTranslator(
MySqlSqlExpressionFactory sqlExpressionFactory,
IRelationalTypeMappingSource typeMappingSource)
{
_sqlExpressionFactory = sqlExpressionFactory;
_typeMappingSource = typeMappingSource;
}

public virtual SqlExpression Translate(
Expand All @@ -37,32 +54,51 @@ public MySqlTimeSpanMemberTranslator(MySqlSqlExpressionFactory sqlExpressionFact
var declaringType = member.DeclaringType;
var memberName = member.Name;

if (declaringType == typeof(TimeSpan) &&
_datePartMapping.TryGetValue(memberName, out var datePart))
if (declaringType == typeof(TimeSpan))
{
var extract = _sqlExpressionFactory.NullableFunction(
"EXTRACT",
new[]
{
if (_datePartMapping.TryGetValue(memberName, out var datePart))
{
var extract = _sqlExpressionFactory.NullableFunction(
"EXTRACT",
new[]
{
_sqlExpressionFactory.ComplexFunctionArgument(
new [] {
_sqlExpressionFactory.Fragment($"{datePart.Part} FROM"),
instance
},
" ",
typeof(string))
},
returnType,
false);
},
returnType,
false);

if (datePart.Divisor != 1)
{
return _sqlExpressionFactory.MySqlIntegerDivide(
extract,
_sqlExpressionFactory.Constant(datePart.Divisor));
if (datePart.Divisor != 1)
{
return _sqlExpressionFactory.MySqlIntegerDivide(
extract,
_sqlExpressionFactory.Constant(datePart.Divisor));
}

return extract;
}
else if (_totalTimePartMapping.TryGetValue(memberName, out var multiplicator) == true)
{
var convertToSecondsExpression = _sqlExpressionFactory.NullableFunction(
name: "TIME_TO_SEC",
arguments: new[] { instance },
returnType: typeof(int),
typeMapping: _typeMappingSource.FindMapping(typeof(int))
);

return extract;
var divideExpression = _sqlExpressionFactory.Divide(
left: convertToSecondsExpression,
right: _sqlExpressionFactory.Constant(multiplicator),
typeMapping: _typeMappingSource.FindMapping(typeof(double))
);

return divideExpression;
}
}

return null;
Expand Down
51 changes: 49 additions & 2 deletions test/EFCore.MySql.IntegrationTests/Tests/Models/ExpressionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -437,15 +437,62 @@ public async Task MySqlToStringConvertTranslator()
public async Task MySqlCastTranslator()
{
var result = await _db.DataTypesSimple.Select(m => new {
IntToUlong = (ulong) m.TypeInt,
IntToDecimal = (decimal) m.TypeInt,
IntToUlong = (ulong)m.TypeInt,
IntToDecimal = (decimal)m.TypeInt,
IntToString = "test" + m.TypeInt,
}
).FirstOrDefaultAsync();

Assert.NotNull(result);
}

[Fact]
public async Task MySqlTimeStampTotalsTranslator()
{
var result = await _db.DataTypesSimple.Select(m =>
new {
m.Id,
m.TypeTimeSpan.TotalNanoseconds,
m.TypeTimeSpan.TotalMilliseconds,
m.TypeTimeSpan.TotalSeconds,
m.TypeTimeSpan.TotalMinutes,
m.TypeTimeSpan.TotalHours,
m.TypeTimeSpan.TotalDays,
}).FirstOrDefaultAsync(m => m.Id == _simple.Id);

Assert.Equal(_simple.TypeTimeSpan.TotalNanoseconds, result.TotalNanoseconds);
Assert.Equal(_simple.TypeTimeSpan.TotalMilliseconds, result.TotalMilliseconds);
Assert.Equal(_simple.TypeTimeSpan.TotalSeconds, result.TotalSeconds);
Assert.Equal(_simple.TypeTimeSpan.TotalMinutes, result.TotalMinutes);
Assert.Equal(_simple.TypeTimeSpan.TotalHours, result.TotalHours);
Assert.Equal(_simple.TypeTimeSpan.TotalDays, result.TotalDays);
}

[Fact]
public async Task MySqlTimeStampTotalsCalculationTranslator()
{
var custom = new TimeSpan(1, 2, 3, 4);

var result = await _db.DataTypesSimple
.Select(x => custom)
.Select(c =>
new {
c.TotalNanoseconds,
c.TotalMilliseconds,
c.TotalSeconds,
c.TotalMinutes,
c.TotalHours,
c.TotalDays,
}).FirstOrDefaultAsync();

Assert.Equal(custom.TotalNanoseconds, result.TotalNanoseconds);
Assert.Equal(custom.TotalMilliseconds, result.TotalMilliseconds);
Assert.Equal(custom.TotalSeconds, result.TotalSeconds);
Assert.Equal(custom.TotalMinutes, result.TotalMinutes, tolerance: 0.00001);
Assert.Equal(custom.TotalHours, result.TotalHours, tolerance: 0.00001);
Assert.Equal(custom.TotalDays, result.TotalDays, tolerance: 0.00001);
}

}

}