Add indenting for multiple line raw SQL strings

dotnet · Mar 10, 2015 · 3efb451 · 3efb451
1 parent c86f22f
commit 3efb451
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/src/EntityFramework.Relational/Query/Sql/DefaultSqlQueryGenerator.cs b/src/EntityFramework.Relational/Query/Sql/DefaultSqlQueryGenerator.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Text;
@@ -186,11 +187,17 @@ public virtual Expression VisitRawSqlDerivedTableExpression([NotNull] RawSqlDeri
 
             using (_sql.Indent())
             {
-                _sql.Append(rawSqlDerivedTableExpression.Sql);
+                var reader = new StringReader(rawSqlDerivedTableExpression.Sql);
+
+                var line = reader.ReadLine();
+                while (line != null)
+                {
+                    _sql.AppendLine(line);
+                    line = reader.ReadLine();
+                }
             }
 
-            _sql.AppendLine()
-                .Append(") AS ")
+            _sql.Append(") AS ")
                 .Append(DelimitIdentifier(rawSqlDerivedTableExpression.Alias));
 
             return rawSqlDerivedTableExpression;

diff --git a/test/EntityFramework.Relational.FunctionalTests/FromSqlQueryTestBase.cs b/test/EntityFramework.Relational.FunctionalTests/FromSqlQueryTestBase.cs
@@ -63,6 +63,17 @@ public virtual void From_sql_queryable_where_simple_closure_via_query_cache()
                 entryCount: 7);
         }
 
+        [Fact]
+        public virtual void From_sql_queryable_with_multiple_line_query()
+        {
+            AssertQuery<Customer>(
+                cs => cs.FromSql(@"SELECT *
+FROM Customers
+WHERE Customers.City = 'London'"),
+                cs => cs.Where(c => c.City == "London"),
+                entryCount: 6);
+        }
+
         protected NorthwindContext CreateContext()
         {
             return Fixture.CreateContext();

diff --git a/test/EntityFramework.SqlServer.FunctionalTests/FromSqlQuerySqlServerTest.cs b/test/EntityFramework.SqlServer.FunctionalTests/FromSqlQuerySqlServerTest.cs
@@ -30,7 +30,6 @@ public override void From_sql_queryable_filter()
     SELECT * FROM Customers WHERE Customers.ContactName LIKE '%z%'
 ) AS [c]",
                 Sql);
-
         }
         public override void From_sql_queryable_cached_by_query()
         {
@@ -68,6 +67,20 @@ public override void From_sql_queryable_where_simple_closure_via_query_cache()
                 Sql);
         }
 
+        public override void From_sql_queryable_with_multiple_line_query()
+        {
+            base.From_sql_queryable_with_multiple_line_query();
+
+            Assert.Equal(
+                @"SELECT [c].[Address], [c].[City], [c].[CompanyName], [c].[ContactName], [c].[ContactTitle], [c].[Country], [c].[CustomerID], [c].[Fax], [c].[Phone], [c].[PostalCode], [c].[Region]
+FROM (
+    SELECT *
+    FROM Customers
+    WHERE Customers.City = 'London'
+) AS [c]",
+                Sql);
+        }
+
         public FromSqlQuerySqlServerTest(NorthwindQuerySqlServerFixture fixture)
             : base(fixture)
         {