Skip to content

DataAnnotation: Usage of nameof in ForeignKeyAttribute/InversePropertyAttribute #108

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
merged 3 commits into from
Apr 29, 2020
Merged

DataAnnotation: Usage of nameof in ForeignKeyAttribute/InversePropertyAttribute #108

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
3859cd3
Usage of nameof in ForeignKeyAttribute/InversePropertyAttribute
codingdna2 Apr 23, 2020
b61eb86
Fix formatting issue in class.hbs
codingdna2 Apr 23, 2020
a56673a
Fixed unit test for formatting issue in CSharpEntityType
codingdna2 Apr 26, 2020
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/EntityFrameworkCore.Scaffolding.Handlebars/CodeTemplates/CSharpEntityType/Class.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace {{namespace}}
{
{{#if class-annotation}}
{{{class-annotation}}}
{{spaces 4}}{{{class-annotation}}}
{{/if}}
public partial class {{class}}
{
Expand Down
19 changes: 15 additions & 4 deletions src/EntityFrameworkCore.Scaffolding.Handlebars/HbsCSharpEntityTypeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,16 @@ private void GenerateForeignKeyAttribute(INavigation navigation)
{
var foreignKeyAttribute = new AttributeWriter(nameof(ForeignKeyAttribute));

foreignKeyAttribute.AddParameter(
CSharpHelper.Literal(
string.Join(",", navigation.ForeignKey.Properties.Select(p => p.Name))));
if (navigation.ForeignKey.Properties.Count > 1)
{
foreignKeyAttribute.AddParameter(
CSharpHelper.Literal(
string.Join(",", navigation.ForeignKey.Properties.Select(p => p.Name))));
}
else
{
foreignKeyAttribute.AddParameter($"nameof({navigation.ForeignKey.Properties.First().Name})");
}

NavPropertyAnnotations.Add(new Dictionary<string, object>
{
Expand All @@ -423,7 +430,11 @@ private void GenerateInversePropertyAttribute(INavigation navigation)
{
var inversePropertyAttribute = new AttributeWriter(nameof(InversePropertyAttribute));

inversePropertyAttribute.AddParameter(CSharpHelper.Literal(inverseNavigation.Name));
inversePropertyAttribute.AddParameter(
!navigation.DeclaringEntityType.GetPropertiesAndNavigations().Any(
m => m.Name == inverseNavigation.DeclaringEntityType.Name)
? $"nameof({inverseNavigation.DeclaringEntityType.Name}.{inverseNavigation.Name})"
: CSharpHelper.Literal(inverseNavigation.Name));

NavPropertyAnnotations.Add(new Dictionary<string, object>
{
Expand Down
2 changes: 1 addition & 1 deletion test/Scaffolding.Handlebars.Tests/CodeTemplates/CSharpEntityType/Class.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace {{namespace}}
{
{{#if class-annotation}}
{{{class-annotation}}}
{{spaces 4}}{{{class-annotation}}}
{{/if}}
public partial class {{class}}
{
Expand Down
2 changes: 1 addition & 1 deletion ...caffolding.Handlebars.Tests/EmbeddedResourceTemplateFileServiceTests.ExpectedTemplates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public partial class {{class}} : DbContext
namespace {{namespace}}
{
{{#if class-annotation}}
{{{class-annotation}}}
{{spaces 4}}{{{class-annotation}}}
{{/if}}
public partial class {{class}}
{
Expand Down
2 changes: 1 addition & 1 deletion test/Scaffolding.Handlebars.Tests/ExpectedEntities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public partial class Product
public byte[] RowVersion { get; set; }
public int? CategoryId { get; set; }

[ForeignKey(""CategoryId"")]
[ForeignKey(nameof(CategoryId))]
[InverseProperty(""Product"")]
public virtual Category Category { get; set; }
}
Expand Down
2 changes: 1 addition & 1 deletion test/Scaffolding.Handlebars.Tests/FileSystemTemplateFileServiceTests.ExpectedTemplates.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public partial class {{class}} : DbContext
namespace {{namespace}}
{
{{#if class-annotation}}
{{{class-annotation}}}
{{spaces 4}}{{{class-annotation}}}
{{/if}}
public partial class {{class}}
{
Expand Down