DBFunctions - Add support for instance methods.

dotnet · Sep 16, 2017 · bae5058 · bae5058
1 parent c1bf9cc
commit bae5058
Show file tree

Hide file tree

Showing 6 changed files with 984 additions and 127 deletions.
diff --git a/src/EFCore.Relational/Metadata/Internal/DbFunction.cs b/src/EFCore.Relational/Metadata/Internal/DbFunction.cs
@@ -68,11 +68,6 @@ private DbFunction(
                 throw new ArgumentException(RelationalStrings.DbFunctionGenericMethodNotSupported(methodInfo.DisplayName()));
             }
 
-            if (!methodInfo.IsStatic)
-            {
-                throw new ArgumentException(RelationalStrings.DbFunctionMethodMustBeStatic(methodInfo.DisplayName()));
-            }
-
             if (methodInfo.ReturnType == null
                 || methodInfo.ReturnType == typeof(void))
             {

diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx
@@ -425,9 +425,6 @@
   <data name="DbFunctionInvalidParameterType" xml:space="preserve">
     <value>The parameter '{parameter}' for the DbFunction '{function}' has an invalid type '{type}'. Ensure the parameter type can be mapped by the current provider.</value>
   </data>
-  <data name="DbFunctionMethodMustBeStatic" xml:space="preserve">
-    <value>The DbFunction '{function}' must be a static method. Non-static methods are not supported.</value>
-  </data>
   <data name="DbFunctionGenericMethodNotSupported" xml:space="preserve">
     <value>The DbFunction '{function}' is generic. Generic methods are not supported.</value>
   </data>

diff --git a/src/EFCore.Relational/Query/ExpressionVisitors/SqlTranslatingExpressionVisitor.cs b/src/EFCore.Relational/Query/ExpressionVisitors/SqlTranslatingExpressionVisitor.cs
@@ -613,7 +613,9 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
         {
             Check.NotNull(methodCallExpression, nameof(methodCallExpression));
 
-            var operand = Visit(methodCallExpression.Object);
+            var operand = _queryModelVisitor.QueryCompilationContext.Model.Relational().FindDbFunction(methodCallExpression.Method) != null
+                            ? methodCallExpression.Object
+                            : Visit(methodCallExpression.Object);
 
             if (operand != null
                 || methodCallExpression.Object == null)

diff --git a/test/EFCore.Relational.Tests/Metadata/DbFunctionMetadataTests.cs b/test/EFCore.Relational.Tests/Metadata/DbFunctionMetadataTests.cs
@@ -15,6 +15,14 @@ namespace Microsoft.EntityFrameworkCore.Metadata
 {
     public class DbFunctionMetadataTests
     {
+        public class MyNonDbContext
+        {
+            public int NonStatic()
+            {
+                throw new Exception();
+            }
+        }
+
         public class MyBaseContext : DbContext
         {
             [DbFunction]
@@ -47,8 +55,9 @@ private static void Skip4()
             }
 
             [DbFunction]
-            public void NonStatic()
+            public int NonStatic()
             {
+                throw new Exception();
             }
         }
 
@@ -92,17 +101,18 @@ public static int MethodH<T>(T a, string b)
         }
 
         [Fact]
-        public virtual void Detects_non_static_function_on_dbcontext()
+        public virtual void Non_static_function_on_dbcontext_does_not_throw()
         {
             var modelBuilder = GetModelBuilder();
 
-            var methodInfo
+            var methodInfo 
                 = typeof(MyDerivedContext)
-                    .GetRuntimeMethod(nameof(MyDerivedContext.NonStatic), new Type[] { });
+                        .GetRuntimeMethod(nameof(MyDerivedContext.NonStatic), new Type[] { });
 
-            Assert.Equal(
-                RelationalStrings.DbFunctionMethodMustBeStatic("MyDerivedContext.NonStatic"),
-                Assert.Throws<ArgumentException>(() => modelBuilder.HasDbFunction(methodInfo)).Message);
+            var dbFunc = modelBuilder.HasDbFunction(methodInfo).Metadata;
+
+            Assert.Equal("NonStatic", dbFunc.FunctionName);
+            Assert.Equal(typeof(int), dbFunc.MethodInfo.ReturnType);
         }
 
         [Fact]