From e59b20dd56cac05ff410f67366a80597076562b0 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Fri, 18 Feb 2011 00:40:48 +0000 Subject: [PATCH] Report the pkName in both cases, and do so using valid Java code. --- src/main/java/com/samskivert/depot/impl/DepotMarshaller.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java index c3df91d..9e759c8 100644 --- a/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java +++ b/src/main/java/com/samskivert/depot/impl/DepotMarshaller.java @@ -808,8 +808,8 @@ public class DepotMarshaller implements QueryMarshal }); } else if (!hasPrimaryKey() && metaData.pkName != null) { - log.info("Dropping primary key: " + pkName); final String pkName = metaData.pkName; + log.info("Dropping primary key: " + pkName); ctx.invoke(new Modifier() { @Override protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { @@ -819,8 +819,8 @@ public class DepotMarshaller implements QueryMarshal }); } else if (!metaData.pkMatches(_pkColumns)) { - log.info("Primary key has changed: dropping and readding."); final String pkName = metaData.pkName; + log.info("Primary key has changed: dropping and readding: " + pkName); ctx.invoke(new Modifier() { @Override protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException {