Use AssemblyQualifiedName to distinguish db functions. Fix issue #18425 #18612
Conversation
This file contains 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
pmiddleton
force-pushed
the
dbFunctionAssemblyNameFix
branch
from
338520e
to
6ef7c9d
Compare
smitpatel
reviewed
Oct 28, 2019
| @@ -121,7 +121,8 @@ public static IEnumerable<DbFunction> GetDbFunctions([NotNull] Model model) | |||
| private static string BuildAnnotationName(MethodBase methodBase) | |||
| => | |||
| // ReSharper disable once AssignNullToNotNullAttribute | |||
| $"{RelationalAnnotationNames.DbFunction}{methodBase.DeclaringType.ShortDisplayName()}{methodBase.Name}({string.Join(",", methodBase.GetParameters().Select(p => p.ParameterType.Name))})"; | |||
| // ReSharper disable once PossibleNullReferenceException | |||
| $"{RelationalAnnotationNames.DbFunction}{methodBase.DeclaringType.AssemblyQualifiedName}{methodBase.Name}({string.Join(",", methodBase.GetParameters().Select(p => p.ParameterType.Name))})"; | |||
There was a problem hiding this comment.
Use namespace qualified name.
There was a problem hiding this comment.
ParameterType.Name will only return Nullable`1 without the generic parameter for nullable fields so I switched to Fullname to prevent collisions there as well.
pmiddleton
force-pushed
the
dbFunctionAssemblyNameFix
branch
from
6ef7c9d
to
82becd4
Compare
smitpatel
reviewed
Oct 29, 2019
pmiddleton
force-pushed
the
dbFunctionAssemblyNameFix
branch
from
82becd4
to
924c618
Compare
pmiddleton
force-pushed
the
dbFunctionAssemblyNameFix
branch
from
924c618
to
5347ffe
Compare
|
Can we also update the commit message. |
|
cc: @Pilchie |
smitpatel
force-pushed
the
dbFunctionAssemblyNameFix
branch
from
5347ffe
to
fe0d550
Compare
|
@pmiddleton - Thanks 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Update dbfunctions to use the AssemblyQualifiedName in their annotation name. This will prevent nested, and cross assembly, class functions from having name collisions.
Fixes #18425