WebSVN - OpenConcerto - Diff - Rev 174 and 177 - /trunk/OpenConcerto/src/org/openconcerto/sql/view/list/RowValuesTableModel.java

  package org.openconcerto.sql.view.list;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.model.Constraint;
 import org.openconcerto.sql.model.SQLField;
+import org.openconcerto.sql.model.SQLInsert;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowListRSH;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLRowValuesCluster.StoreMode;
+import org.openconcerto.sql.model.SQLRowValuesCluster.StoreResult;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLSyntax.ConstraintType;
 import org.openconcerto.sql.model.SQLTable;
+import org.openconcerto.sql.model.SQLUpdate;
 import org.openconcerto.sql.model.UndefinedRowValuesCache;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.utils.AlterTable;
 import org.openconcerto.utils.CompareUtils;
 import org.openconcerto.utils.ExceptionHandler;
+import org.openconcerto.utils.ListMap;
 import org.openconcerto.utils.OrderedSet;
 import java.math.BigDecimal;
 import java.sql.SQLException;
 import java.util.ArrayList;
     /**
      * Valider les modifications dans la base
      */
     public void commitData() {
+        commitData(false);
+    }
+    /**
+     * Valider les modifications dans la base
+     */
+    public void commitData(boolean useMultipleInsertUpdate) {
         checkEDT();
         final List<SQLRowValues> rowsToCommmit = new ArrayList<SQLRowValues>();
         rowsToCommmit.addAll(this.rowValues);
         try {
             final SQLTable table = getDefaultRowValues().getTable();
                 final String req = new AlterTable(table).dropConstraint(constraint.getName()).asString();
                 table.getDBSystemRoot().getDataSource().execute(req);
                 table.fetchFields();
                 table.getSchema().updateVersion();
+            }
             BigDecimal o = table.getMaxOrder(Boolean.FALSE);
             final int size = rowsToCommmit.size();
+            if (useMultipleInsertUpdate) {
+                List<SQLUpdate> updates = new ArrayList<>();
+                ListMap<List<SQLField>, SQLInsert> mapInsertByFields = new ListMap<>();
+                ListMap<List<SQLField>, SQLRowValues> mapInsertRowValues = new ListMap<>();
+                for (int i = 0; i < size; i++) {
+                    final SQLRowValues r = rowsToCommmit.get(i);
+                    r.put(r.getTable().getOrderField().getFieldName(), o.add(new BigDecimal(i + 1)));
+                    if (r.hasID()) {
+                        SQLUpdate up = new SQLUpdate(new Where(table.getKey(), "=", r.getID()));
+                        up.importValuesFrom(r);
+                        updates.add(up);
+                    } else {
+                        SQLInsert insert = new SQLInsert();
+                        insert.importValuesFrom(r);
+                        List<SQLField> fields = insert.getFields();
+                        mapInsertByFields.add(fields, insert);
+                        mapInsertRowValues.add(fields, r);
+                    }
+                }
+                if (!mapInsertByFields.isEmpty()) {
+                    for (List<SQLField> fieldSize : mapInsertByFields.keySet()) {
+                        List<Number> ids = SQLInsert.executeSimilarInserts(table.getDBSystemRoot(), mapInsertByFields.get(fieldSize), true);
+                        List<SQLRowValues> insertsRowValues = mapInsertRowValues.get(fieldSize);
+                        if (ids.size() == insertsRowValues.size()) {
+                            for (int i = 0; i < ids.size(); i++) {
+                                final SQLRowValues r = insertsRowValues.get(i);
+                                r.setID(ids.get(i));
+                            }
+                        }
+                    }
+                }
+                if (!updates.isEmpty()) {
+                    SQLUpdate.executeMultipleWithBatch(table.getDBSystemRoot(), updates);
+                }
+                table.fireTableModified(-1);
+            } else {
-            for (int i = 0; i < size; i++) {
+                for (int i = 0; i < size; i++) {
-                final SQLRowValues r = rowsToCommmit.get(i);
+                    final SQLRowValues r = rowsToCommmit.get(i);
-                r.put(r.getTable().getOrderField().getFieldName(), o.add(new BigDecimal(i + 1)));
+                    r.put(r.getTable().getOrderField().getFieldName(), o.add(new BigDecimal(i + 1)));
-                final SQLRow row = r.getGraph().store(StoreMode.COMMIT).getStoredRow(r);
+                    final StoreResult store = r.getGraph().store(StoreMode.COMMIT, false);
+                    final SQLRow row = store.getStoredRow(r);
-                r.setID(row.getIDNumber());
+                    r.setID(row.getIDNumber());
+                }
+            }
         } catch (SQLException e) {
             ExceptionHandler.handle("Unable to commit rows", e);
+        }
+    }
     public void addTableModelListener(TableModelListener l) {
         this.tableModelListeners.add(l);
+    }
+        }
         if (rowVals != null) {
             final List<SQLRowValues> newRows = new ArrayList<SQLRowValues>();
-            if (rowVals.getID() > 1) {
+            if (rowVals.hasID() && !rowVals.isUndefined() && rowVals.getID() != SQLRow.NONEXISTANT_ID) {
                 SQLRow row = rowVals.getTable().getRow(rowVals.getID());
                 List<SQLRow> rowSet;
                 if (referentField == null) {
                     rowSet = row.getReferentRows(RowValuesTableModel.this.element.getTable());
                 } else {

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/view/list/RowValuesTableModel.java - Rev 174 → 177