Minor compiler fixes.

sdanyliv · sdanyliv · commit 29d37b153c8a · 2021-09-14T21:47:06.000+03:00
diff --git a/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs b/Source/LinqToDB.EntityFrameworkCore/EFCoreMetadataReader.cs
@@ -214,7 +214,7 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru
 						var primaryKeyOrder = 0;
 						if (isPrimaryKey)
 						{
-							var pk = prop.FindContainingPrimaryKey();
+							var pk = prop.FindContainingPrimaryKey()!;
 							primaryKeyOrder = pk.Properties.Select((p, i) => new { p, index = i })
 								                  .FirstOrDefault(v => CompareProperty(v.p, memberInfo))?.index ?? 0;
 						}
@@ -224,16 +224,15 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru
 						var annotations = prop.GetAnnotations();
 						if (_annotationProvider != null && storeObjectId != null)
 						{
-							var column = prop.FindColumn(storeObjectId.Value) as IColumn;
-							if (column != null)
+							if (prop.FindColumn(storeObjectId.Value) is IColumn column)
 								annotations = annotations.Concat(_annotationProvider.For(column));
 						}
 
 						var isIdentity = annotations
 							.Any(a =>
 							{
 								if (a.Name.EndsWith(":ValueGenerationStrategy"))
-									return a.Value?.ToString().Contains("Identity") == true;
+									return a.Value?.ToString()!.Contains("Identity") == true;
 
 								if (a.Name.EndsWith(":Autoincrement"))
 									return a.Value is bool b && b;
@@ -434,7 +433,7 @@ protected bool Equals(SqlTransparentExpression other)
 				return ReferenceEquals(this, other);
 			}
 
-			public override bool Equals(object obj)
+			public override bool Equals(object? obj)
 			{
 				if (obj is null) return false;
 				if (ReferenceEquals(this, obj)) return true;
@@ -480,7 +479,7 @@ public override int GetHashCode()
 								Expression.Constant(DefaultValue.GetValue(p.ParameterType), p.ParameterType),
 								_mappingSource?.FindMapping(p.ParameterType))).ToArray();
 
