Added extra fields to Model and added QueryWith but didn't yet implement it in the query builder as i'm way too tired (:

Author: JanHolger

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

@@ -41,6 +41,7 @@ public class Model {
     private transient boolean internalEntryExists = false;
     private transient final Map<Class<? extends Model>, Object> internalJoinedModels = new HashMap<>();
     private transient Map<String, Object> internalOriginalValues = new HashMap<>();
+    private transient Map<String, Object> internalExtraFields = new HashMap<>();
 
     void internalAddJoinedModel(Class<? extends Model> type, Object entity) {
         internalJoinedModels.put(type, entity);
@@ -62,6 +63,14 @@ public Map<String, Object> getFieldValues() {
         return values;
     }
 
+    public Map<String, Object> getExtraFields() {
+        return internalExtraFields;
+    }
+
+    public <T> T getExtraField(String key) {
+        return (T) internalExtraFields.get(key);
+    }
+
     public Map<String, Object> getOriginalValues() {
         return internalOriginalValues;
     }

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

@@ -27,6 +27,7 @@ public class Query<T extends Model> {
     private QueryColumn order;
     private boolean desc = false;
     private boolean withDeleted = false;
+    private final List<QueryWith> withs = new ArrayList<>();
 
     public Query(Class<T> model) {
         this(Repo.get(model), model);
@@ -46,6 +47,10 @@ public QueryGroup<T> getWhereGroup() {
         return where;
     }
 
+    public List<QueryWith> getWiths() {
+        return withs;
+    }
+
     public Integer getLimit() {
         return limit;
     }
@@ -70,6 +75,15 @@ public Class<T> getModel() {
         return model;
     }
 
+    public Query<T> with(String extra) {
+        return with(extra, null);
+    }
+
+    public Query<T> with(String extra, String as) {
+        withs.add(new QueryWith(extra, as));
+        return this;
+    }
+
     public Query<T> and(Function<QueryGroup<T>, QueryGroup<T>> group) {
         where.and(group);
         return this;

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

@@ -0,0 +1,20 @@
+package org.javawebstack.orm.query;
+
+public class QueryWith {
+
+    private final String expression;
+    private final String as;
+
+    public QueryWith(String expression, String as) {
+        this.expression = expression;
+        this.as = as;
+    }
+
+    public String getExpression() {
+        return expression;
+    }
+
+    public String getAs() {
+        return as;
+    }
+}