Upgrade provider and test code to 3.1.x #41
Fix issues in EFCore.Jet and simplify query generation based on tests.
- Loading branch information
commit e0409411c93147aac0bdb6470ecd9ccc8e46ec91
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <Project> | ||
| <Import Project="..\Directory.Build.props" /> | ||
|
|
||
| <PropertyGroup> | ||
| <IsPackable>True</IsPackable> | ||
| <IncludeSymbols>True</IncludeSymbols> | ||
| <SignAssembly>True</SignAssembly> | ||
| <AssemblyOriginatorKeyFile>..\..\build\Key.snk</AssemblyOriginatorKeyFile> | ||
| <EmbedUntrackedSources>True</EmbedUntrackedSources> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,5 @@ | ||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
|
||
| using Microsoft.EntityFrameworkCore.Design; | ||
|
|
||
| [assembly: DesignTimeProviderServices("EntityFrameworkCore.Jet.Design.Internal.JetDesignTimeServices")] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | ||
|
|
||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Reflection; | ||
| using Microsoft.EntityFrameworkCore; | ||
| using Microsoft.EntityFrameworkCore.Query; | ||
| using Microsoft.EntityFrameworkCore.Query.SqlExpressions; | ||
|
|
||
| namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal | ||
| { | ||
| public class JetDateDiffFunctionsTranslator : IMethodCallTranslator | ||
| { | ||
| private readonly Dictionary<MethodInfo, string> _methodInfoDateDiffMapping | ||
| = new Dictionary<MethodInfo, string> | ||
| { | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffYear), | ||
| new[] { typeof(DbFunctions), typeof(DateTime), typeof(DateTime) }), | ||
| "yyyy" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffYear), | ||
| new[] { typeof(DbFunctions), typeof(DateTime?), typeof(DateTime?) }), | ||
| "yyyy" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffYear), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(DateTimeOffset) }), | ||
| "yyyy" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffYear), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset?), typeof(DateTimeOffset?) }), | ||
| "yyyy" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMonth), | ||
| new[] { typeof(DbFunctions), typeof(DateTime), typeof(DateTime) }), | ||
| "m" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMonth), | ||
| new[] { typeof(DbFunctions), typeof(DateTime?), typeof(DateTime?) }), | ||
| "m" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMonth), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(DateTimeOffset) }), | ||
| "m" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMonth), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset?), typeof(DateTimeOffset?) }), | ||
| "m" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffDay), | ||
| new[] { typeof(DbFunctions), typeof(DateTime), typeof(DateTime) }), | ||
| "d" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffDay), | ||
| new[] { typeof(DbFunctions), typeof(DateTime?), typeof(DateTime?) }), | ||
| "d" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffDay), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(DateTimeOffset) }), | ||
| "d" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffDay), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset?), typeof(DateTimeOffset?) }), | ||
| "d" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffHour), | ||
| new[] { typeof(DbFunctions), typeof(DateTime), typeof(DateTime) }), | ||
| "h" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffHour), | ||
| new[] { typeof(DbFunctions), typeof(DateTime?), typeof(DateTime?) }), | ||
| "h" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffHour), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(DateTimeOffset) }), | ||
| "h" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffHour), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset?), typeof(DateTimeOffset?) }), | ||
| "h" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffHour), | ||
| new[] { typeof(DbFunctions), typeof(TimeSpan), typeof(TimeSpan) }), | ||
| "h" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffHour), | ||
| new[] { typeof(DbFunctions), typeof(TimeSpan?), typeof(TimeSpan?) }), | ||
| "h" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMinute), | ||
| new[] { typeof(DbFunctions), typeof(DateTime), typeof(DateTime) }), | ||
| "n" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMinute), | ||
| new[] { typeof(DbFunctions), typeof(DateTime?), typeof(DateTime?) }), | ||
| "n" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMinute), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(DateTimeOffset) }), | ||
| "n" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMinute), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset?), typeof(DateTimeOffset?) }), | ||
| "n" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMinute), | ||
| new[] { typeof(DbFunctions), typeof(TimeSpan), typeof(TimeSpan) }), | ||
| "n" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffMinute), | ||
| new[] { typeof(DbFunctions), typeof(TimeSpan?), typeof(TimeSpan?) }), | ||
| "n" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffSecond), | ||
| new[] { typeof(DbFunctions), typeof(DateTime), typeof(DateTime) }), | ||
| "s" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffSecond), | ||
| new[] { typeof(DbFunctions), typeof(DateTime?), typeof(DateTime?) }), | ||
| "s" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffSecond), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset), typeof(DateTimeOffset) }), | ||
| "s" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffSecond), | ||
| new[] { typeof(DbFunctions), typeof(DateTimeOffset?), typeof(DateTimeOffset?) }), | ||
| "s" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffSecond), | ||
| new[] { typeof(DbFunctions), typeof(TimeSpan), typeof(TimeSpan) }), | ||
| "s" | ||
| }, | ||
| { | ||
| typeof(JetDbFunctionsExtensions).GetRuntimeMethod( | ||
| nameof(JetDbFunctionsExtensions.DateDiffSecond), | ||
| new[] { typeof(DbFunctions), typeof(TimeSpan?), typeof(TimeSpan?) }), | ||
| "s" | ||
| }, | ||
| }; | ||
|
|
||
| private readonly ISqlExpressionFactory _sqlExpressionFactory; | ||
|
|
||
| public JetDateDiffFunctionsTranslator( | ||
| ISqlExpressionFactory sqlExpressionFactory) | ||
| { | ||
| _sqlExpressionFactory = sqlExpressionFactory; | ||
| } | ||
|
|
||
| public virtual SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadOnlyList<SqlExpression> arguments) | ||
| { | ||
| if (_methodInfoDateDiffMapping.TryGetValue(method, out var datePart)) | ||
| { | ||
| var startDate = arguments[1]; | ||
| var endDate = arguments[2]; | ||
| var typeMapping = ExpressionExtensions.InferTypeMapping(startDate, endDate); | ||
|
|
||
| startDate = _sqlExpressionFactory.ApplyTypeMapping(startDate, typeMapping); | ||
| endDate = _sqlExpressionFactory.ApplyTypeMapping(endDate, typeMapping); | ||
|
|
||
| return _sqlExpressionFactory.Function( | ||
| "DATEDIFF", | ||
| new[] { _sqlExpressionFactory.Constant(datePart), startDate, endDate }, | ||
| typeof(int)); | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.