Repository: cayenne Updated Branches: refs/heads/master a043a19d2 -> 35cdf4e99
CAY-2481 Methods to return Object[] after SQLTemplate and SQLExec perform fix tests on postgres Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/35cdf4e9 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/35cdf4e9 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/35cdf4e9 Branch: refs/heads/master Commit: 35cdf4e994bf6731b860eca4d168d30f6c208ad2 Parents: a043a19 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Oct 11 15:17:15 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Oct 11 15:17:15 2018 +0300 ---------------------------------------------------------------------- .../src/test/java/org/apache/cayenne/query/SQLSelectIT.java | 5 +++-- .../src/test/java/org/apache/cayenne/query/SQLTemplateIT.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/35cdf4e9/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java index 6193920..7774c8c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLSelectIT.java @@ -35,6 +35,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import java.sql.Date; import java.sql.SQLException; import java.sql.Types; import java.time.LocalDateTime; @@ -140,8 +141,8 @@ public class SQLSelectIT extends ServerCase { @Test public void testObjectArrayWithCustomType() throws SQLException { - tArtistCt.insert(1, "Test", "2018-10-10"); - tArtistCt.insert(2, "Test1", "2017-09-09"); + tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis())); + tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis())); List<Object[]> results = SQLSelect.scalarQuery("SELECT * FROM ARTIST_CT", Integer.class, String.class, LocalDateTime.class).select(context); http://git-wip-us.apache.org/repos/asf/cayenne/blob/35cdf4e9/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java index ad2fa04..9931f8c 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SQLTemplateIT.java @@ -37,6 +37,7 @@ import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Before; import org.junit.Test; +import java.sql.Date; import java.sql.SQLException; import java.time.LocalDateTime; import java.util.List; @@ -163,8 +164,8 @@ public class SQLTemplateIT extends ServerCase { @Test public void testObjectArrayReturnWithCustomType() throws SQLException { DataMap testDataMap = context.getEntityResolver().getDataMap("testmap"); - tArtistCt.insert(1, "Test", "2018-10-10"); - tArtistCt.insert(2, "Test1", "2017-09-09"); + tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis())); + tArtistCt.insert(2, "Test1", new Date(System.currentTimeMillis())); SQLTemplate q5 = new SQLTemplate(testDataMap, "SELECT * FROM ARTIST_CT", true) .resultColumnsTypes(Integer.class, String.class, LocalDateTime.class); List dates = context.performQuery(q5); @@ -177,7 +178,7 @@ public class SQLTemplateIT extends ServerCase { @Test public void testSingleObjectReturn() throws SQLException { DataMap testDataMap = context.getEntityResolver().getDataMap("testmap"); - tArtistCt.insert(1, "Test", "2018-10-10"); + tArtistCt.insert(1, "Test", new Date(System.currentTimeMillis())); SQLTemplate q5 = new SQLTemplate(testDataMap, "SELECT ARTIST_NAME FROM ARTIST_CT", true) .resultColumnsTypes(String.class); List dates = context.performQuery(q5);
