diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java index 9b132c032..24ae4c68b 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/SQLServer2012Templates.java @@ -27,8 +27,6 @@ public class SQLServer2012Templates extends SQLServerTemplates { private String limitOffsetTemplate = "\noffset {1} rows fetch next {0} rows only"; - private String limitTemplate = "\nfetch first {0} rows only"; - private String offsetTemplate = "\noffset {0} rows"; public static Builder builder() { @@ -67,7 +65,7 @@ public class SQLServer2012Templates extends SQLServerTemplates { if (mod.getLimit() == null) { context.handle(offsetTemplate, mod.getOffset()); } else if (mod.getOffset() == null) { - context.handle(limitTemplate, mod.getLimit()); + context.handle(limitOffsetTemplate, mod.getLimit(), 0); } else { context.handle(limitOffsetTemplate, mod.getLimit(), mod.getOffset()); } diff --git a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java index 7df247e0c..249ab311e 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/sql/SQLServer2012TemplatesTest.java @@ -64,7 +64,7 @@ public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest{ public void Limit() { query.from(survey1).limit(5); query.getMetadata().addProjection(survey1.id); - assertEquals("select survey1.ID from SURVEY survey1 fetch first ? rows only", query.toString()); + assertEquals("select survey1.ID from SURVEY survey1 offset ? rows fetch next ? rows only", query.toString()); } @Test