From cd94a13551c1094503dcbc2827de1445951cabd7 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 15 Jul 2010 00:30:40 +0000 Subject: [PATCH] While I'm in there, this also looks wrong. --- src/java/com/samskivert/depot/SchemaMigration.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/com/samskivert/depot/SchemaMigration.java b/src/java/com/samskivert/depot/SchemaMigration.java index 0080ae0..0fd3f8f 100644 --- a/src/java/com/samskivert/depot/SchemaMigration.java +++ b/src/java/com/samskivert/depot/SchemaMigration.java @@ -79,7 +79,7 @@ public abstract class SchemaMigration extends Modifier public Rename (int targetVersion, String oldColumnName, ColumnExp newColumn) { super(targetVersion); _oldColumnName = oldColumnName; - _newColumnName = newColumn.name; + _fieldName = newColumn.name; } @Override public boolean runBeforeDefault () { @@ -89,7 +89,8 @@ public abstract class SchemaMigration extends Modifier @Override public void init (String tableName, Map> marshallers) { super.init(tableName, marshallers); - FieldMarshaller fm = requireMarshaller(marshallers, _newColumnName); + FieldMarshaller fm = requireMarshaller(marshallers, _fieldName); + _newColumnName = fm.getColumnName(); _newColumnDef = fm.getColumnDefinition(); } @@ -119,7 +120,7 @@ public abstract class SchemaMigration extends Modifier conn, _tableName, _oldColumnName, _newColumnName, _newColumnDef) ? 1 : 0; } - protected String _oldColumnName, _newColumnName; + protected String _oldColumnName, _fieldName, _newColumnName; protected ColumnDefinition _newColumnDef; }