Skip to content

Commit dc6b681

Browse files
lorcQclorcQc
authored
Some code cleanup
* update dependencies
1 parent 4ca792c commit dc6b681

9 files changed

Lines changed: 108 additions & 51 deletions

File tree

‎EFCore.VisualBasic/Design/Internal/VisualBasicHelper.vb‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -605,9 +605,10 @@ Namespace Design.Internal
605605
Append(Reference(type)).
606606
Append(")"c)
607607

608-
Return HandleEnumerable(builder, vertical, values, Sub(value)
609-
builder.Append(UnknownLiteral(value))
610-
End Sub)
608+
Return HandleEnumerable(
609+
builder, vertical, values, Sub(value)
610+
builder.Append(UnknownLiteral(value))
611+
End Sub)
611612
End Function
612613

613614
''' <summary>
@@ -631,14 +632,15 @@ Namespace Design.Internal
631632
Append(Reference(valueType)).
632633
Append(")")
633634

634-
Return HandleEnumerable(builder, vertical, dict.Keys, Sub(key)
635-
builder.
636-
Append("{").
637-
Append(UnknownLiteral(key)).
638-
Append(", ").
639-
Append(UnknownLiteral(dict(key))).
640-
Append("}")
641-
End Sub)
635+
Return HandleEnumerable(
636+
builder, vertical, dict.Keys, Sub(key)
637+
builder.
638+
Append("{").
639+
Append(UnknownLiteral(key)).
640+
Append(", ").
641+
Append(UnknownLiteral(dict(key))).
642+
Append("}")
643+
End Sub)
642644
End Function
643645

644646
Private Shared Function HandleEnumerable(builder As IndentedStringBuilder, vertical As Boolean, values As IEnumerable, handleValue As Action(Of Object)) As String

‎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-rc.2.22457.11">
48+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.0-rtm.22501.1">
4949
<PrivateAssets>all</PrivateAssets>
5050
</PackageReference>
51-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rc.2.22457.11">
51+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rtm.22501.1">
5252
<IncludeAssets>all</IncludeAssets>
5353
</PackageReference>
54-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-rc.2.22457.11">
54+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="7.0.0-rtm.22501.1">
5555
<PrivateAssets>all</PrivateAssets>
5656
</PackageReference>
57-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rc.2.22457.11">
57+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rtm.22501.1">
5858
<PrivateAssets>all</PrivateAssets>
5959
</PackageReference>
6060
</ItemGroup>

‎EFCore.VisualBasic/Multigraph.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Namespace Utilities
223223
' TODO: Optimization : Instead of currentBatchSet, store a batch counter On Each vertex, And check if later
224224
' vertexes have a boundary-requiring dependency on a vertex with the same batch counter.
225225
If withBatching AndAlso
226-
_predecessorMap(successor).Any(
226+
_predecessorMap(successor).Any(
227227
Function(kv)
228228

229229
If TypeOf kv.Value Is Edge Then

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

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,7 @@ $" Dim model As New {className}()
710710
prop.DeclaringEntityType.ShortName(), prop.Name, NameOf(PropertyBuilder.HasConversion)))
711711
End If
712712

713-
Dim valueConverterType = TryCast(prop(CoreAnnotationNames.ValueConverterType), Type)
713+
Dim valueConverterType = GetValueConverterType(prop)
714714

715715
If valueConverterType Is Nothing AndAlso
716716
prop.GetValueConverter() IsNot Nothing Then
@@ -873,6 +873,39 @@ $" Dim model As New {className}()
873873
AppendLine()
874874
End Sub
875875

876+
Private Shared Function GetValueConverterType(prop As IProperty) As Type
877+
Dim type = TryCast(prop(CoreAnnotationNames.ValueConverterType), Type)
878+
879+
If type IsNot Nothing Then
880+
Return type
881+
End If
882+
883+
Dim principalProperty = prop
884+
For i = 0 To 10000 - 1
885+
For Each foreignKey In principalProperty.GetContainingForeignKeys()
886+
For propertyIndex = 0 To foreignKey.Properties.Count - 1
887+
If principalProperty Is foreignKey.Properties(propertyIndex) Then
888+
Dim newPrincipalProperty = foreignKey.PrincipalKey.Properties(propertyIndex)
889+
If prop Is principalProperty OrElse
890+
newPrincipalProperty Is principalProperty Then
891+
892+
Exit For
893+
End If
894+
895+
principalProperty = newPrincipalProperty
896+
897+
type = TryCast(principalProperty(CoreAnnotationNames.ValueConverterType), Type)
898+
If type IsNot Nothing Then
899+
Return type
900+
End If
901+
End If
902+
Next
903+
Next
904+
Next
905+
906+
Return Nothing
907+
End Function
908+
876909
Private Sub PropertyBaseParameters(Prop As IPropertyBase,
877910
parameters As VisualBasicRuntimeAnnotationCodeGeneratorParameters,
878911
Optional skipType As Boolean = False)

‎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-rc.2.22457.11" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.2.22457.11" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rc.2.22457.11" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rc.2.22457.11">
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-rtm.22501.1" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rtm.22501.1" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rtm.22501.1" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0-rtm.22501.1">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

‎Test/EFCore.Design.Tests.Shared/EFCore.Design.Tests.Shared.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0-rc.2.22457.11" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="7.0.0-rc.2.22457.11" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0-rtm.22501.1" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="7.0.0-rtm.22501.1" />
1111
</ItemGroup>
1212

1313
</Project>

‎Test/EFCore.VisualBasic.Test/EFCore.VisualBasic.Test.vbproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.2.0" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.0-rc.2.22457.11" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rc.2.22457.11">
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Cosmos" Version="7.0.0-rtm.22501.1" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.0-rtm.22501.1">
2929
<IncludeAssets>all</IncludeAssets>
3030
</PackageReference>
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-rc.2.22457.11" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0-rc.2.22457.11" />
33-
<PackageReference Include="Microsoft.EntityFrameworkCore.Specification.Tests" Version="7.0.0-rc.2.22457.11" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rc.2.22457.11" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Version="7.0.0-rc.2.22457.11" />
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rc.2.22457.11" />
37-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0-rc.2.22456.11" />
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.0-rtm.22501.1" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="7.0.0-rtm.22501.1" />
33+
<PackageReference Include="Microsoft.EntityFrameworkCore.Specification.Tests" Version="7.0.0-rtm.22501.1" />
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0-rtm.22501.1" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.NetTopologySuite" Version="7.0.0-rtm.22501.1" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0-rtm.22501.1" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0-rtm.22480.10" />
3838
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0-preview-20220726-02" />
3939
<PackageReference Include="xunit" Version="2.4.2" />
4040
<PackageReference Include="xunit.runner.console" Version="2.4.2">

‎Test/EFCore.VisualBasic.Test/Scaffolding/Internal/VisualBasicDbContextGeneratorTest.vb‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,7 +1281,7 @@ End Namespace
12811281
IncrementsBy(2).
12821282
HasMin(2).
12831283
HasMax(100).
1284-
IsCyclic(True)
1284+
IsCyclic()
12851285
End Sub,
12861286
New ModelCodeGenerationOptions(),
12871287
Sub(code)
@@ -1378,7 +1378,8 @@ End Namespace
13781378
Dim EntityType = Model.FindEntityType("TestNamespace.Employee")
13791379
Dim triggers = EntityType.GetDeclaredTriggers()
13801380

1381-
Assert.Collection(triggers,
1381+
Assert.Collection(
1382+
triggers,
13821383
Sub(t) Assert.Equal("Trigger1", t.GetDatabaseName),
13831384
Sub(t) Assert.Equal("Trigger2", t.GetDatabaseName))
13841385
End Sub)
@@ -1448,6 +1449,27 @@ End Namespace
14481449
End Sub)
14491450
End Sub
14501451

1452+
<ConditionalTheory>
1453+
<InlineData(False)>
1454+
<InlineData(True)>
1455+
Public Sub ColumnOrder_is_ignored(useDataAnnotations As Boolean)
1456+
Test(
1457+
Sub(ModelBuilder)
1458+
ModelBuilder.Entity("Entity").Property(Of String)("Property").HasColumnOrder(1)
1459+
End Sub,
1460+
New ModelCodeGenerationOptions With {
1461+
.UseDataAnnotations = useDataAnnotations
1462+
},
1463+
Sub(code)
1464+
Assert.DoesNotContain(".HasColumnOrder(1)", code.ContextFile.Code)
1465+
Assert.DoesNotContain("[Column(Order = 1)]", code.AdditionalFiles(0).Code)
1466+
End Sub,
1467+
Sub(Model)
1468+
Dim entity = Model.FindEntityType("TestNamespace.Entity")
1469+
Assert.Null(entity.GetProperty("Property").GetColumnOrder())
1470+
End Sub)
1471+
End Sub
1472+
14511473
Protected Overrides Sub AddModelServices(services As IServiceCollection)
14521474
services.Replace(ServiceDescriptor.Singleton(Of IRelationalAnnotationProvider, TestModelAnnotationProvider)())
14531475
End Sub

‎Test/EFCore.VisualBasic.Test/Scaffolding/Internal/VisualBasicRuntimeModelCodeGeneratorTest.vb‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ Namespace Global
5151
End Namespace
5252

5353
Namespace Scaffolding.Internal
54-
5554
Public Class VisualBasicRuntimeModelCodeGeneratorTest
5655

5756
<ConditionalFact>
@@ -256,7 +255,7 @@ End Namespace
256255
Public Overridable Property ReferenceNavigation As LazyProxiesEntity2
257256
End Class
258257

259-
Public Class LazyProxiesEntity2
258+
Public Class LazyProxiesEntity2
260259
Public Property Loader As ILazyLoader
261260

262261
Public Property Id As Integer
@@ -2542,7 +2541,7 @@ Namespace TestNamespace
25422541
True)
25432542

25442543
Dim id0 = deleteSproc.AddParameter(
2545-
"Id", ParameterDirection.Input, False, "Id", False)
2544+
"Id_Original", ParameterDirection.Input, False, "Id", True)
25462545
entityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc)
25472546

25482547
Dim updateSproc As New RuntimeStoredProcedure(
@@ -2556,7 +2555,7 @@ Namespace TestNamespace
25562555
Dim principalDerivedId0 = updateSproc.AddParameter(
25572556
"PrincipalDerivedId", ParameterDirection.Input, False, "PrincipalDerivedId", False)
25582557
Dim id1 = updateSproc.AddParameter(
2559-
"Id", ParameterDirection.Input, False, "Id", False)
2558+
"Id_Original", ParameterDirection.Input, False, "Id", True)
25602559
entityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc)
25612560

25622561
entityType.AddAnnotation("Relational:FunctionName", Nothing)
@@ -2621,7 +2620,7 @@ Namespace TestNamespace
26212620
False)
26222621

26232622
Dim id = deleteSproc.AddParameter(
2624-
"Id", ParameterDirection.Input, False, "Id", False)
2623+
"Id_Original", ParameterDirection.Input, False, "Id", True)
26252624
entityType.AddAnnotation("Relational:DeleteStoredProcedure", deleteSproc)
26262625

26272626
Dim updateSproc As New RuntimeStoredProcedure(
@@ -2635,7 +2634,7 @@ Namespace TestNamespace
26352634
Dim principalDerivedId0 = updateSproc.AddParameter(
26362635
"PrincipalDerivedId", ParameterDirection.Input, False, "PrincipalDerivedId", False)
26372636
Dim id0 = updateSproc.AddParameter(
2638-
"Id", ParameterDirection.Input, False, "Id", False)
2637+
"Id_Original", ParameterDirection.Input, False, "Id", True)
26392638
entityType.AddAnnotation("Relational:UpdateStoredProcedure", updateSproc)
26402639

26412640
entityType.AddAnnotation("Relational:FunctionName", Nothing)
@@ -2748,17 +2747,17 @@ End Namespace
27482747
Assert.False(updateSproc.IsRowsAffectedReturned)
27492748
Assert.Empty(updateSproc.GetAnnotations())
27502749
Assert.Same(PrincipalBase, updateSproc.EntityType)
2751-
Assert.Equal("Id", updateSproc.Parameters.Last().Name)
2750+
Assert.Equal("Id_Original", updateSproc.Parameters.Last().Name)
27522751
Assert.Null(id.FindOverrides(StoreObjectIdentifier.Create(PrincipalBase, StoreObjectType.UpdateStoredProcedure).Value))
27532752

27542753
Dim deleteSproc = PrincipalBase.GetDeleteStoredProcedure()
27552754
Assert.Equal("PrincipalBase_Delete", deleteSproc.Name)
27562755
Assert.Equal("TPC", deleteSproc.Schema)
2757-
Assert.Equal({"Id"}, deleteSproc.Parameters.Select(Function(p) p.PropertyName))
2756+
Assert.Equal({"Id_Original"}, deleteSproc.Parameters.Select(Function(p) p.Name))
27582757
Assert.Empty(deleteSproc.ResultColumns)
27592758
Assert.True(deleteSproc.IsRowsAffectedReturned)
27602759
Assert.Same(PrincipalBase, deleteSproc.EntityType)
2761-
Assert.Equal("Id", deleteSproc.Parameters.Last().Name)
2760+
Assert.Equal("Id_Original", deleteSproc.Parameters.Last().Name)
27622761
Assert.Null(id.FindOverrides(StoreObjectIdentifier.Create(PrincipalBase, StoreObjectType.DeleteStoredProcedure).Value))
27632762

27642763
Assert.Equal("PrincipalBase", PrincipalBase.GetDiscriminatorValue())
@@ -2804,7 +2803,7 @@ End Namespace
28042803
Assert.Empty(updateSproc.ResultColumns)
28052804
Assert.Empty(updateSproc.GetAnnotations())
28062805
Assert.Same(PrincipalDerived, updateSproc.EntityType)
2807-
Assert.Equal("Id", updateSproc.Parameters.Last().Name)
2806+
Assert.Equal("Id_Original", updateSproc.Parameters.Last().Name)
28082807
Assert.Null(
28092808
id.FindOverrides(StoreObjectIdentifier.Create(PrincipalDerived, StoreObjectType.UpdateStoredProcedure).Value))
28102809

@@ -2814,7 +2813,7 @@ End Namespace
28142813
Assert.Equal({"Id"}, deleteSproc.Parameters.Select(Function(p) p.PropertyName))
28152814
Assert.Empty(deleteSproc.ResultColumns)
28162815
Assert.Same(PrincipalDerived, deleteSproc.EntityType)
2817-
Assert.Equal("Id", deleteSproc.Parameters.Last().Name)
2816+
Assert.Equal("Id_Original", deleteSproc.Parameters.Last().Name)
28182817
Assert.Null(
28192818
id.FindOverrides(StoreObjectIdentifier.Create(PrincipalDerived, StoreObjectType.DeleteStoredProcedure).Value))
28202819

@@ -2900,10 +2899,11 @@ End Namespace
29002899
eb.UpdateUsingStoredProcedure(Sub(s) s.
29012900
HasParameter("PrincipalBaseId").
29022901
HasParameter("PrincipalDerivedId").
2903-
HasParameter(Function(p) p.Id))
2902+
HasOriginalValueParameter(Function(p) p.Id))
29042903
eb.DeleteUsingStoredProcedure(Sub(s) s.
29052904
HasRowsAffectedReturnValue().
2906-
HasParameter(Function(p) p.Id))
2905+
HasOriginalValueParameter(Function(p) p.Id))
2906+
29072907
eb.HasIndex({"PrincipalBaseId"}, "PrincipalIndex").
29082908
IsUnique().
29092909
HasDatabaseName("PIX").
@@ -2932,9 +2932,9 @@ End Namespace
29322932
eb.UpdateUsingStoredProcedure("Derived_Update", "Derived", Sub(s) s.
29332933
HasParameter("PrincipalBaseId").
29342934
HasParameter("PrincipalDerivedId").
2935-
HasParameter(Function(p) p.Id))
2935+
HasOriginalValueParameter(Function(p) p.Id))
29362936
eb.DeleteUsingStoredProcedure("Derived_Delete", Sub(s) s.
2937-
HasParameter(Function(p) p.Id))
2937+
HasOriginalValueParameter(Function(p) p.Id))
29382938
End Sub)
29392939

29402940
modelBuilder.Entity(Of DependentBase(Of Byte?))(
@@ -4198,7 +4198,7 @@ End Namespace
41984198
End Class
41994199

42004200
<ConditionalFact>
4201-
Public Sub Sqlite()
4201+
Public Sub Sqlite()
42024202

42034203
Dim rm1 =
42044204
<![CDATA[' <auto-generated />
@@ -4870,7 +4870,7 @@ Namespace Scaffolding.TestModel.Internal
48704870
Sub(eb)
48714871
eb.Property(Function(e) e.Collection).HasConversion(GetType(SelfReferentialPropertyValueConverter))
48724872
End Sub)
4873-
End sub
4873+
End Sub
48744874
End Class
48754875

48764876
Public Class SelfReferentialPropertyValueConverter

0 commit comments

Comments
 (0)