Follow up from #4554/#4548 reviews

linq2db · Jul 17, 2024 · 67cdeb4 · 67cdeb4
1 parent bb59abc
commit 67cdeb4
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 39 deletions.
diff --git a/Source/LinqToDB/Linq/Builder/AllJoinsBuilder.cs b/Source/LinqToDB/Linq/Builder/AllJoinsBuilder.cs
@@ -77,11 +77,11 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 			if (joinType is JoinType.Left or JoinType.Full)
 			{
 				result = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(buildInfo.Parent,
-					sequence : result,
-					nullabilitySequence : result,
-					defaultValue : null,
-					allowNullField : false,
-					isNullValidationDisabled : false);
+					sequence: result,
+					nullabilitySequence: result,
+					defaultValue: null,
+					allowNullField: false,
+					isNullValidationDisabled: false);
 			}
 
 			return BuildSequenceResult.FromContext(result);

diff --git a/Source/LinqToDB/Linq/Builder/AllJoinsLinqBuilder.cs b/Source/LinqToDB/Linq/Builder/AllJoinsLinqBuilder.cs
@@ -65,12 +65,30 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 					break;
 			}
 
-			if (joinType == JoinType.Right || joinType == JoinType.Full)
-				outerContext = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(buildInfo.Parent, outerContext, outerContext, null, false, false);
+			if (joinType is JoinType.Right or JoinType.Full)
+			{
+				outerContext = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(
+					buildInfo.Parent,
+					outerContext,
+					outerContext,
+					defaultValue: null,
+					allowNullField: false,
+					isNullValidationDisabled: false);
+			}
+
 			outerContext = new SubQueryContext(outerContext);
 
-			if (joinType == JoinType.Left || joinType == JoinType.Full)
-				innerContext = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(buildInfo.Parent, innerContext, innerContext, null, false, false);
+			if (joinType is JoinType.Left or JoinType.Full)
+			{
+				innerContext = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(
+					buildInfo.Parent,
+					innerContext,
+					innerContext,
+					defaultValue: null,
+					allowNullField: false,
+					isNullValidationDisabled: false);
+			}
+
 			innerContext = new SubQueryContext(innerContext);
 
 			var selector = methodCall.Arguments[^1].UnwrapLambda();

diff --git a/Source/LinqToDB/Linq/Builder/DefaultIfEmptyBuilder.cs b/Source/LinqToDB/Linq/Builder/DefaultIfEmptyBuilder.cs
@@ -28,11 +28,6 @@ public static bool CanBuildMethod(MethodCallExpression call, BuildInfo info, Exp
 
 			if (notNull.Count == 0)
 			{
-				/*
-				if (!allowNullField)
-					return null;
-					*/
-
 				if (builder.DataContext.SqlProviderFlags.IsAccessBuggyLeftJoinConstantNullability)
 				{
 					if (placeholders.Count == 0)
@@ -42,8 +37,13 @@ public static bool CanBuildMethod(MethodCallExpression call, BuildInfo info, Exp
 				}
 				else
 				{
-					notNull.Add(SequenceHelper.CreateSpecialProperty(new ContextRefExpression(notNullHandlerSequence.ElementType, notNullHandlerSequence), typeof(int?),
-						DefaultIfEmptyContext.NotNullPropName));
+					notNull.Add(
+						SequenceHelper.CreateSpecialProperty(
+							new ContextRefExpression(notNullHandlerSequence.ElementType, notNullHandlerSequence),
+							typeof(int?),
+							DefaultIfEmptyContext.NotNullPropName
+						)
+					);
 				}
 
 			}
@@ -93,7 +93,13 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 					defaultValueContext.SelectQuery.Select.AddNew(new SqlValue(1));
 				}
 
-				var defaultIfEmptyContext = new DefaultIfEmptyContext(buildInfo.Parent, sequence, sequence, null, true, false);
+				var defaultIfEmptyContext = new DefaultIfEmptyContext(
+					buildInfo.Parent,
+					sequence,
+					sequence,
+					defaultValue: null,
+					allowNullField: true,
+					isNullValidationDisabled: false);
 
 				var notNullConditions = defaultIfEmptyContext.GetNotNullConditions();
 

diff --git a/Source/LinqToDB/Linq/Builder/FirstSingleBuilder.cs b/Source/LinqToDB/Linq/Builder/FirstSingleBuilder.cs
@@ -137,7 +137,14 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 
 			if (buildInfo.Parent != null && (cardinality & SourceCardinality.Zero) != 0)
 			{
-				sequence = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(buildInfo.Parent, sequence, sequence, null, allowNullField: true, isNullValidationDisabled: false);
+				sequence = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(
+					buildInfo.Parent,
+					sequence,
+					sequence,
+					defaultValue: null,
+					allowNullField: true,
+					isNullValidationDisabled: false);
+
 				canBeWeak = true;
 			}
 

diff --git a/Source/LinqToDB/Linq/Builder/SelectManyBuilder.cs b/Source/LinqToDB/Linq/Builder/SelectManyBuilder.cs
@@ -64,7 +64,13 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 			//
 			if (collectionInfo.JoinType == JoinType.Full || collectionInfo.JoinType == JoinType.Right)
 			{
-				sequence = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(buildInfo.Parent, sequence, collection, null, false, false);
+				sequence = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(
+					buildInfo.Parent,
+					sequence,
+					collection,
+					defaultValue: null,
+					allowNullField: false,
+					isNullValidationDisabled: false);
 			}
 
 			var collectionDefaultIfEmptyContext = SequenceHelper.GetDefaultIfEmptyContext(collection);
@@ -88,9 +94,11 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 				_ => joinType
 			};
 
