Improve the saving part.

Author: broken1arrow

Database/src/main/java/org/broken/arrow/library/database/construct/query/builder/UpdateBuilder.java

@@ -22,7 +22,7 @@ public class UpdateBuilder {
     private final Map<Integer, Object> values = new LinkedHashMap<>();
     private final Selector<ColumnBuilder<Column, Void>,Column> selector;
     private int columnIndex = 1;
-
+    private boolean built;
     /**
      * Constructs an UpdateBuilder for the given QueryBuilder context.
      *
@@ -51,6 +51,7 @@ public UpdateBuilder put(final String column, final Object value) {
      * @return this UpdateBuilder instance for chaining
      */
     public UpdateBuilder put(final Column column, final Object value) {
+        if (built) return this;
         updateData.put(column.getColumnName(), value);
         values.put(columnIndex++, value);
         return this;
@@ -63,6 +64,7 @@ public UpdateBuilder put(final Column column, final Object value) {
      * @return this UpdateBuilder instance for chaining
      */
     public UpdateBuilder putAll(Map<Column, Object> map) {
+        if (built) return this;
         map.forEach(this::put);
         return this;
     }
@@ -73,6 +75,7 @@ public UpdateBuilder putAll(Map<Column, Object> map) {
      * @return selector instance
      */
     public Selector<ColumnBuilder<Column, Void>,Column> getSelector() {
+        if (built) return null;
         return selector;
     }
 
@@ -82,7 +85,9 @@ public Selector<ColumnBuilder<Column, Void>,Column> getSelector() {
      * @return map of column names to values
      */
     public Map<String, Object> build() {
-        processWhereValues();
+        if (!built)
+            processWhereValues();
+        built = true;
         return updateData;
     }
 

Database/src/main/java/org/broken/arrow/library/database/core/Database.java

@@ -668,19 +668,35 @@ private void preparePrimaryKeyMigration(final Connection connection, final SqlQu
 
             Validate.checkBoolean(!primaryWrapper.isSet() && !primaryWrapper.isUnique(), "Your new primary columns is set as primary key and you lack the values that must be set before set constraint to primary, it could set it to unique if set this to true setUnique.");
 
+            final List<QueryBuilder> saveQueryList = new ArrayList<>();
+            final List<Column> primaryColumns = queryTable.getPrimaryColumns();
+            for (DataWrapper.PrimaryWrapper primary : primaryWrapper.getPrimaryWrappers()) {
+                final QueryBuilder saveBuilder = new QueryBuilder();
+                saveBuilder.update(queryTable.getTableName()).putAll(primaryWrapper.convert(primary.getPrimaryKeys())).getSelector().where(whereBuilder -> {
+                    if (primary.getWhereClause() == null)
+                        return null;
+                    return primary.getWhereClause().apply(whereBuilder);
+                });
+                saveQueryList.add(saveBuilder);
+            }
 
-            List<Column> primaryColumns = queryTable.getPrimaryColumns();
-            boolean primaryValuesComplete = true;
-            for (final String column : newPrimaryKeys) {
-                if (primaryWrapper.getPrimaryValue(column) == null) {
-                    primaryValuesComplete = false;
-                    break;
+            for (QueryBuilder saveQuery : saveQueryList) {
+                try (final PreparedStatement preparedStatement = connection.prepareStatement(saveQuery.build())) {
+                    for (Entry<Integer, Object> entry : saveQuery.getValues().entrySet()) {
+                        preparedStatement.setObject(entry.getKey(), entry.getValue());
+                    }
+                    preparedStatement.addBatch();
+                    preparedStatement.executeBatch();
+                } catch (final SQLException throwable) {
+                    log.log(throwable, () -> "Could not save the columns with query '" + saveQuery + "'. From this table '" + queryTable.getTableName() + "'");
                 }
             }
+
+            boolean primaryValuesComplete = primaryWrapper.allPrimaryValuesPresent(newPrimaryKeys);
             Validate.checkBoolean(!primaryValuesComplete && !primaryWrapper.isUnique(), "Your new primary columns is set as primary key, one or several you want to set primary key is not set in the consumer cache.");
 
-            List<Column> nextPrimaryColumns = new ArrayList<>();
-            List<Column> fallbackUniqueColumns = new ArrayList<>();
+            final List<Column> nextPrimaryColumns = new ArrayList<>();
+            final List<Column> fallbackUniqueColumns = new ArrayList<>();
             for (final Column column : primaryColumns) {
                 if (primaryWrapper.isSet() && primaryValuesComplete) {
                     nextPrimaryColumns.add(column);

Database/src/main/java/org/broken/arrow/library/database/utility/PrimaryConstraintWrapper.java

@@ -1,5 +1,6 @@
 package org.broken.arrow.library.database.utility;
 
+import org.broken.arrow.library.database.builders.DataWrapper;
 import org.broken.arrow.library.database.builders.LoadDataWrapper;
 import org.broken.arrow.library.database.builders.tables.SqlQueryTable;
 import org.broken.arrow.library.database.construct.query.builder.CreateTableHandler;
@@ -9,9 +10,7 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Consumer;
 
 
@@ -25,11 +24,11 @@
  * </p>
  */
 public class PrimaryConstraintWrapper {
-    final Map<String, Object> primaryKeys = new HashMap<>();
+    private final List<DataWrapper.PrimaryWrapper> primaryWrappers = new ArrayList<>();
     private final Database database;
     private final SqlQueryTable queryTable;
     private Consumer<Map<String, Object>> loadMapFromDB;
-    private WhereClauseFunction whereClause;
+
     private boolean unique;
 
 
@@ -39,54 +38,40 @@ public PrimaryConstraintWrapper(final Database database, final SqlQueryTable que
     }
 
     /**
-     * Adds a primary key column and its associated value.
-     *
-     * @param key   primary key column name
-     * @param value primary key value
-     */
-    public void putPrimary(@Nonnull final String key, @Nonnull final Object value) {
-        primaryKeys.put(key, value);
-    }
-
-    /**
-     * Set where it shall update data or get data from database.
+     * Adds a primary key column and its associated WhereClause.
      *
-     * @param whereClause where constructor to create your clause.
+     * @param primaryColumnsData the {@link DataWrapper.PrimaryWrapper} instance with the where clause and the map with the values that need to be updated.
      */
-    public void setWhereClause(final WhereClauseFunction whereClause) {
-        this.whereClause = whereClause;
+    public void addQueryData(@Nonnull final DataWrapper.PrimaryWrapper primaryColumnsData) {
+        primaryWrappers.add(primaryColumnsData);
     }
 
     /**
      * Returns the primary key column-value mappings.
      *
-     * @return map of primary keys
+     * @return List of primary data wrapper.
      */
     @Nonnull
-    public Map<String, Object> getPrimaryKeys() {
-        return primaryKeys;
+    public List<DataWrapper.PrimaryWrapper> getPrimaryWrappers() {
+        return primaryWrappers;
     }
 
     /**
      * Returns the primary key column-value mappings.
      *
-     * @param key primary key column name
-     * @return the value to your primary key or {@code null} if not exist.
+     * @return Returns {@code true} if the column is set.
      */
-    @Nullable
-    public Object getPrimaryValue(@Nonnull final String key) {
-        return primaryKeys.get(key);
+    public boolean allPrimaryValuesPresent(@Nonnull final Set<String> keys) {
+        for (DataWrapper.PrimaryWrapper wrapper : primaryWrappers) {
+            for (String key : keys) {
+                if (wrapper.getPrimaryValue(key) == null) {
+                    return false;
+                }
+            }
+        }
+        return true;
     }
 
-    /**
-     * Returns the custom WHERE clause applier, if present.
-     *
-     * @return WHERE clause applier or {@code null}
-     */
-    @Nullable
-    public WhereClauseFunction getWhereClause() {
-        return whereClause;
-    }
 
     /**
      * If it shall replace the primary key with unique if you not provide
@@ -113,15 +98,17 @@ public void setUnique(final boolean unique) {
      * @return Returns {true} if at least one value added and the whereClause is not null
      */
     public boolean isSet() {
-        return !(primaryKeys.isEmpty() && whereClause == null);
-    }
-
-    public void loadMap(Map<String, Object> dataFromDB) {
-        if (this.loadMapFromDB == null) return;
-
-        this.loadMapFromDB.accept(dataFromDB);
+        return !(primaryWrappers.isEmpty());
     }
 
+    /**
+     * Retrieve the loaded data from the database. It will go through every row, and you can use {@link #addQueryData(DataWrapper.PrimaryWrapper)}
+     * to set the new primary key value or if you have several, this columns name and value will be updated to the database.
+     *
+     * @param loadedData the callback when loading the data set in the database.
+     * @param clazz      the class to resolve.
+     * @param <T>        the generic type for that class that implements ConfigurationSerializable.
+     */
     public <T extends ConfigurationSerializable> void forEachLoadedData(Consumer<LoadDataWrapper<T>> loadedData, Class<T> clazz) {
         final CreateTableHandler tableHandler = this.queryTable.getTable();
         this.loadMapFromDB = (dataFromDB) -> {
@@ -138,8 +125,40 @@ public <T extends ConfigurationSerializable> void forEachLoadedData(Consumer<Loa
         };
     }
 
+
+    /**
+     * Retrieve the loaded data from the database. It will go through every row, and you can use {@link #addQueryData(DataWrapper.PrimaryWrapper)}
+     * to set the new primary key value or if you have several, this columns name and value will be updated to the database.
+     * <p>
+     * You will get it as raw data from the database insted of {@link #forEachLoadedData(Consumer, Class)} that gives you a consumer
+     * with the raw map with all columns and values set in the database.
+     *
+     * @param loadedData the callback when loading the data set in the database.
+     */
     public void forEachLoadedData(Consumer<Map<String, Object>> loadedData) {
         this.loadMapFromDB = loadedData;
     }
 
+    /**
+     * Used internally only this method.
+     *
+     * @param dataFromDB the map of raw values from the database.
+     */
+    public void loadMap(Map<String, Object> dataFromDB) {
+        if (this.loadMapFromDB == null) return;
+
+        this.loadMapFromDB.accept(dataFromDB);
+    }
+
+    /**
+     * Used internally only this method.
+     *
+     * @param primaryKeys the list of primary column and the key to convert to
+     * @return the map converted to a column and the object/value.
+     */
+    public Map<Column, Object> convert(final Map<String, Object> primaryKeys) {
+        final Map<Column, Object> map = new HashMap<>();
+        primaryKeys.forEach((key, value) -> map.put(new Column(key, ""), value));
+        return map;
+    }
 }