Rename ISQLFunctionExtended.FunctionName to Name (#2359)

maca88 · web-flow · commit 14e2d87abb66 · 2020-05-11T08:52:08.000Z
diff --git a/src/NHibernate/Dialect/FirebirdDialect.cs b/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
 			{
diff --git a/src/NHibernate/Dialect/Function/AnsiSubstringFunction.cs b/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
 		{
diff --git a/src/NHibernate/Dialect/Function/AnsiTrimEmulationFunction.cs b/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
 		{
diff --git a/src/NHibernate/Dialect/Function/BitwiseFunctionOperation.cs b/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;
diff --git a/src/NHibernate/Dialect/Function/BitwiseNativeOperation.cs b/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;
diff --git a/src/NHibernate/Dialect/Function/CastFunction.cs b/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
 		{
diff --git a/src/NHibernate/Dialect/Function/CharIndexFunction.cs b/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
 		{
diff --git a/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs b/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
 		{
diff --git a/src/NHibernate/Dialect/Function/ISQLFunctionExtended.cs b/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.
diff --git a/src/NHibernate/Dialect/Function/NoArgSQLFunction.cs b/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
diff --git a/src/NHibernate/Dialect/Function/NvlFunction.cs b/src/NHibernate/Dialect/Function/NvlFunction.cs
@@ -42,7 +42,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => "nvl";
+		public string Name => "nvl";
 
 		public bool HasArguments
 		{
diff --git a/src/NHibernate/Dialect/Function/PositionSubstringFunction.cs b/src/NHibernate/Dialect/Function/PositionSubstringFunction.cs
@@ -44,7 +44,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => "position";
+		public string Name => "position";
 
 		public bool HasArguments
 		{
diff --git a/src/NHibernate/Dialect/Function/SQLFunctionTemplate.cs b/src/NHibernate/Dialect/Function/SQLFunctionTemplate.cs
@@ -104,7 +104,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public virtual string FunctionName => null;
+		public virtual string Name => null;
 
 		public bool HasArguments
 		{
diff --git a/src/NHibernate/Dialect/Function/StandardSQLFunction.cs b/src/NHibernate/Dialect/Function/StandardSQLFunction.cs
@@ -67,7 +67,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public string FunctionName => name;
+		public string Name => name;
 
 		public bool HasArguments
 		{
diff --git a/src/NHibernate/Dialect/Function/VarArgsSQLFunction.cs b/src/NHibernate/Dialect/Function/VarArgsSQLFunction.cs
@@ -58,7 +58,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM
 		}
 
 		/// <inheritdoc />
-		public virtual string FunctionName => null;
+		public virtual string Name => null;
 
 		public bool HasArguments
 		{
diff --git a/src/NHibernate/Dialect/HanaDialectBase.cs b/src/NHibernate/Dialect/HanaDialectBase.cs
@@ -58,7 +58,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m
 			}
 
 			/// <inheritdoc />
-			public virtual string FunctionName => "cast";
+			public virtual string Name => "cast";
 
 			public bool HasArguments => true;
 
diff --git a/src/NHibernate/Dialect/Oracle8iDialect.cs b/src/NHibernate/Dialect/Oracle8iDialect.cs
@@ -583,7 +583,7 @@ public CurrentTimeStamp() : base("current_timestamp", NHibernateUtil.LocalDateTi
 
 			public override SqlString Render(IList args, ISessionFactoryImplementor factory)
 			{
-				return new SqlString(FunctionName);
+				return new SqlString(Name);
 			}
 		}
 		[Serializable]
@@ -619,7 +619,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m
 			}
 
 			/// <inheritdoc />
-			public string FunctionName => "instr";
+			public string Name => "instr";
 
 			public bool HasArguments
 			{
diff --git a/src/NHibernate/Dialect/PostgreSQLDialect.cs b/src/NHibernate/Dialect/PostgreSQLDialect.cs
@@ -400,7 +400,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m
 			}
 
 			/// <inheritdoc />
-			public string FunctionName => _name;
+			public string Name => _name;
 
 			public bool HasArguments => true;
 
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/AggregateNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/AggregateNode.cs
@@ -27,7 +27,7 @@ public string FunctionName
 			{
 				if (SessionFactoryHelper.FindSQLFunction(Text) is ISQLFunctionExtended sqlFunction)
 				{
-					return sqlFunction.FunctionName;
+					return sqlFunction.Name;
 				}
 
 				return Text;

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public CastedFunction(string name, IType returnType) : base(name, returnType, fa`
`148`	`148`
`149`	`149`	`public override SqlString Render(IList args, ISessionFactoryImplementor factory)`
`150`	`150`	`{`
`151`		`- return new SqlString("cast('", FunctionName, "' as ", FunctionReturnType.SqlTypes(factory)[0].ToString(), ")");`
	`151`	`+ return new SqlString("cast('", Name, "' as ", FunctionReturnType.SqlTypes(factory)[0].ToString(), ")");`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`@@ -161,7 +161,7 @@ public CurrentTimeStamp() : base("current_timestamp", NHibernateUtil.LocalDateTi`
`161`	`161`
`162`	`162`	`public override SqlString Render(IList args, ISessionFactoryImplementor factory)`
`163`	`163`	`{`
`164`		`- return new SqlString(FunctionName);`
	`164`	`+ return new SqlString(Name);`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`@@ -235,7 +235,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`/// <inheritdoc />`
`238`		`- public string FunctionName => "position";`
	`238`	`+ public string Name => "position";`
`239`	`239`
`240`	`240`	`public bool HasArguments`
`241`	`241`	`{`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/// <inheritdoc />`
`53`		`- public string FunctionName => "substring";`
	`53`	`+ public string Name => "substring";`
`54`	`54`
`55`	`55`	`public bool HasArguments`
`56`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IMapping m`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/// <inheritdoc />`
`101`		`- public string FunctionName => null;`
	`101`	`+ public string Name => null;`
`102`	`102`
`103`	`103`	`public bool HasArguments`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`/// <inheritdoc />`
`73`		`- public string FunctionName => _functionName;`
	`73`	`+ public string Name => _functionName;`
`74`	`74`
`75`	`75`	`/// <inheritdoc />`
`76`	`76`	`public bool HasArguments => true;`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/// <inheritdoc />`
`92`		`- public string FunctionName => null;`
	`92`	`+ public string Name => null;`
`93`	`93`
`94`	`94`	`/// <inheritdoc />`
`95`	`95`	`public bool HasArguments => true;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`/// <inheritdoc />`
`45`		`- public string FunctionName => "cast";`
	`45`	`+ public string Name => "cast";`
`46`	`46`
`47`	`47`	`public bool HasArguments`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`/// <inheritdoc />`
`46`		`- public string FunctionName => "charindex";`
	`46`	`+ public string Name => "charindex";`
`47`	`47`
`48`	`48`	`public bool HasArguments`
`49`	`49`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`/// <inheritdoc />`
`66`		`- public string FunctionName => name;`
	`66`	`+ public string Name => name;`
`67`	`67`
`68`	`68`	`public bool HasArguments`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,19 +21,13 @@ public NoArgSQLFunction(string name, IType returnType)`
`21`	`21`
`22`	`22`	`public NoArgSQLFunction(string name, IType returnType, bool hasParenthesesIfNoArguments)`
`23`	`23`	`{`
`24`		`-#pragma warning disable 618`
`25`	`24`	`Name = name;`
`26`		`-#pragma warning restore 618`
`27`	`25`	`FunctionReturnType = returnType;`
`28`	`26`	`HasParenthesesIfNoArguments = hasParenthesesIfNoArguments;`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`public IType FunctionReturnType { get; protected set; }`
`32`	`30`
`33`		`- // Since v5.3`
`34`		`- [Obsolete("Use FunctionName property instead.")]`
`35`		`- public string Name { get; protected set; }`
`36`		`-`
`37`	`31`	`#region ISQLFunction Members`
`38`	`32`
`39`	`33`	`// Since v5.3`
`@@ -58,9 +52,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`58`	`52`	`}`
`59`	`53`
`60`	`54`	`/// <inheritdoc />`
`61`		`-#pragma warning disable 618`
`62`		`- public string FunctionName => Name;`
`63`		`-#pragma warning restore 618`
	`55`	`+ public string Name { get; protected set; }`
`64`	`56`
`65`	`57`	`public bool HasArguments`
`66`	`58`	`{`
`@@ -73,15 +65,15 @@ public virtual SqlString Render(IList args, ISessionFactoryImplementor factory)`
`73`	`65`	`{`
`74`	`66`	`if (args.Count > 0)`
`75`	`67`	`{`
`76`		`- throw new QueryException("function takes no arguments: " + FunctionName);`
	`68`	`+ throw new QueryException("function takes no arguments: " + Name);`
`77`	`69`	`}`
`78`	`70`
`79`	`71`	`if (HasParenthesesIfNoArguments)`
`80`	`72`	`{`
`81`		`- return new SqlString(FunctionName + "()");`
	`73`	`+ return new SqlString(Name + "()");`
`82`	`74`	`}`
`83`	`75`
`84`		`- return new SqlString(FunctionName);`
	`76`	`+ return new SqlString(Name);`
`85`	`77`	`}`
`86`	`78`
`87`	`79`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable<IType> argumentTypes, IM`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// <inheritdoc />`
`47`		`- public string FunctionName => "position";`
	`47`	`+ public string Name => "position";`
`48`	`48`
`49`	`49`	`public bool HasArguments`
`50`	`50`	`{`