Skip to content

Commit

Permalink
Show target table in log message when conflict field not found.
Browse files Browse the repository at this point in the history
  • Loading branch information
mmichalek committed Oct 1, 2016
1 parent 7c41cb5 commit 5a57306
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -228,8 +228,8 @@ protected LoadStatus delete(CsvData data, boolean useConflictDetection) {
lookupColumns.add(versionColumn);
} else {
log.error(
"Could not find the timestamp/version column with the name {}. Defaulting to using primary keys for the lookup.",
conflict.getDetectExpression());
"Could not find the timestamp/version column with the name {} on table {}. Defaulting to using primary keys for the lookup.",
conflict.getDetectExpression(), targetTable.getName());
}
Column[] pks = targetTable.getPrimaryKeyColumns();
for (Column column : pks) {
Expand Down Expand Up @@ -376,8 +376,8 @@ protected LoadStatus update(CsvData data, boolean applyChangesOnly, boolean useC
lookupColumns.add(versionColumn);
} else {
log.error(
"Could not find the timestamp/version column with the name {}. Defaulting to using primary keys for the lookup.",
conflict.getDetectExpression());
"Could not find the timestamp/version column with the name {} on table {}. Defaulting to using primary keys for the lookup.",
conflict.getDetectExpression(), targetTable.getName());
}
pks = targetTable.getPrimaryKeyColumns();
for (Column column : pks) {
Expand Down

0 comments on commit 5a57306

Please sign in to comment.