From b5e42df0fc9ec1d1783739e2579e41c80ac8e467 Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Tue, 14 Mar 2023 11:03:13 +0200 Subject: [PATCH 1/2] Cleanup --- src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs | 17 ----------------- .../Hql/Ast/ANTLR/QueryTranslatorImpl.cs | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs index d014cc5f46f..39867333255 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs @@ -58,7 +58,6 @@ public partial class HqlSqlWalker private readonly LiteralProcessor _literalProcessor; private readonly IDictionary _tokenReplacements; - private readonly IDictionary _guessedParameterTypes = new Dictionary(); private JoinType _impliedJoinType; @@ -93,21 +92,6 @@ public override void ReportError(RecognitionException e) _parseErrorHandler.ReportError(e); } - internal IStatement Transform() - { - var tree = (IStatement) statement().Tree; - // Use the guessed type in case we weren't been able to detect the type - foreach (var parameter in _parameters) - { - if (parameter.ExpectedType == null && _guessedParameterTypes.TryGetValue(parameter, out var guessedType)) - { - parameter.ExpectedType = guessedType; - } - } - - return tree; - } - /* protected override void Mismatch(IIntStream input, int ttype, BitSet follow) { @@ -1176,7 +1160,6 @@ IASTNode GenerateNamedParameter(IASTNode delimiterNode, IASTNode nameNode) // when the parameter is used as an argument. if (isGuessedType) { - _guessedParameterTypes[paramSpec] = type; parameter.GuessedType = type; } else diff --git a/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs b/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs index bbf6fdfb48d..7a7605290bc 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs @@ -652,7 +652,7 @@ public IStatement Translate() try { // Transform the tree. - _resultAst = hqlSqlWalker.Transform(); + _resultAst = (IStatement) hqlSqlWalker.statement().Tree; } finally { From 0341f66e762f125f81cee7c8f6f23ae0d5b6acda Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Wed, 15 Mar 2023 11:17:43 +0200 Subject: [PATCH 2/2] Update src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Frédéric Delaporte <12201973+fredericDelaporte@users.noreply.github.com> --- src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs b/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs index 7a7605290bc..6bab2557751 100644 --- a/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs +++ b/src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs @@ -651,7 +651,6 @@ public IStatement Translate() try { - // Transform the tree. _resultAst = (IStatement) hqlSqlWalker.statement().Tree; } finally