Skip to content
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

Jump to bottom

HHH-11816 - JoinProcessor doesn't handle certain table names correctly #2008

Closed
wants to merge 1 commit into from
Closed

HHH-11816 - JoinProcessor doesn't handle certain table names correctly #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
68 changes: 42 additions & 26 deletions hibernate-core/src/main/java/org/hibernate/hql/internal/ast/util/JoinProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
import org.hibernate.type.Type;

/**
* Performs the post-processing of the join information gathered during semantic analysis.
* The join generating classes are complex, this encapsulates some of the JoinSequence-related
* code.
* Performs the post-processing of the join information gathered during semantic analysis. The join generating classes
* are complex, this encapsulates some of the JoinSequence-related code.
*
* @author Joshua Davis
*/
public class JoinProcessor implements SqlTokenTypes {

private static final CoreMessageLogger LOG = CoreLogging.messageLogger( JoinProcessor.class );

private final HqlSqlWalker walker;
Expand All @@ -63,9 +63,7 @@ public JoinProcessor(HqlSqlWalker walker) {
* Translates an AST join type (i.e., the token type) into a JoinFragment.XXX join type.
*
* @param astJoinType The AST join type (from HqlSqlTokenTypes or SqlTokenTypes)
*
* @return a JoinFragment.XXX join type.
*
* @see JoinFragment
* @see SqlTokenTypes
*/
Expand Down Expand Up @@ -98,7 +96,7 @@ public void processJoins(QueryNode query) {
// found it easiest to simply reorder the FromElements here into ascending order
// in terms of injecting them into the resulting sql ast in orders relative to those
// expected by the old parser; this is definitely another of those "only needed
// for regression purposes". The SyntheticAndFactory, then, simply injects them as it
// for regression purposes". The SyntheticAndFactory, then, simply injects them as it
// encounters them.
fromElements = new ArrayList();
ListIterator liter = fromClause.getFromElements().listIterator( fromClause.getFromElements().size() );
Expand All @@ -112,13 +110,14 @@ public void processJoins(QueryNode query) {
while ( liter.hasNext() ) {
FromElement fromElement = liter.next();

// We found an implied from element that is used in the WITH clause of another from element, so it need to become part of it's join sequence
// We found an implied from element that is used in the WITH clause of another from element, so it need
// to become part of it's join sequence
if ( fromElement instanceof ImpliedFromElement
&& fromElement.getOrigin().getWithClauseFragment() != null
&& fromElement.getOrigin().getWithClauseFragment().contains( fromElement.getTableAlias() ) ) {
fromElement.getOrigin().getJoinSequence().addJoin( (ImpliedFromElement) fromElement );
// This from element will be rendered as part of the origins join sequence
fromElement.setText("");
fromElement.setText( "" );
}
else {
fromElements.add( fromElement );
Expand All @@ -133,6 +132,7 @@ public void processJoins(QueryNode query) {
JoinSequence join = fromElement.getJoinSequence();
join.setSelector(
new JoinSequence.Selector() {

public boolean includeSubclasses(String alias) {
// The uber-rule here is that we need to include subclass joins if
// the FromElement is in any way dereferenced by a property from
Expand All @@ -144,17 +144,15 @@ public boolean includeSubclasses(String alias) {
LOG.tracev(
"Forcing inclusion of extra joins [alias={0}, containsTableAlias={1}]",
alias,
containsTableAlias
);
containsTableAlias );
return true;
}
boolean shallowQuery = walker.isShallowQuery();
boolean includeSubclasses = fromElement.isIncludeSubclasses();
boolean subQuery = fromClause.isSubQuery();
return includeSubclasses && containsTableAlias && !subQuery && !shallowQuery;
}
}
);
} );
addJoinNodes( query, join, fromElement );
}

Expand All @@ -164,8 +162,7 @@ private void addJoinNodes(QueryNode query, JoinSequence join, FromElement fromEl
JoinFragment joinFragment = join.toJoinFragment(
walker.getEnabledFilters(),
fromElement.useFromFragment() || fromElement.isDereferencedBySuperclassOrSubclassProperty(),
fromElement.getWithClauseFragment()
);
fromElement.getWithClauseFragment() );

String frag = joinFragment.toFromFragmentString();
String whereFrag = joinFragment.toWhereFragmentString();
Expand All @@ -182,28 +179,29 @@ private void addJoinNodes(QueryNode query, JoinSequence join, FromElement fromEl
// If there is a FROM fragment and the FROM element is an explicit, then add the from part.
if ( fromElement.useFromFragment() ||
( fromElement.getFromClause().isSubQuery()
&& fromElement.isDereferencedBySuperclassOrSubclassProperty() ) /*&& StringHelper.isNotEmpty( frag )*/ ) {
&& fromElement.isDereferencedBySuperclassOrSubclassProperty() ) /*
* && StringHelper.isNotEmpty(
* frag )
*/ ) {
String fromFragment = processFromFragment( frag, join ).trim();
LOG.debugf( "Using FROM fragment [%s]", fromFragment );
processDynamicFilterParameters(
fromFragment,
fromElement,
walker
);
walker );
}

syntheticAndFactory.addWhereFragment(
joinFragment,
whereFrag,
query,
fromElement,
walker
);
walker );
}

private String processFromFragment(String frag, JoinSequence join) {
String fromFragment = frag.trim();
// The FROM fragment will probably begin with ', '. Remove this if it is present.
// The FROM fragment will probably begin with ', '. Remove this if it is present.
if ( fromFragment.startsWith( ", " ) ) {
fromFragment = fromFragment.substring( 2 );
}
Expand Down Expand Up @@ -237,15 +235,12 @@ public static void processDynamicFilterParameters(
",",
ArrayHelper.fillArray(
"?",
type.getColumnSpan( walker.getSessionFactoryHelper().getFactory() )
)
);
type.getColumnSpan( walker.getSessionFactoryHelper().getFactory() ) ) );
final String bindFragment;
if ( value != null && Collection.class.isInstance( value ) ) {
bindFragment = StringHelper.join(
",",
ArrayHelper.fillArray( typeBindFragment, ( (Collection) value ).size() )
);
ArrayHelper.fillArray( typeBindFragment, ( (Collection) value ).size() ) );
}
else {
bindFragment = typeBindFragment;
Expand All @@ -262,7 +257,28 @@ public static void processDynamicFilterParameters(
}

private static boolean hasDynamicFilterParam(String sqlFragment) {
return !sqlFragment.contains( ParserHelper.HQL_VARIABLE_PREFIX );
// Assert that the variable prefix is exactly one character. If this changes the code below must be adapted
assert ParserHelper.HQL_VARIABLE_PREFIX.length() == 1;
final char hqlVariablePrefixChar = ParserHelper.HQL_VARIABLE_PREFIX.charAt( 0 );

boolean quoted = false;
char lastChar = '\0';
for ( int i = 0; i < sqlFragment.length(); i++ ) {
char c = sqlFragment.charAt( i );
if ( c == '"' ) {
quoted = !quoted;
}
else if ( c == hqlVariablePrefixChar ) {
if ( !quoted ) {
if ( Character.isWhitespace( lastChar ) || i == 0 ) {
return false;
}
}
}

lastChar = c;
}
return true;
}

private static boolean hasCollectionFilterParam(String sqlFragment) {
Expand Down