-					var newExpression = _dependencies.MethodCallTranslatorProvider.Translate(_model, objExpr, methodInfo, parametersArray, _logger);
+					var newExpression = _dependencies.MethodCallTranslatorProvider.Translate(_model, objExpr, methodInfo, parametersArray, _logger!);
 					if (newExpression != null)
 					{
 						if (!methodInfo.IsStatic)
@@ -513,7 +512,7 @@ public override int GetHashCode()
 				{
 					var objExpr = new SqlTransparentExpression(Expression.Constant(DefaultValue.GetValue(type), type), _mappingSource?.FindMapping(propInfo));
 
-					var newExpression = _dependencies.MemberTranslatorProvider.Translate(objExpr, propInfo, propInfo.GetMemberType(), _logger);
+					var newExpression = _dependencies.MemberTranslatorProvider.Translate(objExpr, propInfo, propInfo.GetMemberType(), _logger!);
 					if (newExpression != null)
 					{
 						var parametersArray = new Expression[] { objExpr };
@@ -593,7 +592,7 @@ string PrepareExpressionText(Expression? expr)
 					var left  = newExpression.GetType().GetProperty("Left")?.GetValue(newExpression) as Expression;
 					var right = newExpression.GetType().GetProperty("Right")?.GetValue(newExpression) as Expression;
 
-					var operand = newExpression.GetType().GetProperty("OperatorType")?.GetValue(newExpression).ToString();
+					var operand = newExpression.GetType().GetProperty("OperatorType")?.GetValue(newExpression)!.ToString();
 
 					var operandExpr = operand switch
 					{
@@ -664,7 +663,7 @@ private static Expression UnwrapConverted(Expression expr)
 			if (expr is SqlFunctionExpression func)
 			{
 				if (string.Equals(func.Name, "COALESCE", StringComparison.InvariantCultureIgnoreCase) &&
-				    func.Arguments.Count == 2 && func.Arguments[1].NodeType == ExpressionType.Extension)
+				    func.Arguments!.Count == 2 && func.Arguments[1].NodeType == ExpressionType.Extension)
 					return UnwrapConverted(func.Arguments[0]);
 			}
 
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/EFCoreExpressionAttribute.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/EFCoreExpressionAttribute.cs
@@ -32,13 +32,13 @@ public override ISqlExpression GetExpression(
 			{
 				var mc = (MethodCallExpression) expression;
 				if (!mc.Method.IsStatic)
-					knownExpressions.Add(mc.Object);
+					knownExpressions.Add(mc.Object!);
 				knownExpressions.AddRange(mc.Arguments);
 			}
 			else
 			{
 				var me = (MemberExpression) expression;
-				knownExpressions.Add(me.Expression);
+				knownExpressions.Add(me.Expression!);
 			}
 
 			var pams = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));
diff --git a/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs b/Source/LinqToDB.EntityFrameworkCore/Internal/LinqToDBForEFQueryProvider.cs
@@ -65,7 +65,7 @@ public IQueryable<TElement> CreateQuery<TElement>(Expression expression)
 		/// </summary>
 		/// <param name="expression">Query expression.</param>
 		/// <returns>Query result.</returns>
-		public object Execute(Expression expression)
+		public object? Execute(Expression expression)
 		{
 			return QueryProvider.Execute(expression);
 		}
@@ -107,7 +107,7 @@ TResult IAsyncQueryProvider.ExecuteAsync<TResult>(Expression expression, Cancell
 		{
 			var item = typeof(TResult).GetGenericArguments()[0];
 			var method = _executeAsyncMethodInfo.MakeGenericMethod(item);
-			return (TResult) method.Invoke(QueryProvider, new object[] { expression, cancellationToken });
+			return (TResult) method.Invoke(QueryProvider, new object[] { expression, cancellationToken })!;
 		}
 
 		/// <summary>
@@ -165,7 +165,7 @@ public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToke
 		/// Returns generated SQL for specific LINQ query.
 		/// </summary>
 		/// <returns>Generated SQL.</returns>
-		public override string ToString()
+		public override string? ToString()
 		{
 			return QueryProvider.ToString();
 		}
diff --git a/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFExtensions.Async.EF.cs b/Source/LinqToDB.EntityFrameworkCore/LinqToDBForEFExtensions.Async.EF.cs
@@ -39,6 +39,7 @@ public static Task<Dictionary<TKey, TSource>> ToDictionaryAsyncEF<TSource, TKey>
 			this IQueryable<TSource> source,
 			Func<TSource, TKey>      keySelector,
 			CancellationToken        cancellationToken = default)
+			where TKey: notnull
 			=> EntityFrameworkQueryableExtensions.ToDictionaryAsync(source, keySelector, cancellationToken);
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.ToDictionaryAsync{TSource, TKey, TElement}(IQueryable{TSource}, Func{TSource, TKey}, Func{TSource, TElement}, CancellationToken)"/>
@@ -47,6 +48,7 @@ public static Task<Dictionary<TKey,TElement>> ToDictionaryAsyncEF<TSource,TKey,T
 			Func<TSource,TKey>            keySelector,
 			Func<TSource,TElement>        elementSelector,
 			CancellationToken             cancellationToken = default)
+			where TKey : notnull
 			=> EntityFrameworkQueryableExtensions.ToDictionaryAsync(source, keySelector, elementSelector, cancellationToken);
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.ToDictionaryAsync{TSource, TKey, TElement}(IQueryable{TSource}, Func{TSource, TKey}, Func{TSource, TElement}, IEqualityComparer{TKey}, CancellationToken)"/>
@@ -56,6 +58,7 @@ public static Task<Dictionary<TKey,TElement>> ToDictionaryAsyncEF<TSource,TKey,T
 			Func<TSource,TElement>        elementSelector,
 			IEqualityComparer<TKey>       comparer,
 			CancellationToken             cancellationToken = default)
+			where TKey : notnull
 			=> EntityFrameworkQueryableExtensions.ToDictionaryAsync(source, keySelector, elementSelector, comparer, cancellationToken);
 
 		/// <inheritdoc cref="EntityFrameworkQueryableExtensions.FirstAsync{TSource}(IQueryable{TSource}, CancellationToken)"/>
diff --git a/Tests/LinqToDB.EntityFrameworkCore.BaseTests/ForMappingTestsBase.cs b/Tests/LinqToDB.EntityFrameworkCore.BaseTests/ForMappingTestsBase.cs
@@ -20,7 +20,7 @@ public virtual void TestIdentityMapping()
 			using var connection = context.CreateLinqToDbConnection();
 
 			var ed = connection.MappingSchema.GetEntityDescriptor(typeof(WithIdentity));
-			var pk = ed.Columns.Where(c => c.IsPrimaryKey).Single();
+			var pk = ed.Columns.Single(c => c.IsPrimaryKey);
 
 			pk.IsIdentity.Should().BeTrue();
 		}
@@ -32,7 +32,7 @@ public virtual void TestNoIdentityMapping()
 			using var connection = context.CreateLinqToDbConnection();
 
 			var ed = connection.MappingSchema.GetEntityDescriptor(typeof(NoIdentity));
