Skip to content

Commit bb1ad4a

Browse files
authored
Merge pull request #25 from JavaWebStack/TimothyGillespie/fixTimestampBug
Fix Timestamp Bug
2 parents cfb3beb + 285f64c commit bb1ad4a

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/main/java/org/javawebstack/orm/mapper/DefaultMapper.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@ public Object mapToSQL(Object source, Class<?> type) {
5151
return String.valueOf((char[]) source);
5252
if (type.equals(UUID.class))
5353
return source.toString();
54-
if (type.equals(Timestamp.class))
55-
return ((Timestamp) source).toString();
5654
if (type.equals(char.class))
5755
return String.valueOf((char) source);
5856

src/test/java/org/javawebstack/orm/test/TypesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void testFields() throws ORMConfigurationException {
6262
assertEquals(model.exampleLongPrimitive, 999999999999999999L);
6363

6464

65-
assertEquals(model.timestampTest.getTime() / 1000, timestamp.getTime() / 1000);
65+
assertEquals(timestamp.getTime() / 1000, model.timestampTest.getTime() / 1000);
6666

6767
assertEquals(model.exampleCharPrimitive, 'C');
6868

0 commit comments

Comments
 (0)