From 71768443bcefc6056d881cd0aaa252af41bb6540 Mon Sep 17 00:00:00 2001 From: marcgiffing Date: Mon, 6 Mar 2017 18:14:40 +0100 Subject: [PATCH] HHH-11509 - Infomix limit handler support for offset --- .../java/org/hibernate/dialect/Informix10Dialect.java | 4 ++-- ...ormixLimitHandler.java => Informix10LimitHandler.java} | 8 +++++++- .../hibernate/dialect/InformixLimitHandlerTestCase.java | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) rename hibernate-core/src/main/java/org/hibernate/dialect/pagination/{InformixLimitHandler.java => Informix10LimitHandler.java} (81%) diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Informix10Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Informix10Dialect.java index 5df348796e..54fe89f94b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Informix10Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Informix10Dialect.java @@ -6,7 +6,7 @@ */ package org.hibernate.dialect; -import org.hibernate.dialect.pagination.InformixLimitHandler; +import org.hibernate.dialect.pagination.Informix10LimitHandler; import org.hibernate.dialect.pagination.LimitHandler; /** @@ -16,7 +16,7 @@ public class Informix10Dialect extends InformixDialect { @Override public LimitHandler getLimitHandler() { - return new InformixLimitHandler(); + return Informix10LimitHandler.INSTANCE; } } diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/InformixLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/Informix10LimitHandler.java similarity index 81% rename from hibernate-core/src/main/java/org/hibernate/dialect/pagination/InformixLimitHandler.java rename to hibernate-core/src/main/java/org/hibernate/dialect/pagination/Informix10LimitHandler.java index 10019e6756..7328a84260 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/InformixLimitHandler.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/Informix10LimitHandler.java @@ -10,7 +10,13 @@ import java.util.Locale; import org.hibernate.engine.spi.RowSelection; -public class InformixLimitHandler extends AbstractLimitHandler { +public class Informix10LimitHandler extends AbstractLimitHandler { + + public static Informix10LimitHandler INSTANCE = new Informix10LimitHandler(); + + private Informix10LimitHandler() { + // Disallow instantiation + } @Override public String processSql(String sql, RowSelection selection) { diff --git a/hibernate-core/src/test/java/org/hibernate/dialect/InformixLimitHandlerTestCase.java b/hibernate-core/src/test/java/org/hibernate/dialect/InformixLimitHandlerTestCase.java index 0ed1a3fcbb..2633fbe14a 100644 --- a/hibernate-core/src/test/java/org/hibernate/dialect/InformixLimitHandlerTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/dialect/InformixLimitHandlerTestCase.java @@ -10,20 +10,20 @@ import org.hibernate.engine.spi.RowSelection; import org.hibernate.testing.TestForIssue; import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase; import org.junit.Test; -import org.hibernate.dialect.pagination.InformixLimitHandler; +import org.hibernate.dialect.pagination.Informix10LimitHandler; import org.junit.Before; import static org.junit.Assert.assertEquals; public class InformixLimitHandlerTestCase extends BaseNonConfigCoreFunctionalTestCase { - private InformixLimitHandler informixLimitHandler; + private Informix10LimitHandler informixLimitHandler; private final String TEST_SQL = "SELECT field FROM table"; @Before public void setup() { - informixLimitHandler = new InformixLimitHandler(); + informixLimitHandler = Informix10LimitHandler.INSTANCE; } @Test