Fix copy directive schema generation bug

data-integrations · Nov 9, 2023 · c79daf9 · c79daf9
1 parent 9d0175e
commit c79daf9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/wrangler-core/src/main/java/io/cdap/directives/column/Copy.java b/wrangler-core/src/main/java/io/cdap/directives/column/Copy.java
@@ -118,18 +118,18 @@ public Schema getOutputSchema(SchemaResolutionContext context) {
     Schema inputSchema = context.getInputSchema();
     List<Schema.Field> outputFields = new ArrayList<>();
     Schema sourceSchema = inputSchema.getField(source.value()).getSchema();
+    boolean destinationExists = inputSchema.getField(destination.value()) != null;
 
     for (Schema.Field field : inputSchema.getFields()) {
-      if (field.getName().equals(destination.value())) {
+      if (force && field.getName().equals(destination.value())) {
         outputFields.add(Schema.Field.of(destination.value(), sourceSchema));
       } else {
         outputFields.add(field);
       }
     }
-    if (!force) {
+    if (!destinationExists) {
       outputFields.add(Schema.Field.of(destination.value(), sourceSchema));
     }
-
     return Schema.recordOf("outputSchema", outputFields);
   }
 }
diff --git a/wrangler-core/src/test/java/io/cdap/directives/column/CopyTest.java b/wrangler-core/src/test/java/io/cdap/directives/column/CopyTest.java
@@ -103,6 +103,7 @@ public void testForceCopy() throws Exception {
   public void testGetOutputSchemaForForceCopiedColumn() throws Exception {
     String[] directives = new String[] {
       "copy :col_B :col_A true",
+      "copy :col_B :col_C true",
     };
     List<Row> rows = Collections.singletonList(
       new Row("col_A", 1).add("col_B", new BigDecimal("143235.016"))
@@ -115,7 +116,8 @@ public void testGetOutputSchemaForForceCopiedColumn() throws Exception {
     Schema expectedSchema = Schema.recordOf(
       "expectedSchema",
       Schema.Field.of("col_A", Schema.decimalOf(10, 3)),
-      Schema.Field.of("col_B", Schema.decimalOf(10, 3))
+      Schema.Field.of("col_B", Schema.decimalOf(10, 3)),
+      Schema.Field.of("col_C", Schema.decimalOf(10, 3))
     );
 
     Schema outputSchema = TestingRig.executeAndGetSchema(directives, rows, inputSchema);