Fix to #24569 - TableValuedFunctionExpression does not take the IsBui…

…ltIn option into account (DbFunctions) The TableValuedFunctionExpression does not take the IsBuiltIn option into account. This results in brackets being added to build in database functions. Fixes #24569
dotnet · Apr 26, 2021 · 393b60c · 393b60c
1 parent 3e2db5e
commit 393b60c
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 1 deletion.
diff --git a/src/EFCore.Relational/Query/QuerySqlGenerator.cs b/src/EFCore.Relational/Query/QuerySqlGenerator.cs
@@ -312,8 +312,12 @@ protected override Expression VisitTableValuedFunction(TableValuedFunctionExpres
                     .Append(".");
             }
 
+            var name = tableValuedFunctionExpression.StoreFunction.IsBuiltIn
+                ? tableValuedFunctionExpression.StoreFunction.Name
+                : _sqlGenerationHelper.DelimitIdentifier(tableValuedFunctionExpression.StoreFunction.Name);
+
             _relationalCommandBuilder
-                .Append(_sqlGenerationHelper.DelimitIdentifier(tableValuedFunctionExpression.StoreFunction.Name))
+                .Append(name)
                 .Append("(");
 
             GenerateList(tableValuedFunctionExpression.Arguments, e => Visit(e));

diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/QueryBugsTest.cs
@@ -10099,6 +10099,73 @@ public class AnOwnedTypeWithPrimitiveProperties2
 
         #endregion
 
+        #region Issue24569
+
+        // TODO: Remove when JSON is first class and we have proper tests. See issue#4021
+
+        [ConditionalFact]
+        public virtual async Task Builtin_tvf_translated_correctly()
+        {
+            var contextFactory = await InitializeAsync<MyContext24569>(seed: c => c.Seed());
+
+            using (var context = contextFactory.CreateContext())
+            {
+                var query = await (from c in context.Cars
+                                   from j in context.OpenJson(c.Json, "$.items")
+                                   select new { c, j }).ToListAsync();
+
+                AssertSql(
+                    new[] {
+                    @"SELECT [c].[Id], [c].[Json], [o].[Value]
+FROM [Cars] AS [c]
+CROSS APPLY OPENJSON([c].[Json], N'$.items') AS [o]" });
+            }
+        }
+
+        protected class MyContext24569 : DbContext
+        {
+            public DbSet<Car24569> Cars { get; set; }
+
+            public MyContext24569(DbContextOptions options)
+                : base(options)
+            {
+            }
+
+            protected override void OnModelCreating(ModelBuilder modelBuilder)
+            {
+                modelBuilder.HasDbFunction(() => OpenJson(string.Empty, string.Empty)).HasStoreType("nvarchar(max)");
+            }
+
+            [DbFunction("OPENJSON", IsBuiltIn = true)]
+            public IQueryable<JsonResult> OpenJson(string column, string jsonPath)
+                => FromExpression(() => OpenJson(column, jsonPath));
+
+            public void Seed()
+            {
+                Cars.Add(new Car24569
+                {
+                    Json = @"{ ""name"": ""test"", ""items"": [{""id"": 1}, {""id"": 2}] }",
+                });
+
+                SaveChanges();
+            }
+
+            public class Car24569
+            {
+                public int Id { get; set; }
+
+                public string Json { get; set; }
+            }
+
+            [Keyless]
+            public class JsonResult
+            {
+                public string Value { get; set; }
+            }
+        }
+
+        #endregion
+
         protected override string StoreName => "QueryBugsTest";
         protected TestSqlLoggerFactory TestSqlLoggerFactory
             => (TestSqlLoggerFactory)ListLoggerFactory;