From 9097eaf18221d357df4276b0df6aabae0c8a4ff1 Mon Sep 17 00:00:00 2001 From: Teddy Date: Mon, 18 Mar 2024 08:36:30 +0100 Subject: [PATCH] fix: index in CSV export for table entities (#15575) --- .../org/openmetadata/service/jdbi3/TableRepository.java | 2 +- .../service/resources/databases/TableResourceTest.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java index 85c64e05b8c..b3c424d6ead 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TableRepository.java @@ -1231,7 +1231,7 @@ public class TableRepository extends EntityRepository { addRecord(csvFile, recordList, table.getColumns().get(0), false); for (int i = 1; i < entity.getColumns().size(); i++) { - addRecord(csvFile, new ArrayList<>(), table.getColumns().get(1), true); + addRecord(csvFile, new ArrayList<>(), table.getColumns().get(i), true); } } diff --git a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java index f840d851437..bb0d164b0d4 100644 --- a/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java +++ b/openmetadata-service/src/test/java/org/openmetadata/service/resources/databases/TableResourceTest.java @@ -2316,9 +2316,10 @@ public class TableResourceTest extends EntityResourceTest { Column c1 = new Column().withName("c1").withDataType(STRUCT); Column c11 = new Column().withName("c11").withDataType(INT); Column c2 = new Column().withName("c2").withDataType(INT); + Column c3 = new Column().withName("c3").withDataType(BIGINT); c1.withChildren(listOf(c11)); CreateTable createTable = - createRequest("s1").withColumns(listOf(c1, c2)).withTableConstraints(null); + createRequest("s1").withColumns(listOf(c1, c2, c3)).withTableConstraints(null); Table table = createEntity(createTable, ADMIN_AUTH_HEADERS); // Headers: name, displayName, description, owner, tags, retentionPeriod, sourceUrl, domain @@ -2330,7 +2331,8 @@ public class TableResourceTest extends EntityResourceTest { + "dsp1-new,desc1,type,PII.Sensitive", user1, escapeCsv(DOMAIN.getFullyQualifiedName())), ",,,,,,,,c1.c11,dsp11-new,desc11,type1,PII.Sensitive", - ",,,,,,,,c2,,,,"); + ",,,,,,,,c2,,,,", + ",,,,,,,,c3,,,,"); // Update created entity with changes importCsvAndValidate(table.getFullyQualifiedName(), TableCsv.HEADERS, null, updateRecords);