Skip to content

Commit 808d922

Browse files
committed
Co-authored-by: renemadsen <76994+renemadsen@users.noreply.github.com>
1 parent 78bd0e2 commit 808d922

13 files changed

Lines changed: 1557 additions & 1557 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 2 additions & 2 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>(

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

Lines changed: 353 additions & 353 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
181181
storeGenerationIndex: -1);
182182
enum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
183183
comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
184-
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)))),
184+
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2))),
185185
int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
186186
CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
187187
keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
188-
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)))),
188+
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2))),
189189
int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
190190
CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
191191
providerValueComparer: new ValueComparer<int>(
@@ -237,11 +237,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
237237
storeGenerationIndex: -1);
238238
enum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
239239
comparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
240-
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)))),
240+
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2))),
241241
int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
242242
CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
243243
keyComparer: new ValueComparer<CompiledModelTestBase.AnEnum>(
244-
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2)))),
244+
bool (CompiledModelTestBase.AnEnum v1, CompiledModelTestBase.AnEnum v2) => object.Equals(((object)v1), ((object)v2))),
245245
int (CompiledModelTestBase.AnEnum v) => ((object)v).GetHashCode(),
246246
CompiledModelTestBase.AnEnum (CompiledModelTestBase.AnEnum v) => v),
247247
providerValueComparer: new ValueComparer<int>(
@@ -293,11 +293,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
293293
storeGenerationIndex: -1);
294294
flagsEnum1.TypeMapping = MySqlIntTypeMapping.Default.Clone(
295295
comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
296-
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)))),
296+
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2))),
297297
int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
298298
CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
299299
keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
300-
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)))),
300+
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2))),
301301
int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
302302
CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
303303
providerValueComparer: new ValueComparer<int>(
@@ -349,11 +349,11 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
349349
storeGenerationIndex: -1);
350350
flagsEnum2.TypeMapping = MySqlIntTypeMapping.Default.Clone(
351351
comparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
352-
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)))),
352+
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2))),
353353
int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
354354
CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
355355
keyComparer: new ValueComparer<CompiledModelTestBase.AFlagsEnum>(
356-
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2)))),
356+
bool (CompiledModelTestBase.AFlagsEnum v1, CompiledModelTestBase.AFlagsEnum v2) => object.Equals(((object)v1), ((object)v2))),
357357
int (CompiledModelTestBase.AFlagsEnum v) => ((object)v).GetHashCode(),
358358
CompiledModelTestBase.AFlagsEnum (CompiledModelTestBase.AFlagsEnum v) => v),
359359
providerValueComparer: new ValueComparer<int>(

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
4747
derivedsId.SetSetter(
4848
Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
4949
{
50-
instance["DerivedsId"] = ((object)value);
50+
instance["DerivedsId"] = ((object)value));
5151
return instance;
5252
});
5353
derivedsId.SetMaterializationSetter(
5454
Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
5555
{
56-
instance["DerivedsId"] = ((object)value);
56+
instance["DerivedsId"] = ((object)value));
5757
return instance;
5858
});
5959
derivedsId.SetAccessors(
@@ -118,13 +118,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
118118
derivedsAlternateId.SetSetter(
119119
Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
120120
{
121-
instance["DerivedsAlternateId"] = ((object)value);
121+
instance["DerivedsAlternateId"] = ((object)value));
122122
return instance;
123123
});
124124
derivedsAlternateId.SetMaterializationSetter(
125125
Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
126126
{
127-
instance["DerivedsAlternateId"] = ((object)value);
127+
instance["DerivedsAlternateId"] = ((object)value));
128128
return instance;
129129
});
130130
derivedsAlternateId.SetAccessors(
@@ -189,13 +189,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
189189
principalsId.SetSetter(
190190
Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
191191
{
192-
instance["PrincipalsId"] = ((object)value);
192+
instance["PrincipalsId"] = ((object)value));
193193
return instance;
194194
});
195195
principalsId.SetMaterializationSetter(
196196
Dictionary<string, object> (Dictionary<string, object> instance, long value) =>
197197
{
198-
instance["PrincipalsId"] = ((object)value);
198+
instance["PrincipalsId"] = ((object)value));
199199
return instance;
200200
});
201201
principalsId.SetAccessors(
@@ -260,13 +260,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
260260
principalsAlternateId.SetSetter(
261261
Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
262262
{
263-
instance["PrincipalsAlternateId"] = ((object)value);
263+
instance["PrincipalsAlternateId"] = ((object)value));
264264
return instance;
265265
});
266266
principalsAlternateId.SetMaterializationSetter(
267267
Dictionary<string, object> (Dictionary<string, object> instance, Guid value) =>
268268
{
269-
instance["PrincipalsAlternateId"] = ((object)value);
269+
instance["PrincipalsAlternateId"] = ((object)value));
270270
return instance;
271271
});
272272
principalsAlternateId.SetAccessors(
@@ -335,13 +335,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
335335
rowid.SetSetter(
336336
Dictionary<string, object> (Dictionary<string, object> instance, byte[] value) =>
337337
{
338-
instance["rowid"] = ((object)value);
338+
instance["rowid"] = ((object)value));
339339
return instance;
340340
});
341341
rowid.SetMaterializationSetter(
342342
Dictionary<string, object> (Dictionary<string, object> instance, byte[] value) =>
343343
{
344-
instance["rowid"] = ((object)value);
344+
instance["rowid"] = ((object)value));
345345
return instance;
346346
});
347347
rowid.SetAccessors(
@@ -361,7 +361,7 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
361361
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(v),
362362
byte[] (byte[] v) => (v == null ? null : v.ToArray())),
363363
keyComparer: new ValueComparer<byte[]>(
364-
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2)))),
364+
bool (byte[] v1, byte[] v2) => StructuralComparisons.StructuralEqualityComparer.Equals(((object)v1), ((object)v2))),
365365
int (byte[] v) => StructuralComparisons.StructuralEqualityComparer.GetHashCode(((object)v))),
366366
byte[] (byte[] source) => source.ToArray()),
367367
providerValueComparer: new ValueComparer<DateTime>(

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -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);
@@ -167,13 +167,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
167167
storeTypeName: "varchar(128)",
168168
size: 128),
169169
converter: new ValueConverter<string, string>(
170-
string (string v) => ((string)(v)),
171-
string (string v) => ((string)(v))),
170+
string (string v) => ((string)v),
171+
string (string v) => ((string)v)),
172172
jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
173173
JsonStringReaderWriter.Instance,
174174
new ValueConverter<string, string>(
175-
string (string v) => ((string)(v)),
176-
string (string v) => ((string)(v)))));
175+
string (string v) => ((string)v),
176+
string (string v) => ((string)v))));
177177
stringWithCharSet.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
178178
stringWithCharSet.AddAnnotation("Relational:ColumnType", "varchar(128)");
179179
stringWithCharSet.AddAnnotation("Relational:DefaultValue", "String having charset");
@@ -214,13 +214,13 @@ public static RuntimeEntityType Create(RuntimeModel model, RuntimeEntityType bas
214214
storeTypeName: "varchar(128)",
215215
size: 128),
216216
converter: new ValueConverter<string, string>(
217-
string (string v) => ((string)(v)),
218-
string (string v) => ((string)(v))),
217+
string (string v) => ((string)v),
218+
string (string v) => ((string)v)),
219219
jsonValueReaderWriter: new JsonConvertedValueReaderWriter<string, string>(
220220
JsonStringReaderWriter.Instance,
221221
new ValueConverter<string, string>(
222-
string (string v) => ((string)(v)),
223-
string (string v) => ((string)(v)))));
222+
string (string v) => ((string)v),
223+
string (string v) => ((string)v))));
224224
stringWithCollation.AddAnnotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.None);
225225
stringWithCollation.AddAnnotation("Relational:ColumnType", "varchar(128)");
226226
stringWithCollation.AddAnnotation("Relational:DefaultValue", "String using collation");

0 commit comments

Comments
 (0)