Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10289 This closes #6256. Change getConflictColumnsClause 

NIFI-10289 Test upsert to catch this issue

Signed-off-by: Joe Witt <joewitt@apache.org>
This commit is contained in:
Eduardo Fontes 2022-07-28 15:01:09 -03:00 committed by Joe Witt
parent 9e6ee656b5
commit 9bc63920aa
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/db/impl/Oracle12DatabaseAdapter.java
View File

@ -150,7 +150,8 @@ public class Oracle12DatabaseAdapter implements DatabaseAdapter {
uniqueKey -> column.equalsIgnoreCase(getColumnAssignment(table, uniqueKey, newTableAlias)))) uniqueKey -> column.equalsIgnoreCase(getColumnAssignment(table, uniqueKey, newTableAlias))))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (conflictColumnsClause.isEmpty()) { // Compare list sizes instead of emptyness
if (conflictColumnsClause.size() != uniqueKeyColumnNames.size()) {
// Try it with normalized columns // Try it with normalized columns
conflictColumnsClause = conflictColumns.stream() conflictColumnsClause = conflictColumns.stream()

13
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/db/impl/TestOracle12DatabaseAdapter.java
View File

@ -136,13 +136,14 @@ public class TestOracle12DatabaseAdapter {
public void testGetUpsertStatement() { public void testGetUpsertStatement() {
// GIVEN // GIVEN
String tableName = "table"; String tableName = "table";
List<String> columnNames = Arrays.asList("column1","column2", "column3", "column4"); List<String> columnNames = Arrays.asList("column1","column2", "column3", "column_4");
Collection<String> uniqueKeyColumnNames = Arrays.asList("column2","column4"); // uniqueKeyColumnNames can be normalized, so "column_4" become "column4" here.
Collection<String> uniqueKeyColumnNames = Arrays.asList("column1","column4");
String expected = "MERGE INTO table USING (SELECT ? column1, ? column2, ? column3, ? column4 FROM DUAL) n" + String expected = "MERGE INTO table USING (SELECT ? column1, ? column2, ? column3, ? column_4 FROM DUAL) n" +
" ON (table.column2 = n.column2 AND table.column4 = n.column4) WHEN NOT MATCHED THEN" + " ON (table.column1 = n.column1 AND table.column_4 = n.column_4) WHEN NOT MATCHED THEN" +
" INSERT (column1, column2, column3, column4) VALUES (n.column1, n.column2, n.column3, n.column4)" + " INSERT (column1, column2, column3, column_4) VALUES (n.column1, n.column2, n.column3, n.column_4)" +
" WHEN MATCHED THEN UPDATE SET table.column1 = n.column1, table.column3 = n.column3"; " WHEN MATCHED THEN UPDATE SET table.column2 = n.column2, table.column3 = n.column3";
// WHEN // WHEN
// THEN // THEN