X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/66cc80d545c5011db1d840796ce7aaed153415c0..9692864e721ed0fd395039f394893d72f8cf30ed:/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/UniqueIndexDropper.java

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/UniqueIndexDropper.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/UniqueIndexDropper.java
index 29f6812b7f..5832b81eac 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/UniqueIndexDropper.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/UniqueIndexDropper.java
@@ -22,12 +22,10 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
  * @date 16.09.2010
  *
  */
-public class UniqueIndexDropper extends SchemaUpdaterStepBase<UniqueIndexDropper> implements ISchemaUpdaterStep {
+public class UniqueIndexDropper extends AuditedSchemaUpdaterStepBase<UniqueIndexDropper> implements ISchemaUpdaterStep {
 	private static final Logger logger = Logger.getLogger(UniqueIndexDropper.class);
 	
-	private String tableName;
 	private String indexColumn;
-	private boolean includeAudTable;
 	
 	public static final UniqueIndexDropper NewInstance(String tableName, String indexColumn, boolean includeAudTable){
 		String stepName = "Drop index " + tableName + "-" + indexColumn;
@@ -42,32 +40,16 @@ public class UniqueIndexDropper extends SchemaUpdaterStepBase<UniqueIndexDropper
 		this.includeAudTable = includeAudTable;
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.cdm.database.update.SchemaUpdaterStepBase#invoke(eu.etaxonomy.cdm.database.ICdmDataSource, eu.etaxonomy.cdm.common.IProgressMonitor)
-	 */
 	@Override
-	public Integer invoke(ICdmDataSource datasource, IProgressMonitor monitor) throws SQLException {
-		boolean result = true;
-		result &= dropIndex(tableName, datasource, monitor);
-		if (includeAudTable){
-			String aud = "_AUD";
-			result &= dropIndex(tableName + aud, datasource, monitor);
-		}
-		return (result == true )? 0 : null;
-	}
-
-	private boolean dropIndex(String tableName, ICdmDataSource datasource, IProgressMonitor monitor) {
+	protected boolean invokeOnTable(String tableName, ICdmDataSource datasource, IProgressMonitor monitor) {
 		try {
 			if (checkExists(datasource)){
 				String updateQuery = getUpdateQueryString(tableName, datasource, monitor);
 				datasource.executeUpdate(updateQuery);
 			}
 			return true;
-		} catch ( DatabaseTypeNotSupportedException e) {
-			e.printStackTrace();
-			return false;
-		} catch ( SQLException e) {
-			e.printStackTrace();
+		} catch ( Exception e) {
+			monitor.warning(e.getMessage(), e);
 			return false;
 		}
 	}