NotificationsYou must be signed in to change notification settings
Fork3.3k
Star14.5k

Commita295c6f

authored

InMemoryTable: Make IsConcurrencyConflict() method more readable (#33561)

1 parent3163cb9 commita295c6fCopy full SHA for a295c6f

File tree

1 file changed

+19

-16

lines changed

src/EFCore.InMemory/Storage/Internal
- InMemoryTable.cs

1 file changed

+19

-16

lines changed

`‎src/EFCore.InMemory/Storage/Internal/InMemoryTable.cs‎`

Lines changed: 19 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -229,29 +229,32 @@ private static bool IsConcurrencyConflict(`
`229`	`229`	`object?rowValue,`
`230`	`230`	`Dictionary<IProperty,object?>concurrencyConflicts)`
`231`	`231`	`{`
`232`		`-if(property.IsConcurrencyToken)`
	`232`	`+if(!property.IsConcurrencyToken)`
`233`	`233`	`{`
`234`		`-varcomparer=property.GetKeyValueComparer();`
`235`		`-varoriginalValue=entry.GetOriginalValue(property);`
	`234`	`+returnfalse;`
	`235`	`+}`
`236`	`236`
`237`		`-varconverter=property.GetValueConverter()`
`238`		`-??property.FindTypeMapping()?.Converter;`
	`237`	`+varcomparer=property.GetKeyValueComparer()`
	`238`	`+??StructuralComparisons.StructuralEqualityComparer;`
`239`	`239`
`240`		`-if(converter!=null)`
`241`		`-{`
`242`		`-rowValue=converter.ConvertFromProvider(rowValue);`
`243`		`-}`
	`240`	`+varoriginalValue=entry.GetOriginalValue(property);`
`244`	`241`
`245`		`-if((comparer!=null&&!comparer.Equals(rowValue,originalValue))`
`246`		`-\|\|(comparer==null&&!StructuralComparisons.StructuralEqualityComparer.Equals(rowValue,originalValue)))`
`247`		`-{`
`248`		`-concurrencyConflicts.Add(property,rowValue);`
	`242`	`+varconverter=property.GetValueConverter()`
	`243`	`+??property.FindTypeMapping()?.Converter;`
`249`	`244`
`250`		`-returntrue;`
`251`		`-}`
	`245`	`+if(converter!=null)`
	`246`	`+{`
	`247`	`+rowValue=converter.ConvertFromProvider(rowValue);`
`252`	`248`	`}`
`253`	`249`
`254`		`-returnfalse;`
	`250`	`+if(comparer.Equals(rowValue,originalValue))`
	`251`	`+{`
	`252`	`+returnfalse;`
	`253`	`+}`
	`254`	`+`
	`255`	`+concurrencyConflicts.Add(property,rowValue);`
	`256`	`+`
	`257`	`+returntrue;`
`255`	`258`	`}`
`256`	`259`
`257`	`260`	`/// <summary>`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita295c6f

File tree

1 file changed

1 file changed

`‎src/EFCore.InMemory/Storage/Internal/InMemoryTable.cs‎`

0 commit comments