Merge remote-tracking branch 'origin/master' into maintenance

Author: JanHolger

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

@@ -51,8 +51,6 @@ public Object mapToSQL(Object source, Class<?> type) {
             return String.valueOf((char[]) source);
         if (type.equals(UUID.class))
             return source.toString();
-        if (type.equals(Timestamp.class))
-            return ((Timestamp) source).toString();
         if (type.equals(char.class))
             return String.valueOf((char) source);
 

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

@@ -62,7 +62,7 @@ public void testFields() throws ORMConfigurationException {
         assertEquals(model.exampleLongPrimitive, 999999999999999999L);
 
 
-        assertEquals(model.timestampTest.getTime() / 1000, timestamp.getTime() / 1000);
+        assertEquals(timestamp.getTime() / 1000, model.timestampTest.getTime() / 1000);
 
         assertEquals(model.exampleCharPrimitive, 'C');