Skip to content

Commit 726daa2

Browse files
authored
Merge pull request #29 from Spatio-Temporal-Lab/fix_timestamp
try fix timestamp
2 parents 8621133 + d620731 commit 726daa2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

cupid-db-core/src/main/java/org/urbcomp/cupid/db/metadata/CalciteHelper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public static Connection createConnection() throws SQLException {
4949
final Properties p = new Properties();
5050
p.put(CalciteConnectionProperty.CASE_SENSITIVE.camelName(), "false");
5151
p.put(CalciteConnectionProperty.MODEL.camelName(), "inline:" + modelJson());
52+
p.put(CalciteConnectionProperty.TIME_ZONE.camelName(), "UTC");
5253
return DriverManager.getConnection("jdbc:calcite:fun=spatial", p);
5354
}
5455
}

cupid-db-core/src/test/scala/org/urbcomp/cupid/db/TrajectoryFunctionTest.scala

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,15 +162,17 @@ class TrajectoryFunctionTest extends AbstractCalciteFunctionTest {
162162
)
163163
resultSet1.next()
164164
// FIXME timezone
165-
// assertEquals("2018-10-09 07:30:21.0", resultSet1.getObject(1).toString)
166-
// assertEquals("2018-10-09 07:30:27.0", resultSet1.getObject(2).toString)
165+
assertEquals("2018-10-09 07:30:21.0", resultSet1.getObject(1).toString)
166+
assertEquals("2018-10-09 07:30:21.0", resultSet1.getObject("startTime").toString)
167+
assertEquals("2018-10-09 07:30:27.0", resultSet1.getObject(2).toString)
167168
assertEquals(
168169
"[POINT (108.99549 34.26714), POINT (108.9955 34.26707), POINT (108.99549 34.26704)]",
169170
resultSet1.getObject(3).toString
170171
)
171172
resultSet1.next()
172-
// assertEquals("2018-10-09 07:32:51.0", resultSet1.getObject(1).toString)
173-
// assertEquals("2018-10-09 07:32:57.0", resultSet1.getObject(2).toString)
173+
// FIXME timezone
174+
assertEquals("2018-10-09 07:32:51.0", resultSet1.getObject(1).toString)
175+
assertEquals("2018-10-09 07:32:57.0", resultSet1.getObject(2).toString)
174176
assertEquals(
175177
"[POINT (108.99652 34.25826), POINT (108.99647 34.25821), POINT (108.99639 34.25818)]",
176178
resultSet1.getObject(3).toString

0 commit comments

Comments
 (0)