From f958a95d7f404d213a5e318a42eaf12452107dea Mon Sep 17 00:00:00 2001 From: tpuica <15786088+tpuica@users.noreply.github.com> Date: Tue, 25 Jul 2017 11:20:20 +0200 Subject: [PATCH 1/3] Fixed NEXTVAL Operator for MS SQLServer (starting with 2012) --- .../src/main/java/com/querydsl/sql/SQLServer2012Templates.java | 1 + 1 file changed, 1 insertion(+) diff --git a/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java index fbb88d079..012163e7f 100644 --- a/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java +++ b/querydsl-sql/src/main/java/com/querydsl/sql/SQLServer2012Templates.java @@ -64,6 +64,7 @@ public class SQLServer2012Templates extends SQLServerTemplates { protected SQLServer2012Templates(Set keywords, char escape, boolean quote) { super(keywords, escape, quote); + add(SQLOps.NEXTVAL, "next value for {0s}"); } @Override From 26158ddac6533cfdae66c299886bbbeafc2286c8 Mon Sep 17 00:00:00 2001 From: tpuica <15786088+tpuica@users.noreply.github.com> Date: Tue, 25 Jul 2017 17:13:52 +0200 Subject: [PATCH 2/3] adapt nextVal() test to the recently modified NEXTVAL operator pattern --- .../java/com/querydsl/sql/SQLServer2012TemplatesTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java index 76f75e778..8f0a2f09d 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java @@ -105,8 +105,8 @@ public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest { @Test public void nextVal() { - Operation nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq")); - assertEquals("myseq.nextval", new SQLSerializer(new Configuration(new SQLServerTemplates())).handle(nextval).toString()); + Operation nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq")); + assertSerialized(nextval, "next value for myseq"); } } From 125388987e1d109dc8696a9682cd11354abde24c Mon Sep 17 00:00:00 2001 From: tpuica <15786088+tpuica@users.noreply.github.com> Date: Tue, 25 Jul 2017 17:31:40 +0200 Subject: [PATCH 3/3] fix Travis CI build (line has trailing spaces?) --- .../test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java index 8f0a2f09d..694e3b00b 100644 --- a/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java +++ b/querydsl-sql/src/test/java/com/querydsl/sql/SQLServer2012TemplatesTest.java @@ -105,7 +105,7 @@ public class SQLServer2012TemplatesTest extends AbstractSQLTemplatesTest { @Test public void nextVal() { - Operation nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq")); + Operation nextval = ExpressionUtils.operation(String.class, SQLOps.NEXTVAL, ConstantImpl.create("myseq")); assertSerialized(nextval, "next value for myseq"); }