From 9eea63db805bb37ef01947b79810ae3d91c3fe0a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Mon, 2 Jul 2012 21:14:30 +0200 Subject: [PATCH] [#1253] Avoid JDBC escape syntax for date/time literals - Fixed Unit tests --- jOOQ/src/test/java/org/jooq/test/jOOQTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jOOQ/src/test/java/org/jooq/test/jOOQTest.java b/jOOQ/src/test/java/org/jooq/test/jOOQTest.java index afe64c9995..9c1c8d3a21 100644 --- a/jOOQ/src/test/java/org/jooq/test/jOOQTest.java +++ b/jOOQ/src/test/java/org/jooq/test/jOOQTest.java @@ -1349,7 +1349,7 @@ public class jOOQTest { q.addValue(FIELD_ID1, 10); q.addValue(FIELD_NAME1, "ABC"); q.addValue(FIELD_DATE1, new Date(0)); - assertEquals("insert into \"TABLE1\" (\"ID1\", \"NAME1\", \"DATE1\") values (10, 'ABC', {d '1970-01-01'})", r_refI().render(q)); + assertEquals("insert into \"TABLE1\" (\"ID1\", \"NAME1\", \"DATE1\") values (10, 'ABC', date '1970-01-01')", r_refI().render(q)); assertEquals("insert into \"TABLE1\" (\"ID1\", \"NAME1\", \"DATE1\") values (?, ?, ?)", r_ref().render(q)); assertEquals(q, create.insertInto(TABLE1, FIELD_ID1, FIELD_NAME1, FIELD_DATE1).values(10, "ABC", new Date(0))); assertEquals(q, create.insertInto(TABLE1).set(FIELD_ID1, 10).set(FIELD_NAME1, "ABC").set(FIELD_DATE1, new Date(0))); @@ -1556,7 +1556,7 @@ public class jOOQTest { .whenNotMatchedThenInsert(FIELD_ID1, FIELD_NAME1, FIELD_DATE1) .values(1, "name", new Date(0)); - assertEquals("merge into \"TABLE1\" using (select \"TABLE2\".\"ID2\" from \"TABLE2\") on ((\"TABLE2\".\"ID2\" = \"TABLE1\".\"ID1\" and \"TABLE1\".\"ID1\" = 1) or \"TABLE2\".\"ID2\" = 2) when matched then update set \"NAME1\" = 'name', \"DATE1\" = {d '1970-01-01'} when not matched then insert (\"ID1\", \"NAME1\", \"DATE1\") values (1, 'name', {d '1970-01-01'})", r_refI().render(q)); + assertEquals("merge into \"TABLE1\" using (select \"TABLE2\".\"ID2\" from \"TABLE2\") on ((\"TABLE2\".\"ID2\" = \"TABLE1\".\"ID1\" and \"TABLE1\".\"ID1\" = 1) or \"TABLE2\".\"ID2\" = 2) when matched then update set \"NAME1\" = 'name', \"DATE1\" = date '1970-01-01' when not matched then insert (\"ID1\", \"NAME1\", \"DATE1\") values (1, 'name', date '1970-01-01')", r_refI().render(q)); assertEquals("merge into \"TABLE1\" using (select \"TABLE2\".\"ID2\" from \"TABLE2\") on ((\"TABLE2\".\"ID2\" = \"TABLE1\".\"ID1\" and \"TABLE1\".\"ID1\" = ?) or \"TABLE2\".\"ID2\" = ?) when matched then update set \"NAME1\" = ?, \"DATE1\" = ? when not matched then insert (\"ID1\", \"NAME1\", \"DATE1\") values (?, ?, ?)", r_ref().render(q)); context.checking(new Expectations() {{ @@ -2255,9 +2255,9 @@ public class jOOQTest { assertEquals("123.0", r_refP.render(i3)); assertEquals("123.0", r_ref.render(i3)); - assertEquals("{d '1981-07-10'}", r_refI.render(i4)); - assertEquals("{d '1981-07-10'}", r_refP.render(i4)); - assertEquals("{d '1981-07-10'}", r_ref.render(i4)); + assertEquals("date '1981-07-10'", r_refI.render(i4)); + assertEquals("date '1981-07-10'", r_refP.render(i4)); + assertEquals("date '1981-07-10'", r_ref.render(i4)); } @Test