diff --git a/src/NHibernate/Dialect/FirebirdDialect.cs b/src/NHibernate/Dialect/FirebirdDialect.cs index 0f26f03d15a..64b6dc911c3 100644 --- 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 argumentTypes, IMapping m } /// - 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 index 574aa13a136..0ab50b074e9 100644 --- a/src/NHibernate/Dialect/Function/AnsiSubstringFunction.cs +++ b/src/NHibernate/Dialect/Function/AnsiSubstringFunction.cs @@ -50,7 +50,7 @@ public IType GetEffectiveReturnType(IEnumerable argumentTypes, IMapping m } /// - 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 index 995764d303e..d007ba8513d 100644 --- a/src/NHibernate/Dialect/Function/AnsiTrimEmulationFunction.cs +++ b/src/NHibernate/Dialect/Function/AnsiTrimEmulationFunction.cs @@ -98,7 +98,7 @@ public IType GetEffectiveReturnType(IEnumerable argumentTypes, IMapping m } /// - 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 index db6ba0c5365..f6ae8af1345 100644 --- a/src/NHibernate/Dialect/Function/BitwiseFunctionOperation.cs +++ b/src/NHibernate/Dialect/Function/BitwiseFunctionOperation.cs @@ -70,7 +70,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - public string FunctionName => _functionName; + public string Name => _functionName; /// public bool HasArguments => true; diff --git a/src/NHibernate/Dialect/Function/BitwiseNativeOperation.cs b/src/NHibernate/Dialect/Function/BitwiseNativeOperation.cs index 3bffb4b1d59..cd7ad761b3c 100644 --- a/src/NHibernate/Dialect/Function/BitwiseNativeOperation.cs +++ b/src/NHibernate/Dialect/Function/BitwiseNativeOperation.cs @@ -89,7 +89,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - public string FunctionName => null; + public string Name => null; /// public bool HasArguments => true; diff --git a/src/NHibernate/Dialect/Function/CastFunction.cs b/src/NHibernate/Dialect/Function/CastFunction.cs index 2e02ea9dad1..62f4e53b6d2 100644 --- a/src/NHibernate/Dialect/Function/CastFunction.cs +++ b/src/NHibernate/Dialect/Function/CastFunction.cs @@ -42,7 +42,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 7cc9f7bf543..617f3a34ddf 100644 --- a/src/NHibernate/Dialect/Function/CharIndexFunction.cs +++ b/src/NHibernate/Dialect/Function/CharIndexFunction.cs @@ -43,7 +43,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index cf0d4cf219c..fbbf803658b 100644 --- a/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs +++ b/src/NHibernate/Dialect/Function/ClassicAggregateFunction.cs @@ -63,7 +63,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 8534f347c80..eab9bdfcd32 100644 --- a/src/NHibernate/Dialect/Function/ISQLFunctionExtended.cs +++ b/src/NHibernate/Dialect/Function/ISQLFunctionExtended.cs @@ -10,7 +10,7 @@ internal interface ISQLFunctionExtended : ISQLFunction /// /// The function name or when multiple functions/operators/statements are used. /// - string FunctionName { get; } + string Name { get; } /// /// 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 index 1cca8bd6cac..c3b5092f6a6 100644 --- 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 argumentTypes, IM } /// -#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 index 9ffba90f04f..68f881f4eac 100644 --- a/src/NHibernate/Dialect/Function/NvlFunction.cs +++ b/src/NHibernate/Dialect/Function/NvlFunction.cs @@ -42,7 +42,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 717503d6b12..ca99935f2a4 100644 --- a/src/NHibernate/Dialect/Function/PositionSubstringFunction.cs +++ b/src/NHibernate/Dialect/Function/PositionSubstringFunction.cs @@ -44,7 +44,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 4b5a7e0fdc7..a3c9704df77 100644 --- a/src/NHibernate/Dialect/Function/SQLFunctionTemplate.cs +++ b/src/NHibernate/Dialect/Function/SQLFunctionTemplate.cs @@ -104,7 +104,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 279e9089919..a450506daa8 100644 --- a/src/NHibernate/Dialect/Function/StandardSQLFunction.cs +++ b/src/NHibernate/Dialect/Function/StandardSQLFunction.cs @@ -67,7 +67,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 64a0aa213da..edd434f0927 100644 --- a/src/NHibernate/Dialect/Function/VarArgsSQLFunction.cs +++ b/src/NHibernate/Dialect/Function/VarArgsSQLFunction.cs @@ -58,7 +58,7 @@ public virtual IType GetEffectiveReturnType(IEnumerable argumentTypes, IM } /// - 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 index 99203e74605..650965a2c06 100644 --- a/src/NHibernate/Dialect/HanaDialectBase.cs +++ b/src/NHibernate/Dialect/HanaDialectBase.cs @@ -58,7 +58,7 @@ public IType GetEffectiveReturnType(IEnumerable argumentTypes, IMapping m } /// - 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 index 5bfd28a4d18..9bbe3e7dfb9 100644 --- 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 argumentTypes, IMapping m } /// - 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 index 44bbdaff493..0bf2b364eef 100644 --- a/src/NHibernate/Dialect/PostgreSQLDialect.cs +++ b/src/NHibernate/Dialect/PostgreSQLDialect.cs @@ -400,7 +400,7 @@ public IType GetEffectiveReturnType(IEnumerable argumentTypes, IMapping m } /// - 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 index d330103082a..eb0f40f28d0 100644 --- 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;