Added a way to provide both field names for relations

Author: JanHolger

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

@@ -6,6 +6,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -165,26 +166,40 @@ public <T extends Model> Query<T> belongsTo(Class<T> parent) {
     }
 
     public <T extends Model> Query<T> belongsTo(Class<T> parent, String fieldName) {
+        return belongsTo(parent, fieldName, Repo.get(parent).getInfo().getIdField());
+    }
+
+    public <T extends Model> Query<T> belongsTo(Class<T> parent, String fieldName, String otherFieldName) {
         try {
             Object id = Repo.get(getClass()).getInfo().getField(fieldName).get(this);
-            return Repo.get(parent).whereId(id);
+            return Repo.get(parent).where(otherFieldName, id);
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
         }
     }
 
+    public <T extends Model> void assignTo(T value) {
+        if(value == null)
+            throw new InvalidParameterException("You need to specify a parent type if the value is null");
+        assignTo((Class<T>) value.getClass(), value);
+    }
+
     public <T extends Model> void assignTo(Class<T> parent, T value) {
         assignTo(parent, value, Repo.get(parent).getInfo().getRelationField());
     }
 
     public <T extends Model> void assignTo(Class<T> parent, T value, String fieldName) {
+        assignTo(parent, value, fieldName, Repo.get(parent).getInfo().getIdField());
+    }
+
+    public <T extends Model> void assignTo(Class<T> parent, T value, String fieldName, String otherFieldName) {
         try {
             Field f = Repo.get(getClass()).getInfo().getField(fieldName);
             if (value == null) {
                 f.set(this, null);
             } else {
                 Repo<T> repo = Repo.get(parent);
-                Object id = repo.getInfo().getField(repo.getInfo().getIdField()).get(value);
+                Object id = repo.getInfo().getField(otherFieldName).get(value);
                 f.set(this, id);
             }
         } catch (IllegalAccessException e) {
@@ -197,9 +212,13 @@ public <T extends Model> Query<T> hasMany(Class<T> child) {
     }
 
     public <T extends Model> Query<T> hasMany(Class<T> child, String fieldName) {
+        return hasMany(child, fieldName, Repo.get(getClass()).getInfo().getIdField());
+    }
+
+    public <T extends Model> Query<T> hasMany(Class<T> child, String fieldName, String ownFieldName) {
         try {
             Repo<?> ownRepo = Repo.get(getClass());
-            Object id = ownRepo.getInfo().getField(ownRepo.getInfo().getIdField()).get(this);
+            Object id = ownRepo.getInfo().getField(ownFieldName).get(this);
             return Repo.get(child).where(fieldName, id);
         } catch (IllegalAccessException e) {
             throw new RuntimeException(e);
@@ -234,17 +253,4 @@ public <T extends Model, P extends Model> Query<T> belongsToMany(Class<T> other,
         }
     }
 
-    public void setMorph(String name, Class<? extends Model> type, Object id) {
-        TableInfo info = Repo.get(getClass()).getInfo();
-        try {
-            info.getField(name + "Id").set(this, id);
-            info.getField(name + "Type").set(this, Repo.get(type).getInfo().getMorphType());
-        } catch (IllegalAccessException ignored) {
-        }
-    }
-
-    public void setMorph(String name, Model model) {
-        setMorph(name, model.getClass(), Repo.get(model.getClass()).getId(model));
-    }
-
 }