AfflictionNetworks/depot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Report the pkName in both cases, and do so using valid Java code.

Browse Source
This commit is contained in:
Michael Bayne
2011-02-18 00:40:48 +00:00
parent adf914e156
commit e59b20dd56
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/samskivert/depot/impl/DepotMarshaller.java
+2 -2
View File
@@ -808,8 +808,8 @@ public class DepotMarshaller<T extends PersistentRecord> implements QueryMarshal
}); });
} else if (!hasPrimaryKey() && metaData.pkName != null) { } else if (!hasPrimaryKey() && metaData.pkName != null) {
log.info("Dropping primary key: " + pkName);
final String pkName = metaData.pkName; final String pkName = metaData.pkName;
log.info("Dropping primary key: " + pkName);
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override protected int invoke (Connection conn, DatabaseLiaison liaison) @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
throws SQLException { throws SQLException {
@@ -819,8 +819,8 @@ public class DepotMarshaller<T extends PersistentRecord> implements QueryMarshal
}); });
} else if (!metaData.pkMatches(_pkColumns)) { } else if (!metaData.pkMatches(_pkColumns)) {
log.info("Primary key has changed: dropping and readding.");
final String pkName = metaData.pkName; final String pkName = metaData.pkName;
log.info("Primary key has changed: dropping and readding: " + pkName);
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override protected int invoke (Connection conn, DatabaseLiaison liaison) @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
throws SQLException { throws SQLException {