Skip to content

Apply fromFragment processing only when required in ProcessDynamicFilterParameters #3341

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
Jul 1, 2023
Merged

Apply fromFragment processing only when required in ProcessDynamicFilterParameters #3341

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
351061e
Apply fromFragment processing only when required in ProcessDynamicFil…
bahusoid Jun 29, 2023
d74758c
Added Trim back just in case (though tests are fine without it)
bahusoid Jun 29, 2023
2de1ee0
Merge branch 'master' into processDynFiltParams
bahusoid Jul 1, 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
25 changes: 16 additions & 9 deletions src/NHibernate/Hql/Ast/ANTLR/Util/JoinProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,7 @@ private void AddJoinNodes(IRestrictableStatement query, JoinSequence join, FromE
// If there is a FROM fragment and the FROM element is an explicit, then add the from part.
if ( fromElement.UseFromFragment /*&& StringHelper.isNotEmpty( frag )*/ )
{
SqlString fromFragment = ProcessFromFragment( frag, join ).Trim();
if ( log.IsDebugEnabled() )
{
log.Debug("Using FROM fragment [{0}]", fromFragment);
}

ProcessDynamicFilterParameters(fromFragment,fromElement,_walker);
ProcessDynamicFilterParameters(frag, fromElement, _walker, true);
}

_syntheticAndFactory.AddWhereFragment(
Expand All @@ -181,7 +175,7 @@ private void AddJoinNodes(IRestrictableStatement query, JoinSequence join, FromE
);
}

private static SqlString ProcessFromFragment(SqlString frag, JoinSequence join)
private static SqlString ProcessFromFragment(SqlString frag)
{
SqlString fromFragment = frag.Trim();
// The FROM fragment will probably begin with ', '. Remove this if it is present.
Expand All @@ -194,7 +188,12 @@ private static SqlString ProcessFromFragment(SqlString frag, JoinSequence join)
public static void ProcessDynamicFilterParameters(
SqlString sqlFragment,
IParameterContainer container,
HqlSqlWalker walker)
HqlSqlWalker walker)
{
ProcessDynamicFilterParameters(sqlFragment, container, walker, false);
}

private static void ProcessDynamicFilterParameters(SqlString sqlFragment, IParameterContainer container, HqlSqlWalker walker, bool fromFragment)
{
if ( walker.EnabledFilters.Count == 0
&& ( ! HasDynamicFilterParam( sqlFragment ) )
Expand All @@ -203,6 +202,14 @@ public static void ProcessDynamicFilterParameters(
return;
}

if (fromFragment)
{
sqlFragment = ProcessFromFragment(sqlFragment).Trim();
if (log.IsDebugEnabled())
{
log.Debug("Using FROM fragment [{0}]", sqlFragment);
}
}
container.Text = sqlFragment.ToString(); // dynamic-filters are processed altogether by Loader
}

Expand Down