HHH-18033 Fix AbstractLimitHandler detect wrong statement end if sql …

…contains quoted semicolon

hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java

@@ -33,10 +33,10 @@ public abstract class AbstractLimitHandler implements LimitHandler {
 			compile( "^\\s*select(\\s+(distinct|all))?\\b", CASE_INSENSITIVE );
 
 	private static final Pattern END_PATTERN =
-			compile("\\s*(;|$)", CASE_INSENSITIVE);
+			compile("\\s*;?$", CASE_INSENSITIVE);
 
 	private static final Pattern FOR_UPDATE_PATTERN =
-			compile("\\s+for\\s+update\\b|\\s*(;|$)", CASE_INSENSITIVE);
+			compile("\\s+for\\s+update\\b|\\s*;?$", CASE_INSENSITIVE);
 
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java

@@ -0,0 +1,40 @@
+/*
+ * 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.query.spi.Limit;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author Yanming Zhou
+ */
+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 ';' fetch first ? rows only";
+		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 ';' fetch first ? rows only;";
+		assertGenerateExpectedSql(expected, sql);
+	}
+
+	protected void assertGenerateExpectedSql(String expected, String sql) {
+		assertEquals(expected, getLimitHandler().processSql(sql, new Limit(0, 10)));
+	}
+
+	protected abstract AbstractLimitHandler getLimitHandler();
+
+}

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/DB2LimitHandlerTest.java

@@ -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.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;
+	}
+
+}

hibernate-core/src/test/java/org/hibernate/orm/test/dialect/OffsetFetchLimitHandlerTest.java

@@ -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.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;
+	}
+
+}