Merge branch 'master' into ConstantParametersCaching

Author: hazzik

src/NHibernate/Dialect/FirebirdDialect.cs

@@ -148,7 +148,7 @@ public CastedFunction(string name, IType returnType) : base(name, returnType, fa
 
 			public override SqlString Render(IList args, ISessionFactoryImplementor factory)
 			{
-				return new SqlString("cast('", FunctionName, "' as ", FunctionReturnType.SqlTypes(factory)[0].ToString(), ")");
+				return new SqlString("cast('", Name, "' as ", FunctionReturnType.SqlTypes(factory)[0].ToString(), ")");
 			}
 		}
 
@@ -161,7 +161,7 @@ public CurrentTimeStamp() : base("current_timestamp", NHibernateUtil.LocalDateTi
 
 			public override SqlString Render(IList args, ISessionFactoryImplementor factory)
 			{
-				return new SqlString(FunctionName);
+				return new SqlString(Name);
 			}
 		}
 
@@ -235,7 +235,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m
 			}
 
 			/// <inheritdoc />
-			public string FunctionName => "position";
+			public string Name => "position";
 
 			public bool HasArguments
 			{

src/NHibernate/Dialect/Function/AnsiSubstringFunction.cs

@@ -50,7 +50,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => "substring";
+		public string Name => "substring";
 
 		public bool HasArguments
 		{

src/NHibernate/Dialect/Function/AnsiTrimEmulationFunction.cs

@@ -98,7 +98,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => null;
+		public string Name => null;
 
 		public bool HasArguments
 		{

src/NHibernate/Dialect/Function/BitwiseFunctionOperation.cs

@@ -70,7 +70,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => _functionName;
+		public string Name => _functionName;
 
 		/// <inheritdoc />
 		public bool HasArguments => true;

src/NHibernate/Dialect/Function/BitwiseNativeOperation.cs

@@ -89,7 +89,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => null;
+		public string Name => null;
 
 		/// <inheritdoc />
 		public bool HasArguments => true;

src/NHibernate/Dialect/Function/CastFunction.cs

@@ -42,7 +42,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => "cast";
+		public string Name => "cast";
 
 		public bool HasArguments
 		{

src/NHibernate/Dialect/Function/CharIndexFunction.cs

@@ -43,7 +43,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => "charindex";
+		public string Name => "charindex";
 
 		public bool HasArguments
 		{

src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs

@@ -63,7 +63,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => name;
+		public string Name => name;
 
 		public bool HasArguments
 		{

src/NHibernate/Dialect/Function/ISQLFunctionExtended.cs

@@ -10,7 +10,7 @@ internal interface ISQLFunctionExtended : ISQLFunction
 		/// <summary>
 		/// The function name or <see langword="null"/> when multiple functions/operators/statements are used.
 		/// </summary>
-		string FunctionName { get; }
+		string Name { get; }
 
 		/// <summary>
 		/// Get the function general return type, ignoring underlying database specifics.

src/NHibernate/Dialect/Function/NoArgSQLFunction.cs

@@ -21,19 +21,13 @@ public NoArgSQLFunction(string name, IType returnType)
 
 		public NoArgSQLFunction(string name, IType returnType, bool hasParenthesesIfNoArguments)
 		{
-#pragma warning disable 618
 			Name = name;
-#pragma warning restore 618
 			FunctionReturnType = returnType;
 			HasParenthesesIfNoArguments = hasParenthesesIfNoArguments;
 		}
 
 		public IType FunctionReturnType { get; protected set; }
 
-		// Since v5.3
-		[Obsolete("Use FunctionName property instead.")]
-		public string Name { get; protected set; }
-
 		#region ISQLFunction Members
 
 		// Since v5.3
@@ -58,9 +52,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-#pragma warning disable 618
-		public string FunctionName => Name;
-#pragma warning restore 618
+		public string Name { get; protected set; }
 
 		public bool HasArguments
 		{
@@ -73,15 +65,15 @@ public virtual SqlString Render(IList args, ISessionFactoryImplementor factory)
 		{
 			if (args.Count > 0)
 			{
-				throw new QueryException("function takes no arguments: " + FunctionName);
+				throw new QueryException("function takes no arguments: " + Name);
 			}
 
 			if (HasParenthesesIfNoArguments)
 			{
-				return new SqlString(FunctionName + "()");
+				return new SqlString(Name + "()");
 			}
 
-			return new SqlString(FunctionName);
+			return new SqlString(Name);
 		}
 
 		#endregion