From 423ecdefab2a42bb6a793a3e2d0d55c52f653232 Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Tue, 23 Sep 2014 13:48:23 +0200 Subject: [PATCH] [#3648] Adapted unit tests --- jOOQ/src/test/java/org/jooq/test/BasicTest.java | 10 +++++----- jOOQ/src/test/java/org/jooq/test/DataTypeTest.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jOOQ/src/test/java/org/jooq/test/BasicTest.java b/jOOQ/src/test/java/org/jooq/test/BasicTest.java index 65dca09ed4..de55fca7f0 100644 --- a/jOOQ/src/test/java/org/jooq/test/BasicTest.java +++ b/jOOQ/src/test/java/org/jooq/test/BasicTest.java @@ -1535,7 +1535,7 @@ public class BasicTest extends AbstractTest { 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', date '" + zeroDate() + "')", r_refI().render(q)); + assertEquals("insert into `TABLE1` (`ID1`, `NAME1`, `DATE1`) values (10, 'ABC', {d '" + zeroDate() + "'})", 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))); @@ -1742,7 +1742,7 @@ public class BasicTest extends AbstractTest { .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 `TABLE1`.`NAME1` = 'name', `TABLE1`.`DATE1` = date '" + zeroDate() + "' when not matched then insert (`ID1`, `NAME1`, `DATE1`) values (1, 'name', date '" + zeroDate() + "')", 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 `TABLE1`.`NAME1` = 'name', `TABLE1`.`DATE1` = {d '" + zeroDate() + "'} when not matched then insert (`ID1`, `NAME1`, `DATE1`) values (1, 'name', {d '" + zeroDate() + "'})", 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 `TABLE1`.`NAME1` = ?, `TABLE1`.`DATE1` = ? when not matched then insert (`ID1`, `NAME1`, `DATE1`) values (?, ?, ?)", r_ref().render(q)); context.checking(new Expectations() {{ @@ -2449,9 +2449,9 @@ public class BasicTest extends AbstractTest { assertEquals("123.0", r_refP.render(i3)); assertEquals("123.0", r_ref.render(i3)); - 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)); + 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)); } @Test diff --git a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java index bcfcdb5fca..32d62ab385 100644 --- a/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java +++ b/jOOQ/src/test/java/org/jooq/test/DataTypeTest.java @@ -147,7 +147,7 @@ public class DataTypeTest extends AbstractTest { { Condition object_date = object.eq(Timestamp.valueOf("2012-12-21 15:30:00.0")); - assertEquals("`ANY` = timestamp '2012-12-21 15:30:00.0'", r_refI().render(object_date)); + assertEquals("`ANY` = {ts '2012-12-21 15:30:00.0'}", r_refI().render(object_date)); context.checking(new Expectations() {{ oneOf(statement).setTimestamp(1, Timestamp.valueOf("2012-12-21 15:30:00.0")); }});