how-to
/
EntityFrameworkCore.Jet
mirror of https://github.com/bubibubi/EntityFrameworkCore.Jet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conversion translator: only need to translate Convert.To... functions. Was trying to convert other tostring methods and was picking the methods that required an argument which was typically the tostring functions with arguments of the format string or the format provider

Browse Source
6.0-servicing
Christopher Jolly 3 years ago
parent 448386a934
commit c010e412a7
1 changed files with 2 additions and 134 deletions
Show Stats Download Patch File Download Diff File

136
src/EFCore.Jet/Query/ExpressionTranslators/Internal/JetConvertTranslator.cs
Unescape Escape View File

@ -30,18 +30,8 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal
[nameof(Convert.ToDecimal)] = "CCUR", // CDEC does not work https://docs.microsoft.com/en-us/office/troubleshoot/access/cdec-function-error
[nameof(Convert.ToSingle)] = "CSNG",
[nameof(Convert.ToDouble)] = "CDBL",
[nameof(Convert.ToDateTime)] = "CDATE",
//[nameof(Convert.ToDateTime)] = "CDATE",
[nameof(Convert.ToString)] = "CSTR",
[nameof(Boolean.Parse)] = "CBOOL",
[nameof(Byte.Parse)] = "CBYTE",
[nameof(Int16.Parse)] = "CINT",
[nameof(Int32.Parse)] = "CLNG",
// [nameof(Convert.ToInt64)] = "CDEC", // CDEC does not work https://docs.microsoft.com/en-us/office/troubleshoot/access/cdec-function-error
[nameof(Decimal.Parse)] = "CCUR", // CDEC does not work https://docs.microsoft.com/en-us/office/troubleshoot/access/cdec-function-error
[nameof(Single.Parse)] = "CSNG",
[nameof(Double.Parse)] = "CDBL",
[nameof(DateTime.Parse)] = "CDATE"
};
private static readonly List<Type> _supportedTypes = new List<Type>
@ -71,135 +61,13 @@ namespace EntityFrameworkCore.Jet.Query.ExpressionTranslators.Internal
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedBoolParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Boolean).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedByteParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Byte).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedInt16ParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Int16).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedInt32ParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Int32).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedDecimalParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Decimal).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedSingleParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Single).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedDoubleParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(Double).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
private static readonly IEnumerable<MethodInfo> _supportedDateTimeParseMethods
= _functionName.Keys
.SelectMany(
t => typeof(DateTime).GetTypeInfo()
.GetDeclaredMethods(t)
.Where(
m => m.GetParameters()
.Length == 1
&& _supportedTypes.Contains(
m.GetParameters()
.First()
.ParameterType)))
.ToList();
public JetConvertTranslator(ISqlExpressionFactory sqlExpressionFactory)
=> _sqlExpressionFactory = (JetSqlExpressionFactory)sqlExpressionFactory;
public SqlExpression Translate(SqlExpression instance, MethodInfo method, IReadOnlyList<SqlExpression> arguments, IDiagnosticsLogger<DbLoggerCategory.Query> logger)
{
if (_supportedMethods.Contains(method) ||
_supportedBoolParseMethods.Contains(method) ||
_supportedDateTimeParseMethods.Contains(method) ||
_supportedByteParseMethods.Contains(method) ||
_supportedDecimalParseMethods.Contains(method) ||
_supportedDoubleParseMethods.Contains(method) ||
_supportedInt16ParseMethods.Contains(method) ||
_supportedInt32ParseMethods.Contains(method) ||
_supportedSingleParseMethods.Contains(method)
)
if (_supportedMethods.Contains(method))
{
return _sqlExpressionFactory.Convert(arguments[0], method.ReturnType);
}

Write Preview
Loading…
Cancel
Save