Update src/NHibernate/Dialect/Function/SQLFunctionRegistry.cs

gliljas · fredericDelaporte · web-flow · commit 8ce04b14add4 · 2025-01-06T13:22:19.000+01:00
Co-authored-by: Frédéric Delaporte &lt;12201973+fredericDelaporte@users.noreply.github.com&gt;
diff --git a/src/NHibernate/Dialect/Function/SQLFunctionRegistry.cs b/src/NHibernate/Dialect/Function/SQLFunctionRegistry.cs
@@ -32,11 +32,11 @@ public ISQLFunction FindSQLFunction(string functionName)
 
 		public bool HasFunction(string functionName)
 		{
-			if (!userFunctions.ContainsKey(functionName) && !dialect.Functions.ContainsKey(functionName) && _functionAliases.TryGetValue(functionName, out var sqlFunction))
-			{
-				functionName = sqlFunction;
-			}
-			return userFunctions.ContainsKey(functionName) || dialect.Functions.ContainsKey(functionName);
+			if (userFunctions.ContainsKey(functionName) || dialect.Functions.ContainsKey(functionName))
+				return true;
+			if (_functionAliases.TryGetValue(functionName, out var sqlFunction) && !_functionAliases.ContainsKey(sqlFunction))
+				return HasFunction(sqlFunction);
+			return false;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -32,11 +32,11 @@ public ISQLFunction FindSQLFunction(string functionName)`
`32`	`32`
`33`	`33`	`public bool HasFunction(string functionName)`
`34`	`34`	`{`
`35`		`- if (!userFunctions.ContainsKey(functionName) && !dialect.Functions.ContainsKey(functionName) && _functionAliases.TryGetValue(functionName, out var sqlFunction))`
`36`		`- {`
`37`		`- functionName = sqlFunction;`
`38`		`- }`
`39`		`- return userFunctions.ContainsKey(functionName) \|\| dialect.Functions.ContainsKey(functionName);`
	`35`	`+ if (userFunctions.ContainsKey(functionName) \|\| dialect.Functions.ContainsKey(functionName))`
	`36`	`+ return true;`
	`37`	`+ if (_functionAliases.TryGetValue(functionName, out var sqlFunction) && !_functionAliases.ContainsKey(sqlFunction))`
	`38`	`+ return HasFunction(sqlFunction);`
	`39`	`+ return false;`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`