Rename/reorder merge fix

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java

@@ -383,10 +383,11 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
         @Override
         public DBECommand<?> merge(DBECommand<?> prevCommand, Map<Object, Object> userParams) {
             // We need very first and very last rename commands. They produce final rename
-            ObjectRenameCommand renameCmd = (ObjectRenameCommand) userParams.get("rename");
+            final String mergeId = "rename" + getObject().hashCode();
+            ObjectRenameCommand renameCmd = (ObjectRenameCommand) userParams.get(mergeId);
             if (renameCmd == null) {
                 renameCmd = new ObjectRenameCommand(getObject(), getTitle(), newName);
-                userParams.put("rename", renameCmd);
+                userParams.put(mergeId, renameCmd);
             } else {
                 renameCmd.newName = newName;
                 return renameCmd;
@@ -453,10 +454,11 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
         @Override
         public DBECommand<?> merge(DBECommand<?> prevCommand, Map<Object, Object> userParams) {
             // We need very first and very last reorder commands. They produce final rename
-            ObjectReorderCommand reorderCmd = (ObjectReorderCommand) userParams.get("reorder");
+            final String mergeId = "reorder" + getObject().hashCode();
+            ObjectReorderCommand reorderCmd = (ObjectReorderCommand) userParams.get(mergeId);
             if (reorderCmd == null) {
                 reorderCmd = new ObjectReorderCommand(getObject(), siblings, getTitle(), newPosition);
-                userParams.put("reorder", reorderCmd);
+                userParams.put(mergeId, reorderCmd);
             } else {
                 reorderCmd.newPosition = newPosition;
                 return reorderCmd;