Skip to content

Commit 00a1812

Browse files
committed
Fix getting / setting sql timestamps.
1 parent 6543df1 commit 00a1812

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

java-core/src/net/compsoc/ox/database/impl/sql/events/SQLEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public SQLEvent(SQLEvents events, ResultSet currentSet)
4141
this.description = currentSet.getString("description");
4242
this.facebookEventID = currentSet.getString("facebook_event_id");
4343
this.venueKey = currentSet.getString("venue");
44-
this.startTimestamp = currentSet.getDate("start_ts");
45-
this.endTimestamp = currentSet.getDate("end_ts");
44+
this.startTimestamp = new Date(currentSet.getTimestamp("start_ts").getTime());
45+
this.endTimestamp = new Date(currentSet.getTimestamp("end_ts").getTime());
4646
}
4747

4848
@Override

java-core/src/net/compsoc/ox/database/impl/sql/events/SQLEvents.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.sql.PreparedStatement;
55
import java.sql.ResultSet;
66
import java.sql.SQLException;
7-
import java.sql.Time;
7+
import java.sql.Timestamp;
88
import java.util.Date;
99
import java.util.LinkedList;
1010
import java.util.List;
@@ -122,8 +122,8 @@ public synchronized Event<Integer, String> addEvent(int year, Term term, String
122122
insertEvent.setString(5, description);
123123
insertEvent.setString(6, facebookEventId);
124124
insertEvent.setString(7, venue.key());
125-
insertEvent.setDate(8, new java.sql.Date(start.getTime()));
126-
insertEvent.setDate(9, new java.sql.Date(end.getTime()));
125+
insertEvent.setTimestamp(8, new Timestamp(start.getTime()));
126+
insertEvent.setTimestamp(9, new Timestamp(end.getTime()));
127127

128128
if (insertEvent.executeUpdate() == 0)
129129
throw new DatabaseOperationException("Unable to create event, zero rows affected");
@@ -157,8 +157,8 @@ public synchronized Event<Integer, String> updateEvent(Integer event, int year,
157157
updateEvent.setString(5, description);
158158
updateEvent.setString(6, facebookEventId);
159159
updateEvent.setString(7, venue.key());
160-
updateEvent.setDate(8, new java.sql.Date(start.getTime()));
161-
updateEvent.setDate(9, new java.sql.Date(end.getTime()));
160+
updateEvent.setTimestamp(8, new Timestamp(start.getTime()));
161+
updateEvent.setTimestamp(9, new Timestamp(end.getTime()));
162162
updateEvent.setInt(10, event.intValue());
163163

164164
if (updateEvent.executeUpdate() == 0)

0 commit comments

Comments
 (0)