Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-10736 - Fix regression introduced for windows line separator parsing.

This commit is contained in:
Chris Cranford 2016-05-19 11:25:27 -05:00
parent 1223683192
commit 0a92e384bd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hibernate-core/src/main/java/org/hibernate/dialect/pagination/SQLServer2005LimitHandler.java
View File

@ -144,6 +144,7 @@ public class SQLServer2005LimitHandler extends AbstractLimitHandler {
* @return List of aliases separated with comas or {@literal *}. * @return List of aliases separated with comas or {@literal *}.
*/ */
protected String fillAliasInSelectClause(StringBuilder sb) { protected String fillAliasInSelectClause(StringBuilder sb) {
final String separator = System.lineSeparator();
final List<String> aliases = new LinkedList<String>(); final List<String> aliases = new LinkedList<String>();
final int startPos = shallowIndexOfPattern( sb, SELECT_PATTERN, 0 ); final int startPos = shallowIndexOfPattern( sb, SELECT_PATTERN, 0 );
int endPos = shallowIndexOfPattern( sb, FROM_PATTERN, startPos ); int endPos = shallowIndexOfPattern( sb, FROM_PATTERN, startPos );
@ -191,9 +192,9 @@ public class SQLServer2005LimitHandler extends AbstractLimitHandler {
String alias = getAlias( expression ); String alias = getAlias( expression );
if ( alias == null ) { if ( alias == null ) {
// Inserting alias. It is unlikely that we would have to add alias, but just in case. // Inserting alias. It is unlikely that we would have to add alias, but just in case.
endPos = shallowIndexOfPattern( sb, Pattern.compile("(\\s+" + FROM + ")", Pattern.CASE_INSENSITIVE), startPos );
alias = StringHelper.generateAlias( "page", unique ); alias = StringHelper.generateAlias( "page", unique );
sb.insert( endPos, " as " + alias ); final boolean endWithSeparator = sb.substring( endPos - separator.length() ).startsWith( separator );
sb.insert( endPos - ( endWithSeparator ? 2 : 1 ), " as " + alias );
} }
aliases.add( alias ); aliases.add( alias );
} }
@ -208,7 +209,7 @@ public class SQLServer2005LimitHandler extends AbstractLimitHandler {
* @return {@code true} when expression selects multiple columns, {@code false} otherwise. * @return {@code true} when expression selects multiple columns, {@code false} otherwise.
*/ */
private boolean selectsMultipleColumns(String expression) { private boolean selectsMultipleColumns(String expression) {
final String lastExpr = expression.trim().replaceFirst( "(?i)(.)*\\s", "" ); final String lastExpr = expression.trim().replaceFirst( "(?i)(.)*\\s", "" ).trim();
return "*".equals( lastExpr ) || lastExpr.endsWith( ".*" ); return "*".equals( lastExpr ) || lastExpr.endsWith( ".*" );
} }