Skip to content

Commit b3b3829

Browse files
Fix Timestamp bug
1 parent cfb3beb commit b3b3829

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import org.junit.jupiter.api.Test;
1010

1111
import java.sql.Timestamp;
12+
import java.time.Clock;
1213
import java.time.Instant;
1314

1415
import static org.junit.jupiter.api.Assertions.*;
@@ -22,7 +23,7 @@ public void testFields() throws ORMConfigurationException {
2223
ORM.register(ExampleModel.class, sql(), config);
2324
ORM.autoMigrate(true);
2425

25-
Timestamp timestamp = Timestamp.from(Instant.now());
26+
Timestamp timestamp = Timestamp.from(Instant.now(Clock.systemDefaultZone()));
2627
ExampleModel model = new ExampleModel();
2728
model.exampleString = "Hello ;)";
2829
model.exampleEnum = ExampleModel.Type.USER;
@@ -62,7 +63,7 @@ public void testFields() throws ORMConfigurationException {
6263
assertEquals(model.exampleLongPrimitive, 999999999999999999L);
6364

6465

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

6768
assertEquals(model.exampleCharPrimitive, 'C');
6869

0 commit comments

Comments
 (0)