Skip to content

Commit fd78c2f

Browse files
Copilotrenemadsen
andcommitted
Fix BigModel_with_JSON_columns ternary expression parentheses for TimeOnly converter
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent c95e78a commit fd78c2f

10 files changed

Lines changed: 935 additions & 935 deletions

test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DataEntityType.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
8888
return instance;
8989
});
9090
blob.SetAccessors(
91-
byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data))entry.Entity),
92-
byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data))entry.Entity),
91+
byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
92+
byte[] (IInternalEntry entry) => DataUnsafeAccessors.Blob(((CompiledModelTestBase.Data)(entry.Entity))),
9393
byte[] (IInternalEntry entry) => entry.ReadOriginalValue<byte[]>(blob, 1),
9494
byte[] (IInternalEntry entry) => entry.GetCurrentValue<byte[]>(blob));
9595
blob.SetPropertyIndexes(
@@ -100,15 +100,15 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
100100
storeGenerationIndex: -1);
101101
blob.TypeMapping = MySqlByteArrayTypeMapping.Default.Clone(
102102
comparer: new ValueComparer<byte[]>(
103-
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2))),
103+
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
104104
int (byte[] v) => ((object)v).GetHashCode(),
105105
byte[] (byte[] v) => v),
106106
keyComparer: new ValueComparer<byte[]>(
107-
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2))),
107+
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
108108
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v))),
109109
byte[] (byte[] source) => source.ToArray()),
110110
providerValueComparer: new ValueComparer<byte[]>(
111-
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2))),
111+
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)),
112112
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v))),
113113
byte[] (byte[] source) => source.ToArray()));
114114
blob.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);

test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentBaseEntityType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
119119
storeGenerationIndex: -1);
120120
enumDiscriminator.TypeMapping = MySqlIntTypeMapping.Default.Clone(
121121
comparer: new ValueComparer<CompiledModelTestBase.Enum1>(
122-
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2))),
122+
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
123123
int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
124124
CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
125125
keyComparer: new ValueComparer<CompiledModelTestBase.Enum1>(
126-
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2))),
126+
bool (CompiledModelTestBase.Enum1 v1, CompiledModelTestBase.Enum1 v2) => object.Equals(((object)v1), ((object)v2)),
127127
int (CompiledModelTestBase.Enum1 v) => ((object)v).GetHashCode(),
128128
CompiledModelTestBase.Enum1 (CompiledModelTestBase.Enum1 v) => v),
129129
providerValueComparer: new ValueComparer<int>(
@@ -163,8 +163,8 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
163163
return instance;
164164
});
165165
id.SetAccessors(
166-
byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>))entry.Entity),
167-
byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>))entry.Entity),
166+
byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
167+
byte? (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Id(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
168168
byte? (IInternalEntry entry) => entry.ReadOriginalValue<byte?>(id, 3),
169169
byte? (IInternalEntry entry) => entry.GetCurrentValue<byte?>(id));
170170
id.SetPropertyIndexes(
@@ -245,8 +245,8 @@ public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEnt
245245
return instance;
246246
});
247247
principal.SetAccessors(
248-
CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>))entry.Entity),
249-
CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>))entry.Entity),
248+
CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
249+
CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => DependentBaseUnsafeAccessors<byte?>.Principal(((CompiledModelTestBase.DependentBase<byte?>)(entry.Entity))),
250250
null,
251251
CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>>(principal));
252252
principal.SetPropertyIndexes(
@@ -280,8 +280,8 @@ public static RuntimeForeignKey CreateForeignKey2(RuntimeEntityType declaringEnt
280280
return instance;
281281
});
282282
dependent.SetAccessors(
283-
CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>))entry.Entity),
284-
CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>))entry.Entity),
283+
CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
284+
CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => PrincipalDerivedUnsafeAccessors<CompiledModelTestBase.DependentBase<byte?>>.Dependent(((CompiledModelTestBase.PrincipalDerived<CompiledModelTestBase.DependentBase<byte?>>)(entry.Entity))),
285285
null,
286286
CompiledModelTestBase.DependentBase<byte?> (IInternalEntry entry) => entry.GetCurrentValue<CompiledModelTestBase.DependentBase<byte?>>(dependent));
287287
dependent.SetPropertyIndexes(

test/EFCore.MySql.FunctionalTests/Scaffolding/Baselines/BigModel/DependentDerivedEntityType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
5353
return instance;
5454
});
5555
data.SetAccessors(
56-
string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>))entry.Entity),
57-
string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>))entry.Entity),
56+
string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>)(entry.Entity))),
57+
string (IInternalEntry entry) => DependentDerivedUnsafeAccessors<byte?>.Data(((CompiledModelTestBase.DependentDerived<byte?>)(entry.Entity))),
5858
string (IInternalEntry entry) => entry.ReadOriginalValue<string>(data, 4),
5959
string (IInternalEntry entry) => entry.GetCurrentValue<string>(data));
6060
data.SetPropertyIndexes(

0 commit comments

Comments
 (0)