-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HHH-18033 Fix LimitHandler detect wrong statement end if sql contains…
… quoted semicolon
- Loading branch information
Showing
15 changed files
with
314 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
...munity-dialects/src/test/java/org/hibernate/community/dialect/IngresLimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.community.dialect; | ||
|
||
import org.hibernate.community.dialect.pagination.IngresLimitHandler; | ||
import org.hibernate.dialect.pagination.AbstractLimitHandler; | ||
import org.hibernate.orm.test.dialect.AbstractLimitHandlerTest; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public class IngresLimitHandlerTest extends AbstractLimitHandlerTest { | ||
|
||
@Override | ||
protected AbstractLimitHandler getLimitHandler() { | ||
return IngresLimitHandler.INSTANCE; | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
...ommunity-dialects/src/test/java/org/hibernate/community/dialect/RowsLimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.community.dialect; | ||
|
||
import org.hibernate.community.dialect.pagination.RowsLimitHandler; | ||
import org.hibernate.dialect.pagination.AbstractLimitHandler; | ||
import org.hibernate.orm.test.dialect.AbstractLimitHandlerTest; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public class RowsLimitHandlerTest extends AbstractLimitHandlerTest { | ||
|
||
@Override | ||
protected AbstractLimitHandler getLimitHandler() { | ||
return RowsLimitHandler.INSTANCE; | ||
} | ||
|
||
@Override | ||
protected String getLimitClause() { | ||
return " rows ?"; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.orm.test.dialect; | ||
|
||
import org.hibernate.dialect.pagination.LimitHandler; | ||
import org.hibernate.dialect.pagination.OffsetFetchLimitHandler; | ||
import org.hibernate.query.spi.Limit; | ||
import org.hibernate.query.spi.QueryOptions; | ||
import org.junit.jupiter.api.Test; | ||
|
||
import static org.hibernate.dialect.pagination.AbstractLimitHandler.hasFirstRow; | ||
import static org.hibernate.dialect.pagination.AbstractLimitHandler.hasMaxRows; | ||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public abstract class AbstractLimitHandlerTest { | ||
|
||
@Test | ||
public void testSqlWithSemicolonInsideQuotedString() { | ||
String sql = "select * from Person p where p.name like ';'"; | ||
String expected = "select * from Person p where p.name like ';'" + getLimitClause(); | ||
assertGenerateExpectedSql(expected, sql); | ||
|
||
sql = "select * from Person p where p.name like ';' "; | ||
expected = "select * from Person p where p.name like ';'" + getLimitClause() + " "; | ||
assertGenerateExpectedSql(expected, sql); | ||
} | ||
|
||
@Test | ||
public void testSqlWithSemicolonInsideQuotedStringAndEndsWithSemicolon() { | ||
String sql = "select * from Person p where p.name like ';';"; | ||
String expected = "select * from Person p where p.name like ';'" + getLimitClause() + ";"; | ||
assertGenerateExpectedSql(expected, sql); | ||
|
||
sql = "select * from Person p where p.name like ';' ; "; | ||
expected = "select * from Person p where p.name like ';'" + getLimitClause() + " ; "; | ||
assertGenerateExpectedSql(expected, sql); | ||
} | ||
|
||
protected void assertGenerateExpectedSql(String expected, String sql) { | ||
assertEquals(expected, getLimitHandler().processSql(sql, getLimit(), QueryOptions.NONE)); | ||
} | ||
|
||
protected abstract LimitHandler getLimitHandler(); | ||
|
||
protected Limit getLimit() { | ||
return new Limit(0, 10); | ||
} | ||
|
||
protected String getLimitClause() { | ||
LimitHandler handler = getLimitHandler(); | ||
if (handler instanceof OffsetFetchLimitHandler) { | ||
OffsetFetchLimitHandler oflh = (OffsetFetchLimitHandler) handler; | ||
Limit limit = getLimit(); | ||
if (hasFirstRow(limit) && hasMaxRows(limit)) { | ||
return " offset " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getFirstRow())) | ||
+ " rows fetch next " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getMaxRows())) + " rows only"; | ||
} | ||
else if (hasFirstRow(limit)) { | ||
return " offset " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getFirstRow())) + " rows"; | ||
} else { | ||
return " fetch first " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getMaxRows())) + " rows only"; | ||
} | ||
} | ||
return " limit ?"; | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.orm.test.dialect; | ||
|
||
import org.hibernate.dialect.pagination.AbstractLimitHandler; | ||
import org.hibernate.dialect.pagination.DB2LimitHandler; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public class DB2LimitHandlerTest extends AbstractLimitHandlerTest { | ||
|
||
@Override | ||
protected AbstractLimitHandler getLimitHandler() { | ||
return DB2LimitHandler.INSTANCE; | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DerbyLimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.orm.test.dialect; | ||
|
||
import org.hibernate.dialect.pagination.AbstractLimitHandler; | ||
import org.hibernate.dialect.pagination.DerbyLimitHandler; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public class DerbyLimitHandlerTest extends AbstractLimitHandlerTest { | ||
|
||
@Override | ||
protected AbstractLimitHandler getLimitHandler() { | ||
return DerbyLimitHandler.INSTANCE; | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/LimitLimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.orm.test.dialect; | ||
|
||
import org.hibernate.dialect.pagination.AbstractLimitHandler; | ||
import org.hibernate.dialect.pagination.LimitLimitHandler; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public class LimitLimitHandlerTest extends AbstractLimitHandlerTest { | ||
|
||
@Override | ||
protected AbstractLimitHandler getLimitHandler() { | ||
return LimitLimitHandler.INSTANCE; | ||
} | ||
} |
21 changes: 21 additions & 0 deletions
21
hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OffsetFetchLimitHandlerTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
* Hibernate, Relational Persistence for Idiomatic Java | ||
* | ||
* License: GNU Lesser General Public License (LGPL), version 2.1 or later | ||
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html | ||
*/ | ||
package org.hibernate.orm.test.dialect; | ||
|
||
import org.hibernate.dialect.pagination.AbstractLimitHandler; | ||
import org.hibernate.dialect.pagination.OffsetFetchLimitHandler; | ||
|
||
/** | ||
* @author Yanming Zhou | ||
*/ | ||
public class OffsetFetchLimitHandlerTest extends AbstractLimitHandlerTest { | ||
|
||
@Override | ||
protected AbstractLimitHandler getLimitHandler() { | ||
return OffsetFetchLimitHandler.INSTANCE; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.