Query: Improve detection of composible FromSql queries

davidMuir · Nov 29, 2016 · 5daca1b · 5daca1b
1 parent 60ef281
commit 5daca1b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/FromSqlQueryTestBase.cs b/src/Microsoft.EntityFrameworkCore.Relational.Specification.Tests/FromSqlQueryTestBase.cs
@@ -198,6 +198,25 @@ public virtual void From_sql_queryable_composed()
             }
         }
 
+        [Fact]
+        public virtual void From_sql_queryable_composed_after_removing_whitespaces()
+        {
+            using (var context = CreateContext())
+            {
+                var actual = context.Set<Customer>()
+                    .FromSql(@"
+    
+
+
+SELECT
+* FROM ""Customers""")
+                    .Where(c => c.ContactName.Contains("z"))
+                    .ToArray();
+
+                Assert.Equal(14, actual.Length);
+            }
+        }
+
         [Fact]
         public virtual void From_sql_queryable_composed_compiled()
         {

diff --git a/...orkCore.Relational/Query/ExpressionVisitors/RelationalEntityQueryableExpressionVisitor.cs b/...orkCore.Relational/Query/ExpressionVisitors/RelationalEntityQueryableExpressionVisitor.cs
@@ -191,10 +191,12 @@ var fromSqlAnnotation
                         tableAlias,
                         _querySource));
 
+                var trimmedSql = fromSqlAnnotation.Sql.TrimStart('\r', '\n', '\t', ' ');
+
                 var useQueryComposition
-                    = fromSqlAnnotation.Sql
-                        .TrimStart()
-                        .StartsWith("SELECT ", StringComparison.OrdinalIgnoreCase);
+                    = trimmedSql.StartsWith("SELECT ", StringComparison.OrdinalIgnoreCase)
+                      || trimmedSql.StartsWith("SELECT" + Environment.NewLine, StringComparison.OrdinalIgnoreCase)
+                      || trimmedSql.StartsWith("SELECT\t", StringComparison.OrdinalIgnoreCase);
 
                 var requiresClientEval = !useQueryComposition;
 

diff --git a/test/Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests/FromSqlQuerySqlServerTest.cs b/test/Microsoft.EntityFrameworkCore.SqlServer.FunctionalTests/FromSqlQuerySqlServerTest.cs
@@ -52,6 +52,24 @@ WHERE CHARINDEX(N'z', [c].[ContactName]) > 0",
                 Sql);
         }
 
+        public override void From_sql_queryable_composed_after_removing_whitespaces()
+        {
+            base.From_sql_queryable_composed_after_removing_whitespaces();
+
+            Assert.Equal(
+                @"SELECT [c].[CustomerID], [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
+FROM (
+
+        
+
+
+    SELECT
+    * FROM ""Customers""
+) AS [c]
+WHERE CHARINDEX(N'z', [c].[ContactName]) > 0",
+                Sql);
+        }
+
         public override void From_sql_queryable_composed_compiled()
         {
             base.From_sql_queryable_composed_compiled();