-			var projected = builder.BuildSqlExpression(collection,
-				new ContextRefExpression(collection.ElementType, collection), buildInfo.GetFlags(),
-				buildFlags : ExpressionBuilder.BuildFlags.ForceAssignments);
+			var projected = builder.BuildSqlExpression(
+				collection,
+				new ContextRefExpression(collection.ElementType, collection),
+				buildInfo.GetFlags(),
+				buildFlags: ExpressionBuilder.BuildFlags.ForceAssignments);
 
 			var expanded = builder.MakeExpression(sequence, new ContextRefExpression(collection.ElementType, collection), ProjectFlags.ExtractProjection);
 
@@ -100,7 +108,11 @@ protected override BuildSequenceResult BuildMethodCall(ExpressionBuilder builder
 			{
 				var collectionSelectContext = new SelectContext(buildInfo.Parent, builder, null, expanded, collection.SelectQuery, buildInfo.IsSubQuery);
 
-				collection = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(sequence, collectionSelectContext, collection, collectionDefaultIfEmptyContext.DefaultValue,
+				collection = new DefaultIfEmptyBuilder.DefaultIfEmptyContext(
+					sequence,
+					collectionSelectContext,
+					collection,
+					defaultValue: collectionDefaultIfEmptyContext.DefaultValue,
 					allowNullField: joinType is not (JoinType.Right or JoinType.RightApply or JoinType.Full or JoinType.FullApply),
 					isNullValidationDisabled: false);
 			}

diff --git a/Source/LinqToDB/SqlProvider/BasicSqlOptimizer.cs b/Source/LinqToDB/SqlProvider/BasicSqlOptimizer.cs
@@ -1867,11 +1867,6 @@ protected IQueryElement OptimizeQueries(IQueryElement startFrom, IQueryElement r
 #if DEBUG
 			// ReSharper disable once NotAccessedVariable
 
-			if (startFrom is SqlSelectStatement)
-			{
-
-			}
-
 			var sqlText = startFrom.DebugText;
 
 			if (startFrom is SqlStatement statementBefore)
@@ -1887,6 +1882,7 @@ protected IQueryElement OptimizeQueries(IQueryElement startFrom, IQueryElement r
 			if (startFrom is SqlStatement statementAfter)
 				QueryHelper.DebugCheckNesting(statementAfter, false);
 #endif
+
 			return result;
 		}
 

diff --git a/Source/LinqToDB/SqlQuery/QueryHelper.cs b/Source/LinqToDB/SqlQuery/QueryHelper.cs
@@ -225,17 +225,6 @@ static bool IsDependsOn(IQueryElement testedRoot, IQueryElement onElement, HashS
 					var nullability = (SqlNullabilityExpression)expr;
 					return GetColumnDescriptor(nullability.SqlExpression);
 				}
-				case QueryElementType.SqlFunction:
-				{
-					var function = (SqlFunction)expr;
-
-					//TODO: probably remove, we have SqlCoalesceExpression
-					if (function is { Name: "Coalesce", Parameters.Length: 2 })
-					{
-						return GetColumnDescriptor(function.Parameters[0]);
-					}
-					break;
-				}
 				case QueryElementType.SqlCoalesce:
 				{
 					var coalesce = (SqlCoalesceExpression)expr;