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

Author: JanHolger

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

@@ -1,13 +1,12 @@
 package org.javawebstack.orm;
 
 import org.javawebstack.orm.exception.ORMQueryException;
+import org.javawebstack.orm.mapper.DefaultMapper;
 import org.javawebstack.orm.mapper.TypeMapper;
 
 import java.lang.reflect.InvocationTargetException;
-import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -90,30 +89,10 @@ private static Object getValue(ResultSet rs, Class<?> sqlType, String tableName,
             } catch (SQLException ex) {
                 return null;
             }
-            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))
-                return rs.getBoolean(columnName);
-            if (sqlType.equals(Long.class))
-                return rs.getLong(columnName);
-            if (sqlType.equals(Double.class))
-                return rs.getDouble(columnName);
-            if (sqlType.equals(Float.class))
-                return rs.getFloat(columnName);
-            if (sqlType.equals(Timestamp.class))
-                return rs.getTimestamp(columnName);
-            if (sqlType.equals(Date.class))
-                return rs.getDate(columnName);
-            if (sqlType.equals(byte[].class))
-                return rs.getBytes(columnName);
+            return rs.getObject(columnName, DefaultMapper.TYPE_MAPPING);
         } catch (SQLException e) {
             throw new ORMQueryException(e);
         }
-        return null;
     }
 
     private static <T extends Model> void setValue(Repo<T> repo, String fieldName, T entry, Object value) {

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

@@ -256,7 +256,7 @@ public Object getDefault(String fieldName) {
 
     public boolean isNotNull(String fieldName) {
         if (idField.equals(fieldName))
-            return false;
+            return true;
         return false;
     }
 

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

@@ -5,6 +5,8 @@
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -25,6 +27,21 @@ public class DefaultMapper implements TypeMapper {
     private static final long MAX_SIZE_MEDIUMTEXT = (long) Math.floor((16777215 - BYTES_OVERHEAD_MEDIUMTEXT) / 4);
     private static final long MAX_SIZE_LONGTEXT = (long) Math.floor((4294967295L - BYTES_OVERHEAD_LONGTEXT) / 4);
 
+    public static final Map<String, Class<?>> TYPE_MAPPING = new HashMap<String, Class<?>>(){{
+        put("FLOAT", Float.class);
+        put("DOUBLE", Double.class);
+        put("INT", Integer.class);
+        put("BIGINT", Long.class);
+        put("VARCHAR", String.class);
+        put("TEXT", String.class);
+        put("SHORTTEXT", String.class);
+        put("LONGTEXT", String.class);
+        put("TIMESTAMP", Timestamp.class);
+        put("DATE", Date.class);
+        put("VARBINARY", byte[].class);
+        put("CHARARRAY", char[].class);
+        put("TINYINT", Short.class);
+    }};
 
     public Object mapToSQL(Object source, Class<?> type) {
         if (source == null)

src/main/java/org/javawebstack/orm/query/QueryGroup.java

@@ -48,6 +48,10 @@ public QueryGroup<T> or(Function<QueryGroup<T>, QueryGroup<T>> group) {
     }
 
     public QueryGroup<T> where(Object left, String condition, Object right) {
+        if(condition.equalsIgnoreCase("=") && right == null)
+            return whereNull(left);
+        if(condition.equalsIgnoreCase("!=") && right == null)
+            return whereNotNull(left);
         if (queryElements.size() > 0)
             queryElements.add(QueryConjunction.AND);
         queryElements.add(new QueryCondition(left instanceof String ? new QueryColumn((String) left) : left, condition, right));
@@ -107,6 +111,10 @@ public QueryGroup<T> greaterThan(Object left, Object right) {
     }
 
     public QueryGroup<T> orWhere(Object left, String condition, Object right) {
+        if(condition.equalsIgnoreCase("=") && right == null)
+            return orIsNull(left);
+        if(condition.equalsIgnoreCase("!=") && right == null)
+            return orNotNull(left);
         if (queryElements.size() > 0)
             queryElements.add(QueryConjunction.OR);
         queryElements.add(new QueryCondition(left instanceof String ? new QueryColumn((String) left) : left, condition, right));