-			var pk = ed.Columns.Where(c => c.IsPrimaryKey).Single();
+			var pk = ed.Columns.Single(c => c.IsPrimaryKey);
 
 			pk.IsIdentity.Should().BeFalse();
 		}

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru`
`214`	`214`	`var primaryKeyOrder = 0;`
`215`	`215`	`if (isPrimaryKey)`
`216`	`216`	`{`
`217`		`- var pk = prop.FindContainingPrimaryKey();`
	`217`	`+ var pk = prop.FindContainingPrimaryKey()!;`
`218`	`218`	`primaryKeyOrder = pk.Properties.Select((p, i) => new { p, index = i })`
`219`	`219`	`.FirstOrDefault(v => CompareProperty(v.p, memberInfo))?.index ?? 0;`
`220`	`220`	`}`
`@@ -224,16 +224,15 @@ public T[] GetAttributes<T>(Type type, MemberInfo memberInfo, bool inherit = tru`
`224`	`224`	`var annotations = prop.GetAnnotations();`
`225`	`225`	`if (_annotationProvider != null && storeObjectId != null)`
`226`	`226`	`{`
`227`		`- var column = prop.FindColumn(storeObjectId.Value) as IColumn;`
`228`		`- if (column != null)`
	`227`	`+ if (prop.FindColumn(storeObjectId.Value) is IColumn column)`
`229`	`228`	`annotations = annotations.Concat(_annotationProvider.For(column));`
`230`	`229`	`}`
`231`	`230`
`232`	`231`	`var isIdentity = annotations`
`233`	`232`	`.Any(a =>`
`234`	`233`	`{`
`235`	`234`	`if (a.Name.EndsWith(":ValueGenerationStrategy"))`
`236`		`- return a.Value?.ToString().Contains("Identity") == true;`
	`235`	`+ return a.Value?.ToString()!.Contains("Identity") == true;`
`237`	`236`
`238`	`237`	`if (a.Name.EndsWith(":Autoincrement"))`
`239`	`238`	`return a.Value is bool b && b;`
`@@ -434,7 +433,7 @@ protected bool Equals(SqlTransparentExpression other)`
`434`	`433`	`return ReferenceEquals(this, other);`
`435`	`434`	`}`
`436`	`435`
`437`		`- public override bool Equals(object obj)`
	`436`	`+ public override bool Equals(object? obj)`
`438`	`437`	`{`
`439`	`438`	`if (obj is null) return false;`
`440`	`439`	`if (ReferenceEquals(this, obj)) return true;`
`@@ -480,7 +479,7 @@ public override int GetHashCode()`
`480`	`479`	`Expression.Constant(DefaultValue.GetValue(p.ParameterType), p.ParameterType),`
`481`	`480`	`_mappingSource?.FindMapping(p.ParameterType))).ToArray();`
`482`	`481`
`483`		`- var newExpression = _dependencies.MethodCallTranslatorProvider.Translate(_model, objExpr, methodInfo, parametersArray, _logger);`
	`482`	`+ var newExpression = _dependencies.MethodCallTranslatorProvider.Translate(_model, objExpr, methodInfo, parametersArray, _logger!);`
`484`	`483`	`if (newExpression != null)`
`485`	`484`	`{`
`486`	`485`	`if (!methodInfo.IsStatic)`
`@@ -513,7 +512,7 @@ public override int GetHashCode()`
`513`	`512`	`{`
`514`	`513`	`var objExpr = new SqlTransparentExpression(Expression.Constant(DefaultValue.GetValue(type), type), _mappingSource?.FindMapping(propInfo));`
`515`	`514`
`516`		`- var newExpression = _dependencies.MemberTranslatorProvider.Translate(objExpr, propInfo, propInfo.GetMemberType(), _logger);`
	`515`	`+ var newExpression = _dependencies.MemberTranslatorProvider.Translate(objExpr, propInfo, propInfo.GetMemberType(), _logger!);`
`517`	`516`	`if (newExpression != null)`
`518`	`517`	`{`
`519`	`518`	`var parametersArray = new Expression[] { objExpr };`
`@@ -593,7 +592,7 @@ string PrepareExpressionText(Expression? expr)`
`593`	`592`	`var left = newExpression.GetType().GetProperty("Left")?.GetValue(newExpression) as Expression;`
`594`	`593`	`var right = newExpression.GetType().GetProperty("Right")?.GetValue(newExpression) as Expression;`
`595`	`594`
`596`		`- var operand = newExpression.GetType().GetProperty("OperatorType")?.GetValue(newExpression).ToString();`
	`595`	`+ var operand = newExpression.GetType().GetProperty("OperatorType")?.GetValue(newExpression)!.ToString();`
`597`	`596`
`598`	`597`	`var operandExpr = operand switch`
`599`	`598`	`{`
`@@ -664,7 +663,7 @@ private static Expression UnwrapConverted(Expression expr)`
`664`	`663`	`if (expr is SqlFunctionExpression func)`
`665`	`664`	`{`
`666`	`665`	`if (string.Equals(func.Name, "COALESCE", StringComparison.InvariantCultureIgnoreCase) &&`
`667`		`- func.Arguments.Count == 2 && func.Arguments[1].NodeType == ExpressionType.Extension)`
	`666`	`+ func.Arguments!.Count == 2 && func.Arguments[1].NodeType == ExpressionType.Extension)`
`668`	`667`	`return UnwrapConverted(func.Arguments[0]);`
`669`	`668`	`}`
`670`	`669`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ public override ISqlExpression GetExpression(`
`32`	`32`	`{`
`33`	`33`	`var mc = (MethodCallExpression) expression;`
`34`	`34`	`if (!mc.Method.IsStatic)`
`35`		`- knownExpressions.Add(mc.Object);`
	`35`	`+ knownExpressions.Add(mc.Object!);`
`36`	`36`	`knownExpressions.AddRange(mc.Arguments);`
`37`	`37`	`}`
`38`	`38`	`else`
`39`	`39`	`{`
`40`	`40`	`var me = (MemberExpression) expression;`
`41`		`- knownExpressions.Add(me.Expression);`
	`41`	`+ knownExpressions.Add(me.Expression!);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`var pams = new List<ISqlExpression?>(knownExpressions.Select(_ => (ISqlExpression?) null));`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public IQueryable<TElement> CreateQuery<TElement>(Expression expression)`
`65`	`65`	`/// </summary>`
`66`	`66`	`/// <param name="expression">Query expression.</param>`
`67`	`67`	`/// <returns>Query result.</returns>`
`68`		`- public object Execute(Expression expression)`
	`68`	`+ public object? Execute(Expression expression)`
`69`	`69`	`{`
`70`	`70`	`return QueryProvider.Execute(expression);`
`71`	`71`	`}`
`@@ -107,7 +107,7 @@ TResult IAsyncQueryProvider.ExecuteAsync<TResult>(Expression expression, Cancell`
`107`	`107`	`{`
`108`	`108`	`var item = typeof(TResult).GetGenericArguments()[0];`
`109`	`109`	`var method = _executeAsyncMethodInfo.MakeGenericMethod(item);`
`110`		`- return (TResult) method.Invoke(QueryProvider, new object[] { expression, cancellationToken });`
	`110`	`+ return (TResult) method.Invoke(QueryProvider, new object[] { expression, cancellationToken })!;`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`/// <summary>`
`@@ -165,7 +165,7 @@ public IAsyncEnumerator<T> GetAsyncEnumerator(CancellationToken cancellationToke`
`165`	`165`	`/// Returns generated SQL for specific LINQ query.`
`166`	`166`	`/// </summary>`
`167`	`167`	`/// <returns>Generated SQL.</returns>`
`168`		`- public override string ToString()`
	`168`	`+ public override string? ToString()`
`169`	`169`	`{`
`170`	`170`	`return QueryProvider.ToString();`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public virtual void TestIdentityMapping()`
`20`	`20`	`using var connection = context.CreateLinqToDbConnection();`
`21`	`21`
`22`	`22`	`var ed = connection.MappingSchema.GetEntityDescriptor(typeof(WithIdentity));`
`23`		`- var pk = ed.Columns.Where(c => c.IsPrimaryKey).Single();`
	`23`	`+ var pk = ed.Columns.Single(c => c.IsPrimaryKey);`
`24`	`24`
`25`	`25`	`pk.IsIdentity.Should().BeTrue();`
`26`	`26`	`}`
`@@ -32,7 +32,7 @@ public virtual void TestNoIdentityMapping()`
`32`	`32`	`using var connection = context.CreateLinqToDbConnection();`
`33`	`33`
`34`	`34`	`var ed = connection.MappingSchema.GetEntityDescriptor(typeof(NoIdentity));`
`35`		`- var pk = ed.Columns.Where(c => c.IsPrimaryKey).Single();`
	`35`	`+ var pk = ed.Columns.Single(c => c.IsPrimaryKey);`
`36`	`36`
`37`	`37`	`pk.IsIdentity.Should().BeFalse();`
`38`	`38`	`}`