fix: fields methods added to execute update

Author: DenzelCode

src/main/java/com/code/advancedsql/query/ExecuteUpdate.java

@@ -4,22 +4,59 @@
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 public abstract class ExecuteUpdate<T extends IQuery> extends Specifiable<T> {
 
-    public ExecuteUpdate(ITable table) {
+    protected final List<String> fields = new ArrayList<>();
+
+    public ExecuteUpdate(ITable table, Map<String, Object> fields) {
         super(table);
+
+        if (fields != null) this.fields(fields);
+    }
+
+    public ExecuteUpdate(ITable table) {
+        this(table, null);
     }
 
     @Override
     public PreparedStatement executePrepare() throws SQLException {
-        System.out.println(this.execute);
-
         this.execute();
 
         return this.prepare;
     }
 
+    /**
+     * Columns and values that you want to update/insert.
+     * @param field Column name
+     * @param value Row value
+     * @return Query object.
+     */
+    @SuppressWarnings("unchecked")
+    public T field(String field, Object value) {
+        this.fields.add(field);
+
+        this.execute.add(value);
+
+        return (T) this;
+    }
+
+    /**
+     * Columns and values that you want to update/insert.
+     * @param values Map
+     * @return Query object.
+     */
+    @SuppressWarnings("unchecked")
+    public T fields(Map<String, Object> values) {
+        for (Map.Entry<String, Object> entry: values.entrySet())
+            this.field(entry.getKey(), entry.getValue());
+
+        return (T) this;
+    }
+
     /**
      * Execute the query.
      * @return An integer.

src/main/java/com/code/advancedsql/query/Insert.java

@@ -8,45 +8,12 @@
 
 public class Insert extends ExecuteUpdate<Insert> {
 
-    private final List<String> fields = new ArrayList<>();
-
-    private final List<Object> values = new ArrayList<>();
-
     public Insert(ITable table) {
         super(table);
     }
 
     public Insert(ITable table, Map<String, Object> fields) {
-        super(table);
-
-        this.fields(fields);
-    }
-
-    /**
-     * Columns and values that you want to insert.
-     * @param field Column name
-     * @param value Row value
-     * @return Query object.
-     */
-    public Insert field(String field, Object value) {
-        this.fields.add(field);
-
-        this.values.add(value);
-
-        this.execute.add(value);
-
-        return this;
-    }
-
-    /**
-     * Columns and values that you want to insert.
-     * @param values Map
-     * @return Query object.
-     */
-    public Insert fields(Map<String, Object> values) {
-        for (Map.Entry<String, Object> entry: values.entrySet()) this.field(entry.getKey(), entry.getValue());
-
-        return this;
+        super(table, fields);
     }
 
     @Override
@@ -57,7 +24,7 @@ public String toQuery() {
 
         query.append(") VALUES (");
 
-        for (int i = 0; i < this.values.size(); i++) query.append(i != this.values.size() - 1 ? "?, " : "?");
+        for (int i = 0; i < this.fields.size(); i++) query.append(i != this.fields.size() - 1 ? "?, " : "?");
 
         query.append(")");
 

src/main/java/com/code/advancedsql/query/Update.java

@@ -8,41 +8,12 @@
 
 public class Update extends ExecuteUpdate<Update> {
 
-    private final List<String> fields = new ArrayList<>();
-
     public Update(ITable table) {
         super(table);
     }
 
     public Update(ITable table, Map<String, Object> fields) {
-        super(table);
-
-        this.fields(fields);
-    }
-
-    /**
-     * Columns and values that you want to update.
-     * @param field Column name
-     * @param value Row value
-     * @return Query object.
-     */
-    public Update field(String field, Object value) {
-        this.fields.add(field);
-
-        this.execute.add(value);
-
-        return this;
-    }
-
-    /**
-     * Columns and values that you want to update.
-     * @param values Map
-     * @return Query object.
-     */
-    public Update fields(Map<String, Object> values) {
-        for (Map.Entry<String, Object> entry: values.entrySet()) this.field(entry.getKey(), entry.getValue());
-
-        return this;
+        super(table, fields);
     }
 
     @Override