Cosmos: remove automatic composition of discriminator filter in raw S…

…QL queries Closes #26124
dotnet · Oct 10, 2021 · 8b1f790 · 8b1f790
1 parent 938a8b0
commit 8b1f790
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 86 deletions.
diff --git a/src/EFCore.Cosmos/Query/Internal/QuerySqlGenerator.cs b/src/EFCore.Cosmos/Query/Internal/QuerySqlGenerator.cs
@@ -247,11 +247,10 @@ protected override Expression VisitSelect(SelectExpression selectExpression)
             }
 
             Visit(selectExpression.FromExpression);
-            _sqlBuilder.AppendLine();
 
             if (selectExpression.Predicate != null)
             {
-                _sqlBuilder.Append("WHERE ");
+                _sqlBuilder.AppendLine().Append("WHERE ");
                 Visit(selectExpression.Predicate);
             }
 

diff --git a/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs b/src/EFCore.Cosmos/Query/Internal/SqlExpressionFactory.cs
@@ -525,12 +525,7 @@ public virtual SelectExpression Select(IEntityType entityType)
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public virtual SelectExpression Select(IEntityType entityType, string sql, Expression argument)
-        {
-            var selectExpression = new SelectExpression(entityType, sql, argument);
-            AddDiscriminator(selectExpression, entityType);
-
-            return selectExpression;
-        }
+            => new(entityType, sql, argument);
 
         private void AddDiscriminator(SelectExpression selectExpression, IEntityType entityType)
         {