Skip to content

Cleanup guessed parameters handling in hql #3255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 16, 2023
Merged

Cleanup guessed parameters handling in hql #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5e42df
Cleanup
bahusoid Mar 14, 2023
0341f66
Update src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
bahusoid Mar 15, 2023
7b3c3d3
Merge branch 'master' into guessedParamsCleanup
hazzik Mar 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/NHibernate/Hql/Ast/ANTLR/HqlSqlWalker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ public partial class HqlSqlWalker
private readonly LiteralProcessor _literalProcessor;

private readonly IDictionary<string, string> _tokenReplacements;
private readonly IDictionary<IParameterSpecification, IType> _guessedParameterTypes = new Dictionary<IParameterSpecification, IType>();

private JoinType _impliedJoinType;

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions src/NHibernate/Hql/Ast/ANTLR/QueryTranslatorImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,8 +651,7 @@ public IStatement Translate()

try
{
// Transform the tree.
_resultAst = hqlSqlWalker.Transform();
_resultAst = (IStatement) hqlSqlWalker.statement().Tree;
}
finally
{
Expand Down