From 019ce4e6143a235a53dae45204c8570c9ad8cfae Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Thu, 11 Feb 2016 20:43:45 +1300
Subject: [PATCH] #558 - Internal refactor - MTable pending dropped columns

---
 .../avaje/ebean/dbmigration/model/MTable.java | 29 +++----------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java b/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java
index cc9d97d0f..e43030d4c 100644
--- a/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java
+++ b/src/main/java/com/avaje/ebean/dbmigration/model/MTable.java
@@ -16,7 +16,6 @@ import org.slf4j.LoggerFactory;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -122,7 +121,7 @@ public class MTable {
    */
   private AddColumn addColumn;
 
-  private List<DroppedColumn> droppedColumns = new ArrayList<DroppedColumn>();
+  private List<String> droppedColumns = new ArrayList<String>();
 
   /**
    * Create a copy of this table structure as a 'draft' table.
@@ -370,13 +369,8 @@ public class MTable {
       }
     }
     if (includeDropped && !droppedColumns.isEmpty()) {
-      Collections.sort(droppedColumns);
-      for (DroppedColumn droppedColumn : droppedColumns) {
-        if (droppedColumn.columnPosition >= columnNames.size()) {
-          columnNames.add(droppedColumn.name);
-        } else {
-          columnNames.add(droppedColumn.columnPosition, droppedColumn.name);
-        }
+      for (String droppedColumn : droppedColumns) {
+        columnNames.add(droppedColumn);
       }
     }
     return columnNames;
@@ -558,22 +552,7 @@ public class MTable {
    * though it is not part of the current model.
    */
   public void registerPendingDropColumn(String columnName) {
-    droppedColumns.add(new DroppedColumn(columnName, 100));
-  }
-
-  private static class DroppedColumn implements Comparable<DroppedColumn> {
-    final String name;
-    final int columnPosition;
-
-    DroppedColumn(String name, int columnPosition) {
-      this.name = name;
-      this.columnPosition = columnPosition;
-    }
-
-    @Override
-    public int compareTo(DroppedColumn o) {
-      return (o.columnPosition < columnPosition) ? -1 : ((o.columnPosition == columnPosition) ? 0 : 1);
-    }
+    droppedColumns.add(columnName);
   }
 
   private int toInt(BigInteger value) {