Merge branch 'TimothyGillespie/adjustTypeMapping' into TimothyGillespie/automigrationTests

Author: TimothyGillespie

src/main/java/org/javawebstack/orm/SQLMapper.java

@@ -98,6 +98,8 @@ private static Object getValue(ResultSet rs, Class<?> sqlType, String tableName,
             }
             if (sqlType.equals(String.class))
                 return rs.getString(columnName);
+            if (sqlType.equals(Short.class))
+                return rs.getShort(columnName);
             if (sqlType.equals(Integer.class))
                 return rs.getInt(columnName);
             if (sqlType.equals(Boolean.class))

src/main/java/org/javawebstack/orm/SQLType.java

@@ -3,21 +3,27 @@
 import java.sql.Date;
 import java.sql.Timestamp;
 
+// The class passed as constructor determines
 public enum SQLType {
 
     // Divided by category and ordered by byte size (MySQL sizes)
     TINYINT(Boolean.class),
     SMALLINT(Short.class),
-    // Not in use for any java data type
-    //MEDIUMINT(),
+    MEDIUMINT(Integer.class),
     INT(Integer.class),
     BIGINT(Long.class),
 
     FLOAT(Float.class),
     DOUBLE(Double.class),
 
+    // No native char method except for a char stream
+    CHAR(String.class),
+
     VARCHAR(String.class),
+    TINYTEXT(String.class),
     TEXT(String.class),
+    MEDIUMTEXT(String.class),
+    LONGTEXT(String.class),
 
     DATE(Date.class),
     TIMESTAMP(Timestamp.class),

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

@@ -32,11 +32,14 @@ public Object mapToSQL(Object source, Class<?> type) {
         if (type.equals(float.class))
             return Float.valueOf((float) source);
         if (type.equals(char[].class))
-            return String.valueOf(source);
+            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);
+
         return source;
     }
 
@@ -63,14 +66,31 @@ public Object mapToJava(Object source, Class<?> type) {
             return ((Float) source).floatValue();
         if (type.equals(char[].class))
             return ((String) source).toCharArray();
+        if (type.equals(char.class)) {
+            String stringSource = (String) source;
+            if (stringSource.length() != 1)
+                return ' ';
+            else
+                return stringSource.charAt(0);
+        }
         return source;
     }
 
     public SQLType getType(Class<?> type, int size) {
         if (type.equals(String.class) || type.equals(char[].class))
-            return size > 65535 || size <= 1 ? SQLType.TEXT : SQLType.VARCHAR;
-        if (type.equals(UUID.class) || type.equals(char.class))
+            // Upper limit of 4294967295 exceeds the int boundaries
+            if (size > 16777215)
+                return SQLType.LONGTEXT;
+            if (size > 65535)
+                return SQLType.MEDIUMTEXT;
+            if (size > 1)
+                return SQLType.VARCHAR;
+            if (size == 0)
+                return SQLType.CHAR;
+        if (type.equals(UUID.class))
             return SQLType.VARCHAR;
+        if (type.equals(char.class))
+            return SQLType.CHAR;
         if (type.isEnum())
             return SQLType.ENUM;
         if (type.equals(boolean.class) || type.equals(Boolean.class) || type.equals(byte.class) || type.equals(Byte.class))
@@ -105,8 +125,6 @@ public String getTypeParameters(Class<?> type, int size) {
             return "36";
         if (type.equals(boolean.class) || type.equals(Boolean.class) || type.equals(char.class))
             return "1";
-        if (type.equals(Timestamp.class))
-            return "6";
         return null;
     }
 

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

@@ -8,11 +8,9 @@
 import org.javawebstack.orm.exception.ORMConfigurationException;
 import org.junit.jupiter.api.Test;
 
-import javax.swing.text.TabSet;
 import java.sql.Timestamp;
 import java.time.Instant;
 
-import static org.javawebstack.orm.test.shared.util.TimestampUtil.diffInNanoseconds;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class TypesTest extends ORMTestCase {
@@ -42,6 +40,8 @@ public void testFields() throws ORMConfigurationException {
         model.exampleBoolean = true;
 
         model.timestampTest  = timestamp;
+
+        model.exampleCharPrimitive = 'C';
         model.save();
 
         int id = model.id;
@@ -60,7 +60,12 @@ public void testFields() throws ORMConfigurationException {
         assertEquals(model.exampleDouble, 123456789.1234567890D);
         assertEquals(model.exampleLong, 999999999999999999L);
         assertEquals(model.exampleLongPrimitive, 999999999999999999L);
-        assertTrue(diffInNanoseconds(timestamp, model.timestampTest) < 1);
+
+
+        assertEquals(model.timestampTest.getTime() / 1000, timestamp.getTime() / 1000);
+
+        assertEquals(model.exampleCharPrimitive, 'C');
+
         model.exampleNull = "Text";
         model.save();
         model = Repo.get(ExampleModel.class).get(id);
@@ -108,6 +113,9 @@ public static class ExampleModel extends Model {
         @Column
         public Timestamp timestampTest;
 
+        @Column
+        public char exampleCharPrimitive;
+
         public enum Type {
             ADMIN, USER, GUEST
         }