From 0a3ac07001f52f62a7ad865d229ce8023723a9d2 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Sun, 18 Feb 2007 21:40:13 +0000
Subject: [PATCH] Make drop migrations idempotent.

---
 src/java/com/samskivert/jdbc/depot/EntityMigration.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/java/com/samskivert/jdbc/depot/EntityMigration.java b/src/java/com/samskivert/jdbc/depot/EntityMigration.java
index 6f39426..197eaa2 100644
--- a/src/java/com/samskivert/jdbc/depot/EntityMigration.java
+++ b/src/java/com/samskivert/jdbc/depot/EntityMigration.java
@@ -48,6 +48,12 @@ public abstract class EntityMigration extends Modifier
         }
 
         public int invoke (Connection conn) throws SQLException {
+            if (!JDBCUtil.tableContainsColumn(conn, _tableName, _columnName)) {
+                // we'll accept this inconsistency
+                log.warning("Column drop appears already performed.");
+                return 0;
+            }
+
             Statement stmt = conn.createStatement();
             try {
                 log.info("Dropping '" + _columnName + "' from " + _tableName);