Skip to content

Allow schema-less UDFs to not be built-in #23829

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

Merged
1 commit merged into from
Jan 7, 2021
Merged

Allow schema-less UDFs to not be built-in #23829

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Query/ISqlExpressionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ SqlFunctionExpression Function(
/// <param name="typeMapping"> The <see cref="RelationalTypeMapping" /> associated with the expression. </param>
/// <returns> An expression representing a function call in a SQL tree. </returns>
SqlFunctionExpression Function(
[NotNull] string schema,
[CanBeNull] string? schema,
[NotNull] string name,
[NotNull] IEnumerable<SqlExpression> arguments,
bool nullable,
Expand Down
12 changes: 1 addition & 11 deletions src/EFCore.Relational/Query/RelationalMethodCallTranslatorProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,7 @@ public RelationalMethodCallTranslatorProvider([NotNull] RelationalMethodCallTran

var argumentsPropagateNullability = dbFunction.Parameters.Select(p => p.PropagatesNullability);

if (dbFunction.IsBuiltIn)
{
return _sqlExpressionFactory.Function(
dbFunction.Name,
arguments,
dbFunction.IsNullable,
argumentsPropagateNullability,
method.ReturnType.UnwrapNullableType());
}

return dbFunction.Schema is null
return dbFunction.IsBuiltIn
? _sqlExpressionFactory.Function(
dbFunction.Name,
arguments,
Expand Down
4 changes: 2 additions & 2 deletions src/EFCore.Relational/Query/SqlExpressionFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,15 +636,15 @@ public virtual SqlFunctionExpression Function(

/// <inheritdoc />
public virtual SqlFunctionExpression Function(
string schema,
string? schema,
string name,
IEnumerable<SqlExpression> arguments,
bool nullable,
IEnumerable<bool> argumentsPropagateNullability,
Type returnType,
RelationalTypeMapping? typeMapping = null)
{
Check.NotNull(schema, nameof(schema));
Check.NullButNotEmpty(schema, nameof(schema));
Check.NotEmpty(name, nameof(name));
Check.NotNull(arguments, nameof(arguments));
Check.NotNull(argumentsPropagateNullability, nameof(argumentsPropagateNullability));
Expand Down