Skip to content

Commit 8cc081b

Browse files
lorcQclorcQc
authored
Fixes for v7 (#88)
- Handle FK on keyless entity type - Fix code for EF6 many-to-many pattern - Fix missing HasForeignKey when principal key is an alternate key - Ignore NTF value in templates
1 parent 76e3452 commit 8cc081b

14 files changed

Lines changed: 906 additions & 129 deletions

File tree

‎EFCore.VisualBasic.Templates/templates/ef-templates/CodeTemplates/EFCore/DbContext.t4‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ Namespace <#= FileNamespaceIdentifier #>
182182
foreach (var property in entityType.GetProperties())
183183
{
184184
var propertyFluentApiCalls = property.GetFluentApiCalls(annotationCodeGenerator)
185-
?.FilterChain(c => !(Options.UseDataAnnotations && c.IsHandledByDataAnnotations)
186-
&& !(c.Method == "IsRequired" && Options.UseNullableReferenceTypes && !property.ClrType.IsValueType));
185+
?.FilterChain(c => !(Options.UseDataAnnotations && c.IsHandledByDataAnnotations));
187186

188187
if (propertyFluentApiCalls == null)
189188
{
@@ -220,7 +219,7 @@ Namespace <#= FileNamespaceIdentifier #>
220219
WriteLine("");
221220
}
222221
#>
223-
entity.HasOne(Function(d) d.<#= foreignKey.DependentToPrincipal.Name #>).<#= foreignKey.IsUnique ? "WithOne" : "WithMany" #>(Function(p) p.<#= foreignKey.PrincipalToDependent.Name #>)<#= code.Fragment(foreignKeyFluentApiCalls, indent: 6) #>
222+
entity.HasOne(Function(d) d.<#= foreignKey.DependentToPrincipal.Name #>).<#= foreignKey.IsUnique ? "WithOne" : "WithMany" #>(<#= foreignKey.PrincipalToDependent != null ? $"Function(p) p.{foreignKey.PrincipalToDependent.Name}" : "" #>)<#= code.Fragment(foreignKeyFluentApiCalls, indent: 6) #>
224223
<#
225224
anyEntityTypeConfiguration = true;
226225
}
@@ -251,8 +250,8 @@ Namespace <#= FileNamespaceIdentifier #>
251250
entity.HasMany(Function(d) d.<#= skipNavigation.Name #>).WithMany(Function(p) p.<#= skipNavigation.Inverse.Name #>).
252251
UsingEntity(Of Dictionary(Of String, Object))(
253252
<#= code.Literal(joinEntityType.Name) #>,
254-
Function(r) r.HasOne(Of <#= right.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(rightFluentApiCalls, indent: 7) #>,
255-
Function(l) l.HasOne(Of <#= left.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(leftFluentApiCalls, indent: 7) #>,
253+
Function(r) r.HasOne(Of <#= right.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(rightFluentApiCalls, indent: 8) #>,
254+
Function(l) l.HasOne(Of <#= left.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(leftFluentApiCalls, indent: 8) #>,
256255
Sub(j)
257256
<#
258257
var joinKey = joinEntityType.FindPrimaryKey();
@@ -284,6 +283,20 @@ Namespace <#= FileNamespaceIdentifier #>
284283
}
285284
#>
286285
j.HasIndex(<#= code.Literal(index.Properties.Select((e) => e.Name).ToArray()) #>, <#= code.Literal(index.GetDatabaseName()) #>)<#= code.Fragment(indexFluentApiCalls, indent: 8) #>
286+
<#
287+
}
288+
289+
foreach (var property in joinEntityType.GetProperties())
290+
{
291+
var propertyFluentApiCalls = property.GetFluentApiCalls(annotationCodeGenerator);
292+
if (propertyFluentApiCalls == null)
293+
{
294+
continue;
295+
}
296+
297+
importsList.AddRange(propertyFluentApiCalls.GetRequiredUsings());
298+
#>
299+
j.IndexerProperty(Of <#= code.Reference(property.ClrType) #>)(<#= code.Literal(property.Name) #>)<#= code.Fragment(propertyFluentApiCalls, indent: 8) #>
287300
<#
288301
}
289302
#>

‎EFCore.VisualBasic.Templates/templates/ef-templates/CodeTemplates/EFCore/EntityType.t4‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ Namespace <#= FileNamespaceIdentifier #>
9090

9191
if (Options.UseDataAnnotations)
9292
{
93-
var dataAnnotations = property.GetDataAnnotations(annotationCodeGenerator)
94-
.Where(a => !(a.Type == typeof(RequiredAttribute) && Options.UseNullableReferenceTypes && !property.ClrType.IsValueType));
93+
var dataAnnotations = property.GetDataAnnotations(annotationCodeGenerator);
9594

9695
foreach (var dataAnnotation in dataAnnotations)
9796
{
@@ -131,8 +130,6 @@ Namespace <#= FileNamespaceIdentifier #>
131130
}
132131
else
133132
{
134-
var needsNullable = Options.UseNullableReferenceTypes && !(navigation.ForeignKey.IsRequired && navigation.IsOnDependent);
135-
var needsInitializer = Options.UseNullableReferenceTypes && navigation.ForeignKey.IsRequired && navigation.IsOnDependent;
136133
#>
137134
Public Overridable Property <#= code.Identifier(navigation.Name) #> As <#= targetType #>
138135
<#

‎EFCore.VisualBasic/EFCore.VisualBasic.vbproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
</ItemGroup>
4646

4747
<ItemGroup>
48-
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.0">
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.2">
4949
<PrivateAssets>all</PrivateAssets>
5050
</PackageReference>
51-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0">
51+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
5252
<IncludeAssets>all</IncludeAssets>
5353
</PackageReference>
54-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0">
54+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.2">
5555
<PrivateAssets>all</PrivateAssets>
5656
</PackageReference>
57-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0">
57+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2">
5858
<PrivateAssets>all</PrivateAssets>
5959
</PackageReference>
6060
</ItemGroup>

‎EFCore.VisualBasic/Migrations/Design/VisualBasicSnapshotGenerator.vb‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -919,28 +919,38 @@ Namespace Migrations.Design
919919
Dim table = StoreObjectIdentifier.Create(entityType, StoreObjectType.Table)
920920
Dim tableName = If(CStr(tableNameAnnotation?.Value), table?.Name)
921921

922-
Dim explicitName = tableNameAnnotation IsNot Nothing OrElse
923-
entityType.BaseType Is Nothing OrElse
924-
entityType.BaseType.GetTableName() <> tableName
925-
926922
Dim schemaAnnotation As IAnnotation = Nothing
927923
annotations.TryGetAndRemove(RelationalAnnotationNames.Schema, schemaAnnotation)
928924
Dim schema = If(CStr(schemaAnnotation?.Value), table?.Schema)
929925

930926
Dim isExcludedAnnotation As IAnnotation = Nothing
931927
annotations.TryGetAndRemove(RelationalAnnotationNames.IsTableExcludedFromMigrations, isExcludedAnnotation)
932-
Dim isExcludedFromMigrationsValue = If(TypeOf isExcludedAnnotation?.Value Is Boolean?, DirectCast(isExcludedAnnotation?.Value, Boolean?), Nothing)
933-
Dim isExcludedFromMigrations = isExcludedFromMigrationsValue.HasValue AndAlso isExcludedFromMigrationsValue.Value
928+
929+
Dim isExcludedFromMigrationsValue = If(TypeOf isExcludedAnnotation?.Value Is Boolean?,
930+
DirectCast(isExcludedAnnotation?.Value, Boolean?),
931+
Nothing)
932+
933+
Dim isExcludedFromMigrations = isExcludedFromMigrationsValue.HasValue AndAlso
934+
isExcludedFromMigrationsValue.Value
934935

935936
Dim commentAnnotation As IAnnotation = Nothing
936937
annotations.TryGetAndRemove(RelationalAnnotationNames.Comment, commentAnnotation)
938+
937939
Dim comment = CStr(commentAnnotation?.Value)
938940

939-
Dim hasTriggers = entityType.GetDeclaredTriggers().Any(Function(t) t.GetTableName() = tableName AndAlso t.GetTableSchema() = schema)
941+
Dim hasTriggers = entityType.GetDeclaredTriggers().
942+
Any(Function(t) t.GetTableName() = tableName AndAlso
943+
t.GetTableSchema() = schema)
944+
940945
Dim hasOverrides = table IsNot Nothing AndAlso
941946
entityType.GetProperties().Select(Function(p) p.FindOverrides(table.Value)).
942947
Any(Function(o) o IsNot Nothing)
943948

949+
Dim explicitName = tableNameAnnotation IsNot Nothing OrElse
950+
entityType.BaseType Is Nothing OrElse
951+
entityType.BaseType.GetTableName() <> tableName OrElse
952+
hasOverrides
953+
944954
Dim requiresTableBuilder = isExcludedFromMigrations OrElse
945955
comment IsNot Nothing OrElse
946956
hasTriggers OrElse

‎EFCore.VisualBasic/Scaffolding/Internal/VisualBasicDbContextGenerator.tt‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ Namespace <#= FileNamespaceIdentifier #>
161161
Dim firstProperty = True
162162
For Each prop in entityType.GetProperties()
163163
Dim propertyFluentApiCalls = prop.GetFluentApiCalls(annotationCodeGenerator)?.
164-
FilterChain(Function(c) Not (Options.UseDataAnnotations AndAlso c.IsHandledByDataAnnotations) AndAlso
165-
Not (c.Method = "IsRequired" AndAlso Options.UseNullableReferenceTypes AndAlso Not prop.ClrType.IsValueType))
164+
FilterChain(Function(c) Not (Options.UseDataAnnotations AndAlso c.IsHandledByDataAnnotations))
166165

167166
If propertyFluentApiCalls Is Nothing Then
168167
Continue For
@@ -194,7 +193,7 @@ Namespace <#= FileNamespaceIdentifier #>
194193
WriteLine("")
195194
End If
196195
#>
197-
entity.HasOne(Function(d) d.<#= foreignKey.DependentToPrincipal.Name #>).<#= If(foreignKey.IsUnique, "WithOne", "WithMany") #>(Function(p) p.<#= foreignKey.PrincipalToDependent.Name #>)<#= code.Fragment(foreignKeyFluentApiCalls, indent:=6) #>
196+
entity.HasOne(Function(d) d.<#= foreignKey.DependentToPrincipal.Name #>).<#= If(foreignKey.IsUnique, "WithOne", "WithMany") #>(<#= If(foreignKey.PrincipalToDependent IsNot Nothing, $"Function(p) p.{foreignKey.PrincipalToDependent.Name}", "") #>)<#= code.Fragment(foreignKeyFluentApiCalls, indent:=6) #>
198197
<#
199198
anyEntityTypeConfiguration = True
200199
Next
@@ -221,8 +220,8 @@ Namespace <#= FileNamespaceIdentifier #>
221220
entity.HasMany(Function(d) d.<#= skipNavigation.Name #>).WithMany(Function(p) p.<#= skipNavigation.Inverse.Name #>).
222221
UsingEntity(Of Dictionary(Of String, Object))(
223222
<#= code.Literal(joinEntityType.Name) #>,
224-
Function(r) r.HasOne(Of <#= right.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(rightFluentApiCalls, indent:=7) #>,
225-
Function(l) l.HasOne(Of <#= left.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(leftFluentApiCalls, indent:=7) #>,
223+
Function(r) r.HasOne(Of <#= right.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(rightFluentApiCalls, indent:=8) #>,
224+
Function(l) l.HasOne(Of <#= left.PrincipalEntityType.Name #>)().WithMany()<#= code.Fragment(leftFluentApiCalls, indent:=8) #>,
226225
Sub(j)
227226
<#
228227
Dim joinKey = joinEntityType.FindPrimaryKey()
@@ -250,6 +249,18 @@ Namespace <#= FileNamespaceIdentifier #>
250249
End If
251250
#>
252251
j.HasIndex(<#= code.Literal(index.Properties.Select(Function(e) e.Name).ToArray()) #>, <#= code.Literal(index.GetDatabaseName()) #>)<#= code.Fragment(indexFluentApiCalls, indent:=8) #>
252+
<#
253+
Next
254+
255+
For Each prop in joinEntityType.GetProperties()
256+
Dim propertyFluentApiCalls = prop.GetFluentApiCalls(annotationCodeGenerator)
257+
If propertyFluentApiCalls Is Nothing Then
258+
Continue For
259+
End If
260+
261+
importsList.AddRange(propertyFluentApiCalls.GetRequiredUsings())
262+
#>
263+
j.IndexerProperty(Of <#= code.Reference(prop.ClrType) #>)(<#= code.Literal(prop.Name) #>)<#= code.Fragment(propertyFluentApiCalls, indent:=8) #>
253264
<#
254265
Next
255266
#>

‎EFCore.VisualBasic/Scaffolding/Internal/VisualBasicDbContextGenerator.vb‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,7 @@ Namespace Scaffolding.Internal
197197
Dim firstProperty = True
198198
For Each prop in entityType.GetProperties()
199199
Dim propertyFluentApiCalls = prop.GetFluentApiCalls(annotationCodeGenerator)?.
200-
FilterChain(Function(c) Not (Options.UseDataAnnotations AndAlso c.IsHandledByDataAnnotations) AndAlso
201-
Not (c.Method = "IsRequired" AndAlso Options.UseNullableReferenceTypes AndAlso Not prop.ClrType.IsValueType))
200+
FilterChain(Function(c) Not (Options.UseDataAnnotations AndAlso c.IsHandledByDataAnnotations))
202201

203202
If propertyFluentApiCalls Is Nothing Then
204203
Continue For
@@ -238,8 +237,8 @@ Namespace Scaffolding.Internal
238237
Me.Write(Me.ToStringHelper.ToStringWithCulture(foreignKey.DependentToPrincipal.Name))
239238
Me.Write(").")
240239
Me.Write(Me.ToStringHelper.ToStringWithCulture(If(foreignKey.IsUnique, "WithOne", "WithMany")))
241-
Me.Write("(Function(p) p.")
242-
Me.Write(Me.ToStringHelper.ToStringWithCulture(foreignKey.PrincipalToDependent.Name))
240+
Me.Write("(")
241+
Me.Write(Me.ToStringHelper.ToStringWithCulture(If(foreignKey.PrincipalToDependent IsNot Nothing, $"Function(p) p.{foreignKey.PrincipalToDependent.Name}", "")))
243242
Me.Write(")")
244243
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Fragment(foreignKeyFluentApiCalls, indent:=6)))
245244
Me.Write(""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10))
@@ -276,11 +275,11 @@ Namespace Scaffolding.Internal
276275
Me.Write(","&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" Function(r) r.HasOne(Of ")
277276
Me.Write(Me.ToStringHelper.ToStringWithCulture(right.PrincipalEntityType.Name))
278277
Me.Write(")().WithMany()")
279-
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Fragment(rightFluentApiCalls, indent:=7)))
278+
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Fragment(rightFluentApiCalls, indent:=8)))
280279
Me.Write(","&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" Function(l) l.HasOne(Of ")
281280
Me.Write(Me.ToStringHelper.ToStringWithCulture(left.PrincipalEntityType.Name))
282281
Me.Write(")().WithMany()")
283-
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Fragment(leftFluentApiCalls, indent:=7)))
282+
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Fragment(leftFluentApiCalls, indent:=8)))
284283
Me.Write(","&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" Sub(j)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10))
285284

286285
Dim joinKey = joinEntityType.FindPrimaryKey()
@@ -323,6 +322,24 @@ Namespace Scaffolding.Internal
323322

324323
Next
325324

325+
For Each prop in joinEntityType.GetProperties()
326+
Dim propertyFluentApiCalls = prop.GetFluentApiCalls(annotationCodeGenerator)
327+
If propertyFluentApiCalls Is Nothing Then
328+
Continue For
329+
End If
330+
331+
importsList.AddRange(propertyFluentApiCalls.GetRequiredUsings())
332+
333+
Me.Write(" j.IndexerProperty(Of ")
334+
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Reference(prop.ClrType)))
335+
Me.Write(")(")
336+
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Literal(prop.Name)))
337+
Me.Write(")")
338+
Me.Write(Me.ToStringHelper.ToStringWithCulture(code.Fragment(propertyFluentApiCalls, indent:=8)))
339+
Me.Write(""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10))
340+
341+
Next
342+
326343
Me.Write(" End Sub)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10))
327344

328345
anyEntityTypeConfiguration = True

‎EFCore.VisualBasic/Scaffolding/Internal/VisualBasicEntityTypeGenerator.tt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,8 @@ Namespace <#= FileNamespaceIdentifier #>
7676
End If
7777

7878
If Options.UseDataAnnotations Then
79-
Dim dataAnnotations = prop.GetDataAnnotations(annotationCodeGenerator).
80-
Where(Function(a) Not (a.Type = GetType(RequiredAttribute) AndAlso
81-
Options.UseNullableReferenceTypes AndAlso
82-
Not prop.ClrType.IsValueType))
79+
Dim dataAnnotations = prop.GetDataAnnotations(annotationCodeGenerator)
80+
8381
For Each dataAnnotation in dataAnnotations
8482
#>
8583
<#= code.Fragment(dataAnnotation) #>

‎EFCore.VisualBasic/Scaffolding/Internal/VisualBasicEntityTypeGenerator.vb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,8 @@ Namespace Scaffolding.Internal
9696
End If
9797

9898
If Options.UseDataAnnotations Then
99-
Dim dataAnnotations = prop.GetDataAnnotations(annotationCodeGenerator).
100-
Where(Function(a) Not (a.Type = GetType(RequiredAttribute) AndAlso
101-
Options.UseNullableReferenceTypes AndAlso
102-
Not prop.ClrType.IsValueType))
99+
Dim dataAnnotations = prop.GetDataAnnotations(annotationCodeGenerator)
100+
103101
For Each dataAnnotation in dataAnnotations
104102

105103
Me.Write(" ")

‎EFCore.VisualBasic/VisualBasicUtilities.vb‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -243,22 +243,6 @@ Public Module VisualBasicUtilities
243243
category = UnicodeCategory.LetterNumber
244244
End Function
245245

246-
Public Function RemoveRootNamespaceFromNamespace(rootNamespace As String, FullNamespace As String) As String
247-
If String.IsNullOrWhiteSpace(rootNamespace) Then Return FullNamespace
248-
249-
Dim finalNamespace = FullNamespace
250-
251-
If FullNamespace.StartsWith(rootNamespace, StringComparison.OrdinalIgnoreCase) Then
252-
If FullNamespace.Length > rootNamespace.Length Then
253-
finalNamespace = FullNamespace.Substring(rootNamespace.Length + 1)
254-
Else
255-
finalNamespace = String.Empty
256-
End If
257-
End If
258-
259-
Return finalNamespace
260-
End Function
261-
262246
#Region "Guards"
263247
<DebuggerStepThrough>
264248
Public Function NotNull(Of T)(value As T, parameterName As String) As T

‎Sandbox/Sandbox.vbproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.2" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

0 commit comments

Comments
 (0)