Skip to content

Check arity consistency when constructing SqlFunctionExpressions #33815

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
cincuranet merged 3 commits into from
May 29, 2024
Merged

Check arity consistency when constructing SqlFunctionExpressions #33815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
756af09
Check arity consistency when constructing `SqlFunctionExpression`s
ranma42 May 26, 2024
1ff7042
Fix arity of `random()` translation
ranma42 May 25, 2024
9f56b59
Fix arity of `rtrim(X,Y)` translation
ranma42 May 29, 2024
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
8 changes: 8 additions & 0 deletions src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/EFCore.Relational/Properties/RelationalStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,9 @@
<data name="IncompatibleViewNoRelationship" xml:space="preserve">
<value>Cannot use view '{view}' for entity type '{entityType}' since it is being used for entity type '{otherEntityType}' and there is no relationship between their primary keys.</value>
</data>
<data name="InconsistentNumberOfArguments" xml:space="preserve">
<value>'{name}' was constructed with {argumentCount} arguments, but the nullability was defined for {argumentNullabilityCount} arguments.</value>
</data>
<data name="IncorrectDefaultValueType" xml:space="preserve">
<value>Cannot set default value '{value}' of type '{valueType}' on property '{property}' of type '{propertyType}' in entity type '{entityType}'.</value>
</data>
Expand Down
11 changes: 11 additions & 0 deletions src/EFCore.Relational/Query/SqlExpressions/SqlFunctionExpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,17 @@ public SqlFunctionExpression(
IsNullable = nullable;
InstancePropagatesNullability = instancePropagatesNullability;
ArgumentsPropagateNullability = argumentsPropagateNullability?.ToList();

if (Arguments?.Count != ArgumentsPropagateNullability?.Count)
{
throw new InvalidOperationException(
RelationalStrings.InconsistentNumberOfArguments(
name,
Arguments?.Count(),
ArgumentsPropagateNullability?.Count()
)
);
}
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Sqlite.Core/Query/Internal/Translators/SqliteRandomTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public SqliteRandomTranslator(ISqlExpressionFactory sqlExpressionFactory)
_sqlExpressionFactory.Constant(9223372036854780000.0))
},
nullable: false,
argumentsPropagateNullability: Enumerable.Empty<bool>(),
argumentsPropagateNullability: [true],
method.ReturnType)
: null;
}
4 changes: 2 additions & 2 deletions src/EFCore.Sqlite.NTS/Query/Internal/SqliteGeometryMemberTranslator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public SqliteGeometryMemberTranslator(ISqlExpressionFactory sqlExpressionFactory
_sqlExpressionFactory.Constant(" ZM")
},
nullable: true,
argumentsPropagateNullability: new[] { true },
argumentsPropagateNullability: new[] { true, true },
returnType),
new[]
{
Expand Down Expand Up @@ -139,7 +139,7 @@ public SqliteGeometryMemberTranslator(ISqlExpressionFactory sqlExpressionFactory
_sqlExpressionFactory.Constant(" ZM")
},
nullable: true,
argumentsPropagateNullability: new[] { true },
argumentsPropagateNullability: new[] { true, true },
typeof(string)),
new[]
{
Expand Down