Skip to content

Fixed erroneous NotSupportedException #14

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
MHacker9404 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed erroneous NotSupportedException #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 27 additions & 6 deletions EntityFramework.Functions/Function.DbModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ private static IList<FunctionParameter> GetStoreReturnParameters(
if (modelReturnParameterComplexType != null)
{
storeReturnParameterRowType = RowType.Create(
modelReturnParameterComplexType.Properties.Select(property =>
modelReturnParameterComplexType.Properties.Select(property =>
EdmProperty.Create(property.Name, model.ProviderManifest.GetStoreType(property.TypeUsage))),
null);
}
Expand Down Expand Up @@ -553,16 +553,37 @@ private static IList<FunctionParameter> GetModelParameters(
.ToArray();
}

private static IList<FunctionParameter> GetModelParametersForModelDefinedFunction(
this DbModel model, MethodInfo methodInfo)
private static IList<FunctionParameter> GetModelParametersForModelDefinedFunction(this DbModel model,
MethodInfo methodInfo)
{
ParameterInfo[] parameters = methodInfo.GetParameters().ToArray();
/*
return parameters
.Select((parameterInfo) => FunctionParameter.Create(
parameterInfo.GetCustomAttribute<ParameterAttribute>()?.Name ?? parameterInfo.Name,
model.GetModelStructualType(parameterInfo.ParameterType, methodInfo),
ParameterMode.In))
parameterInfo.GetCustomAttribute<ParameterAttribute>()?.Name ?? parameterInfo.Name,
model.GetModelStructualType(parameterInfo.ParameterType, methodInfo),
ParameterMode.In))
.ToArray();
*/
var result = parameters.Select((parameterInfo) =>
{
EdmType type;
try
{
type = model.GetModelPrimitiveType(parameterInfo.ParameterType, methodInfo);
}
catch (NotSupportedException)
{
type = model.GetModelStructualType(parameterInfo.ParameterType, methodInfo);
}

return FunctionParameter.Create(parameterInfo.GetCustomAttribute<ParameterAttribute>()?.Name
?? parameterInfo.Name,
type,
ParameterMode.In);
})
.ToList();
return result;
}

private static IList<FunctionParameter> GetModelReturnParameters(
Expand Down