From 9edfe28d33380975fbbcf17f564ab656269f6732 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 14 Aug 2007 01:11:09 +0000 Subject: [PATCH] Tidied up SQL execution in liaisons; fixed MySQL column renaming. --- .../com/samskivert/jdbc/depot/EntityMigration.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/java/com/samskivert/jdbc/depot/EntityMigration.java b/src/java/com/samskivert/jdbc/depot/EntityMigration.java index 9bea2bd..e9765b7 100644 --- a/src/java/com/samskivert/jdbc/depot/EntityMigration.java +++ b/src/java/com/samskivert/jdbc/depot/EntityMigration.java @@ -92,14 +92,20 @@ public abstract class EntityMigration extends Modifier log.info("Renaming '" + _oldColumnName + "' to '" + _newColumnName + "' in: " + _tableName); - return liaison.renameColumn(conn, _tableName, _oldColumnName, _newColumnName) ? 1 : 0; + return liaison.renameColumn( + conn, _tableName, _oldColumnName, _newColumnName, _newColumnDef) ? 1 : 0; } public boolean runBeforeDefault () { return true; } - protected String _oldColumnName, _newColumnName; + protected void init (String tableName, Map marshallers) { + super.init(tableName, marshallers); + _newColumnDef = marshallers.get(_newColumnName).getColumnDefinition(); + } + + protected String _oldColumnName, _newColumnName, _newColumnDef; } /**