-
Notifications
You must be signed in to change notification settings - Fork 227
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.
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
Fk match strategy #3412
Open
WhatzGames
wants to merge
6
commits into
npgsql:main
Choose a base branch
from
WhatzGames:FKMatchStrategy
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+281
−7
Open
Fk match strategy #3412
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3c428f7
added extensions for postgres multicolumn foreign key match
WhatzGames 74a2fdf
added match sql translation and covering test
WhatzGames e8bae54
renamed method for consistency
WhatzGames 5b55da2
further cleanup of namings etc.
WhatzGames 8fcd68b
remove attribute and apply cleanup
WhatzGames deaa27d
cleanup assertion format
WhatzGames File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
72 changes: 72 additions & 0 deletions
72
src/EFCore.PG/Extensions/BuilderExtensions/NpgsqlForeignKeyBuilderExtensions.cs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||
|
||
// ReSharper disable once CheckNamespace | ||
namespace Microsoft.EntityFrameworkCore; | ||
|
||
/// <summary> | ||
/// Npgsql specific extension methods for configuring foreign keys. | ||
/// </summary> | ||
public static class NpgsqlForeignKeyBuilderExtensions | ||
{ | ||
/// <summary> | ||
/// Configure the matching strategy to be used with the foreign key. | ||
/// </summary> | ||
/// <param name="builder">The builder for the foreign key being configured.</param> | ||
/// <param name="matchStrategy">The <see cref="PostgresMatchStrategy" /> defining the used matching strategy.</param> | ||
/// <remarks> | ||
/// <see href="https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-REFERENCES" /> | ||
/// </remarks> | ||
public static ReferenceReferenceBuilder UsesMatchStrategy(this ReferenceReferenceBuilder builder, PostgresMatchStrategy matchStrategy) | ||
{ | ||
Check.NotNull(builder, nameof(builder)); | ||
Check.IsDefined(matchStrategy, nameof(matchStrategy)); | ||
builder.Metadata.SetMatchStrategy(matchStrategy); | ||
return builder; | ||
} | ||
|
||
/// <summary> | ||
/// Configure the matching strategy to be used with the foreign key. | ||
/// </summary> | ||
/// <param name="builder">The builder for the foreign key being configured.</param> | ||
/// <param name="matchStrategy">The <see cref="PostgresMatchStrategy" /> defining the used matching strategy.</param> | ||
/// <remarks> | ||
/// <see href="https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-REFERENCES" /> | ||
/// </remarks> | ||
public static ReferenceReferenceBuilder<TEntity, TRelatedEntity> UsesMatchStrategy<TEntity, TRelatedEntity>( | ||
this ReferenceReferenceBuilder<TEntity, TRelatedEntity> builder, | ||
PostgresMatchStrategy matchStrategy) | ||
where TEntity : class | ||
where TRelatedEntity : class | ||
=> (ReferenceReferenceBuilder<TEntity, TRelatedEntity>)UsesMatchStrategy((ReferenceReferenceBuilder)builder, matchStrategy); | ||
|
||
/// <summary> | ||
/// Configure the matching strategy to be used with the foreign key. | ||
/// </summary> | ||
/// <param name="builder">The builder for the foreign key being configured.</param> | ||
/// <param name="matchStrategy">The <see cref="PostgresMatchStrategy" /> defining the used matching strategy.</param> | ||
/// <remarks> | ||
/// <see href="https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-REFERENCES" /> | ||
/// </remarks> | ||
public static ReferenceCollectionBuilder UsesMatchStrategy(this ReferenceCollectionBuilder builder, PostgresMatchStrategy matchStrategy) | ||
{ | ||
Check.NotNull(builder, nameof(builder)); | ||
Check.IsDefined(matchStrategy, nameof(matchStrategy)); | ||
builder.Metadata.SetMatchStrategy(matchStrategy); | ||
return builder; | ||
} | ||
|
||
/// <summary> | ||
/// Configure the matching strategy to be used with the foreign key. | ||
/// </summary> | ||
/// <param name="builder">The builder for the foreign key being configured.</param> | ||
/// <param name="matchStrategy">The <see cref="PostgresMatchStrategy" /> defining the used matching strategy.</param> | ||
/// <remarks> | ||
/// <see href="https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-REFERENCES" /> | ||
/// </remarks> | ||
public static ReferenceCollectionBuilder UsesMatchStrategy<TEntity, TRelatedEntity>( | ||
this ReferenceCollectionBuilder<TEntity, TRelatedEntity> builder, | ||
PostgresMatchStrategy matchStrategy) | ||
where TEntity : class | ||
where TRelatedEntity : class | ||
=> (ReferenceCollectionBuilder<TEntity, TRelatedEntity>)UsesMatchStrategy((ReferenceCollectionBuilder)builder, matchStrategy); | ||
} |
30 changes: 30 additions & 0 deletions
30
src/EFCore.PG/Extensions/MetadataExtensions/NpgsqlForeignKeyExtensions.cs
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata.Internal; | ||
// ReSharper disable once CheckNamespace | ||
|
||
namespace Microsoft.EntityFrameworkCore; | ||
|
||
/// <summary> | ||
/// Npgsql specific extension methods for <see cref="IForeignKey" />. | ||
/// </summary> | ||
public static class NpgsqlForeignKeyExtensions | ||
{ | ||
/// <summary> | ||
/// Sets the <see cref="PostgresMatchStrategy" /> for a foreign key. | ||
/// </summary> | ||
/// <param name="foreignKey">the foreign key being configured.</param> | ||
/// <param name="matchStrategy">the <see cref="PostgresMatchStrategy" /> defining the used matching strategy.</param> | ||
/// <remarks> | ||
/// <see href="https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-REFERENCES" /> | ||
/// </remarks> | ||
public static void SetMatchStrategy(this IMutableForeignKey foreignKey, PostgresMatchStrategy matchStrategy) | ||
=> foreignKey.SetOrRemoveAnnotation(NpgsqlAnnotationNames.MatchStrategy, matchStrategy); | ||
|
||
/// <summary> | ||
/// Returns the assigned <see cref="PostgresMatchStrategy" /> for the provided foreign key | ||
/// </summary> | ||
/// <param name="foreignKey">the foreign key</param> | ||
/// <returns>the <see cref="PostgresMatchStrategy" /> if assigned, null otherwise</returns> | ||
public static PostgresMatchStrategy? GetMatchStrategy(this IReadOnlyForeignKey foreignKey) | ||
=> (PostgresMatchStrategy?)foreignKey[NpgsqlAnnotationNames.MatchStrategy]; | ||
} |
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
namespace Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; | ||
|
||
/// <summary> | ||
/// Matching strategies for a foreign key. | ||
/// </summary> | ||
/// <remarks> | ||
/// <see href="https://www.postgresql.org/docs/current/sql-createtable.html#SQL-CREATETABLE-PARMS-REFERENCES" /> | ||
/// </remarks> | ||
public enum PostgresMatchStrategy | ||
{ | ||
/// <summary> | ||
/// The default matching strategy, allows any foreign key column to be NULL. | ||
/// </summary> | ||
Simple = 0, | ||
|
||
/// <summary> | ||
/// Currently not implemented in PostgreSQL. | ||
/// </summary> | ||
Partial = 1, | ||
|
||
/// <summary> | ||
/// Requires the foreign key to either have all columns to be set or all columns to be NULL. | ||
/// </summary> | ||
Full = 2 | ||
} |
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@roji Would it be an idea to use the
CallerArgumentExpressionAttribute
for theparameterName
s? Or is there a specific reason, why it's not being used?