Work on user-defined functions

Function quoting logic was changed (for now): all function names are quoted just like any other identifier (the default EF Core behavior is only to quote schema-less functions). This meant changing all expression translators to generate lower-case names (lower() instead of LOWER()), and also to add a hardcoded list of functions which EF Core generates in upper-case but which shouldn't get quoted (e.g. SUM()). See: * dotnet/efcore#8507 * dotnet/efcore#12044 * dotnet/efcore#12757 * dotnet/efcore#9558 * dotnet/efcore#9303
roji · Jul 22, 2018 · 11d756f · 11d756f
1 parent b21c574
commit 11d756f
Show file tree

Hide file tree

Showing 19 changed files with 989 additions and 84 deletions.
diff --git a/src/EFCore.PG.NodaTime/NodaTimeMemberTranslator.cs b/src/EFCore.PG.NodaTime/NodaTimeMemberTranslator.cs
@@ -60,7 +60,7 @@ Expression TranslateDateTime(MemberExpression e)
 
             if (n == "Date")
             {
-                return new SqlFunctionExpression("DATE_TRUNC", e.Type, new[]
+                return new SqlFunctionExpression("date_trunc", e.Type, new[]
                 {
                     Expression.Constant("day"),
                     e.Expression
@@ -84,14 +84,14 @@ static Expression GetDatePartExpression(MemberExpression e, string partName, boo
             // DATE_PART returns doubles, which we floor and cast into ints
             // This also gets rid of sub-second components when retrieving seconds
 
-            var result = new SqlFunctionExpression("DATE_PART", typeof(double), new[]
+            var result = new SqlFunctionExpression("date_part", typeof(double), new[]
             {
                 Expression.Constant(partName),
                 e.Expression
             });
 
             if (needsFloor)
-                result = new SqlFunctionExpression("FLOOR", typeof(double), new[] { result });
+                result = new SqlFunctionExpression("floor", typeof(double), new[] { result });
 
             return new ExplicitCastExpression(result, typeof(int));
         }

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlDateAddTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlDateAddTranslator.cs
@@ -56,7 +56,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
 
             return new CustomBinaryExpression(
                 methodCallExpression.Object,
-                new PgFunctionExpression("MAKE_INTERVAL", typeof(TimeSpan), new Dictionary<string, Expression>
+                new PgFunctionExpression("make_interval", typeof(TimeSpan), new Dictionary<string, Expression>
                 {
                     { datePart, amountToAdd }
                 }),

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlDateTimeMemberTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlDateTimeMemberTranslator.cs
@@ -75,7 +75,7 @@ public virtual Expression Translate(MemberExpression e)
                 return GetDatePartExpression(e, "dow");
 
             case nameof(DateTime.Date):
-                return new SqlFunctionExpression("DATE_TRUNC", e.Type, new[]
+                return new SqlFunctionExpression("date_trunc", e.Type, new[]
                 {
                     Expression.Constant("day"),
                     e.Expression
@@ -102,9 +102,9 @@ static Expression GetDatePartExpression(MemberExpression e, string partName)
                 // DATE_PART returns doubles, which we floor and cast into ints
                 // This also gets rid of sub-second components when retrieving seconds
                 new ExplicitCastExpression(
-                    new SqlFunctionExpression("FLOOR", typeof(double), new[]
+                    new SqlFunctionExpression("floor", typeof(double), new[]
                     {
-                        new SqlFunctionExpression("DATE_PART", typeof(double), new[]
+                        new SqlFunctionExpression("date_part", typeof(double), new[]
                         {
                             Expression.Constant(partName),
                             e.Expression
@@ -116,9 +116,9 @@ static Expression GetDatePartExpression(MemberExpression e, string partName)
         Expression TranslateStatic(MemberExpression e)
         {
             if (e.Member.Equals(Now))
-                return new SqlFunctionExpression("NOW", e.Type);
+                return new SqlFunctionExpression("now", e.Type);
             if (e.Member.Equals(UtcNow))
-                return new AtTimeZoneExpression(new SqlFunctionExpression("NOW", e.Type), "UTC");
+                return new AtTimeZoneExpression(new SqlFunctionExpression("now", e.Type), "UTC");
             return null;
         }
     }

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlMathTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlMathTranslator.cs
@@ -36,38 +36,38 @@ public class NpgsqlMathTranslator : IMethodCallTranslator
     {
         static readonly Dictionary<MethodInfo, string> _supportedMethodTranslations = new Dictionary<MethodInfo, string>
         {
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(decimal) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(double) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(float) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(int) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(long) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(sbyte) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(short) }), "ABS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Ceiling), new[] { typeof(decimal) }), "CEILING" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Ceiling), new[] { typeof(double) }), "CEILING" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Floor), new[] { typeof(decimal) }), "FLOOR" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Floor), new[] { typeof(double) }), "FLOOR" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Pow), new[] { typeof(double), typeof(double) }), "POWER" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Exp), new[] { typeof(double) }), "EXP" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Log10), new[] { typeof(double) }), "LOG" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Log), new[] { typeof(double) }), "LN" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(decimal) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(double) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(float) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(int) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(long) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(sbyte) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Abs), new[] { typeof(short) }), "abs" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Ceiling), new[] { typeof(decimal) }), "ceiling" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Ceiling), new[] { typeof(double) }), "ceiling" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Floor), new[] { typeof(decimal) }), "floor" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Floor), new[] { typeof(double) }), "floor" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Pow), new[] { typeof(double), typeof(double) }), "power" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Exp), new[] { typeof(double) }), "exp" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Log10), new[] { typeof(double) }), "log" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Log), new[] { typeof(double) }), "ln" },
             // Disabled because PG only has log(x,y) for numeric
-            //{ typeof(Math).GetRuntimeMethod(nameof(Math.Log), new[] { typeof(double), typeof(double) }), "LOG" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sqrt), new[] { typeof(double) }), "SQRT" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Acos), new[] { typeof(double) }), "ACOS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Asin), new[] { typeof(double) }), "ASIN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Atan), new[] { typeof(double) }), "ATAN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Atan2), new[] { typeof(double), typeof(double) }), "ATAN2" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Cos), new[] { typeof(double) }), "COS" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sin), new[] { typeof(double) }), "SIN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Tan), new[] { typeof(double) }), "TAN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(decimal) }), "SIGN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(double) }), "SIGN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(float) }), "SIGN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(int) }), "SIGN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(long) }), "SIGN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(sbyte) }), "SIGN" },
-            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(short) }), "SIGN" }
+            //{ typeof(Math).GetRuntimeMethod(nameof(Math.Log), new[] { typeof(double), typeof(double) }), "log" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sqrt), new[] { typeof(double) }), "sqrt" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Acos), new[] { typeof(double) }), "acos" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Asin), new[] { typeof(double) }), "asin" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Atan), new[] { typeof(double) }), "atan" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Atan2), new[] { typeof(double), typeof(double) }), "atan2" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Cos), new[] { typeof(double) }), "cos" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sin), new[] { typeof(double) }), "sin" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Tan), new[] { typeof(double) }), "tan" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(decimal) }), "sign" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(double) }), "sign" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(float) }), "sign" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(int) }), "sign" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(long) }), "sign" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(sbyte) }), "sign" },
+            { typeof(Math).GetRuntimeMethod(nameof(Math.Sign), new[] { typeof(short) }), "sign" }
         };
 
         static readonly IEnumerable<MethodInfo> _truncateMethodInfos = new[]

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringContainsTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringContainsTranslator.cs
@@ -54,7 +54,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             }
 
             return Expression.GreaterThan(
-                new SqlFunctionExpression("STRPOS", typeof(int), new[]
+                new SqlFunctionExpression("strpos", typeof(int), new[]
                 {
                     methodCallExpression.Object,
                     argument0

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringEndsWithTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringEndsWithTranslator.cs
@@ -37,13 +37,13 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             => ReferenceEquals(methodCallExpression.Method, _methodInfo)
                 ? Expression.Equal(
                     new SqlFunctionExpression(
-                        "RIGHT",
+                        "right",
                         // ReSharper disable once PossibleNullReferenceException
                         methodCallExpression.Object.Type,
                         new[]
                         {
                             methodCallExpression.Object,
-                            new SqlFunctionExpression("LENGTH", typeof(int), new[] { methodCallExpression.Arguments[0] })
+                            new SqlFunctionExpression("length", typeof(int), new[] { methodCallExpression.Arguments[0] })
                         }
                     ),
                     methodCallExpression.Arguments[0]

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringIndexOfTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringIndexOfTranslator.cs
@@ -48,7 +48,7 @@ public virtual Expression Translate([NotNull] MethodCallExpression methodCallExp
 
             return Expression.Subtract(
                 new SqlFunctionExpression(
-                    "STRPOS",
+                    "strpos",
                     methodCallExpression.Type,
                     new[] { methodCallExpression.Object }.Concat(methodCallExpression.Arguments)),
                 Expression.Constant(1)

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringLengthTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringLengthTranslator.cs
@@ -34,7 +34,7 @@ public virtual Expression Translate([NotNull] MemberExpression memberExpression)
             => (memberExpression.Expression != null)
                && (memberExpression.Expression.Type == typeof(string))
                && (memberExpression.Member.Name == nameof(string.Length))
-                ? new SqlFunctionExpression("LENGTH", memberExpression.Type, new[] { memberExpression.Expression })
+                ? new SqlFunctionExpression("length", memberExpression.Type, new[] { memberExpression.Expression })
                 : null;
     }
 }
diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringReplaceTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringReplaceTranslator.cs
@@ -38,7 +38,7 @@ static readonly MethodInfo _methodInfo
         public virtual Expression Translate([NotNull] MethodCallExpression methodCallExpression)
             => _methodInfo.Equals(methodCallExpression.Method)
                 ? new SqlFunctionExpression(
-                    "REPLACE",
+                    "replace",
                     methodCallExpression.Type,
                     new[] { methodCallExpression.Object }.Concat(methodCallExpression.Arguments))
                 : null;

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringStartsWithTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringStartsWithTranslator.cs
@@ -60,10 +60,10 @@ public virtual Expression Translate(MethodCallExpression e)
             // but then add another test to filter out false positives.
             var pattern = e.Arguments[0];
 
-            Expression leftExpr = new SqlFunctionExpression("LEFT", typeof(string), new[]
+            Expression leftExpr = new SqlFunctionExpression("left", typeof(string), new[]
             {
                 e.Object,
-                new SqlFunctionExpression("LENGTH", typeof(int), new[] { pattern }),
+                new SqlFunctionExpression("length", typeof(int), new[] { pattern }),
             });
 
             // If StartsWith is being invoked on a citext, the LEFT() function above will return a reglar text

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringSubstringTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringSubstringTranslator.cs
@@ -44,7 +44,7 @@ public class NpgsqlStringSubstringTranslator : IMethodCallTranslator
         public virtual Expression Translate(MethodCallExpression methodCallExpression)
             => methodCallExpression.Method.Equals(_methodInfo)
                 ? new SqlFunctionExpression(
-                    "SUBSTRING",
+                    "substring",
                     methodCallExpression.Type,
                     new[]
                     {

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringToLowerTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringToLowerTranslator.cs
@@ -28,7 +28,7 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query.ExpressionTranslators.Inte
     public class NpgsqlStringToLowerTranslator : ParameterlessInstanceMethodCallTranslator
     {
         public NpgsqlStringToLowerTranslator()
-            : base(typeof(string), "ToLower", "LOWER")
+            : base(typeof(string), "ToLower", "lower")
         {
         }
     }

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringToUpperTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringToUpperTranslator.cs
@@ -28,7 +28,7 @@ namespace Npgsql.EntityFrameworkCore.PostgreSQL.Query.ExpressionTranslators.Inte
     public class NpgsqlStringToUpperTranslator : ParameterlessInstanceMethodCallTranslator
     {
         public NpgsqlStringToUpperTranslator()
-            : base(typeof(string), "ToUpper", "UPPER")
+            : base(typeof(string), "ToUpper", "upper")
         {
         }
     }

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringTrimEndTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringTrimEndTranslator.cs
@@ -61,7 +61,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
 
                 var trimChar = (char)constantTrimChars.Value;
                 return new SqlFunctionExpression(
-                    "RTRIM",
+                    "rtrim",
                     typeof(string),
                     new[]
                     {
@@ -91,7 +91,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             {
                 // Trim whitespace
                 return new SqlFunctionExpression(
-                    "REGEXP_REPLACE",
+                    "regexp_replace",
                     typeof(string),
                     new[]
                     {
@@ -102,7 +102,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             }
 
             return new SqlFunctionExpression(
-                "RTRIM",
+                "rtrim",
                 typeof(string),
                 new[]
                 {

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringTrimStartTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringTrimStartTranslator.cs
@@ -60,7 +60,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
                     return null;  // Don't translate if trim chars isn't a constant
                 var trimChar = (char)constantTrimChars.Value;
                 return new SqlFunctionExpression(
-                    "LTRIM",
+                    "ltrim",
                     typeof(string),
                     new[]
                     {
@@ -87,7 +87,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             {
                 // Trim whitespace
                 return new SqlFunctionExpression(
-                    "REGEXP_REPLACE",
+                    "regexp_replace",
                     typeof(string),
                     new[]
                     {
@@ -98,7 +98,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             }
 
             return new SqlFunctionExpression(
-                "LTRIM",
+                "ltrim",
                 typeof(string),
                 new[]
                 {

diff --git a/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringTrimTranslator.cs b/src/EFCore.PG/Query/ExpressionTranslators/Internal/NpgsqlStringTrimTranslator.cs
@@ -27,7 +27,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
             {
                 // Note that PostgreSQL TRIM() does spaces only, not all whitespace, so we use a regex
                 return new SqlFunctionExpression(
-                    "REGEXP_REPLACE",
+                    "regexp_replace",
                     typeof(string),
                     new[]
                     {
@@ -44,7 +44,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
                     return null;
 
                 return new SqlFunctionExpression(
-                    "BTRIM",
+                    "btrim",
                     typeof(string),
                     new[]
                     {
@@ -60,7 +60,7 @@ public virtual Expression Translate(MethodCallExpression methodCallExpression)
                     return null;
 
                 return new SqlFunctionExpression(
-                    "BTRIM",
+                    "btrim",
                     typeof(string),
                     new[]
                     {

diff --git a/src/EFCore.PG/Query/Sql/Internal/NpgsqlQuerySqlGenerator.cs b/src/EFCore.PG/Query/Sql/Internal/NpgsqlQuerySqlGenerator.cs
@@ -25,6 +25,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Linq;
 using System.Linq.Expressions;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
@@ -108,6 +109,36 @@ public override Expression VisitSqlFunction(SqlFunctionExpression sqlFunctionExp
             return expr;
         }
 
+        protected override void GenerateSqlFunctionName(SqlFunctionExpression sqlFunctionExpression)
+        {
+            if (sqlFunctionExpression.Instance != null)
+            {
+                Visit(sqlFunctionExpression.Instance);
+
+                Sql.Append(".");
+            }
+
+            if (string.IsNullOrWhiteSpace(sqlFunctionExpression.Schema))
+            {
+                // Special exception for some built-in functions which should never get quoted
+                if (NonQuotableFunctions.Contains(sqlFunctionExpression.FunctionName))
+                {
+                    Sql.Append(sqlFunctionExpression.FunctionName);
+                    return;
+                }
+            }
+            else
+            {
+                Sql
+                    .Append(SqlGenerator.DelimitIdentifier(sqlFunctionExpression.Schema))
+                    .Append(".");
+            }
+
+            Sql.Append(SqlGenerator.DelimitIdentifier(sqlFunctionExpression.FunctionName));
+        }
+
+        static readonly string[] NonQuotableFunctions = { "COUNT", "AVG", "SUM", "MAX", "MIN" };
+
         protected override Expression VisitBinary(BinaryExpression expression)
         {
             switch (expression.NodeType)