fix: Put constraintName on the table, not column

Author: erezrokah

lib/src/main/java/io/cloudquery/helper/ArrowHelper.java

@@ -171,9 +171,6 @@ public static Schema toArrowSchema(Table table) {
       Map<String, String> metadata = new HashMap<>();
       metadata.put(CQ_EXTENSION_UNIQUE, column.isUnique() ? "true" : "false");
       metadata.put(CQ_EXTENSION_PRIMARY_KEY, column.isPrimaryKey() ? "true" : "false");
-      if (column.getConstraintName() != null) {
-        metadata.put(CQ_EXTENSION_CONSTRAINT_NAME, column.getConstraintName());
-      }
       metadata.put(CQ_EXTENSION_INCREMENTAL, column.isIncrementalKey() ? "true" : "false");
       Field field =
           new Field(
@@ -193,6 +190,7 @@ public static Schema toArrowSchema(Table table) {
     if (table.getParent() != null) {
       metadata.put(CQ_TABLE_DEPENDS_ON, table.getParent().getName());
     }
+    metadata.put(CQ_EXTENSION_CONSTRAINT_NAME, table.getConstraintName());
     return new Schema(asList(fields), metadata);
   }
 
@@ -201,7 +199,6 @@ public static Table fromArrowSchema(Schema schema) {
     for (Field field : schema.getFields()) {
       boolean isUnique = field.getMetadata().get(CQ_EXTENSION_UNIQUE) == "true";
       boolean isPrimaryKey = field.getMetadata().get(CQ_EXTENSION_PRIMARY_KEY) == "true";
-      String constraintName = field.getMetadata().get(CQ_EXTENSION_CONSTRAINT_NAME);
       boolean isIncrementalKey = field.getMetadata().get(CQ_EXTENSION_INCREMENTAL) == "true";
 
       columns.add(
@@ -210,7 +207,6 @@ public static Table fromArrowSchema(Schema schema) {
               .unique(isUnique)
               .primaryKey(isPrimaryKey)
               .incrementalKey(isIncrementalKey)
-              .constraintName(constraintName)
               .type(field.getType())
               .build());
     }
@@ -220,8 +216,11 @@ public static Table fromArrowSchema(Schema schema) {
     String title = metaData.get(CQ_TABLE_TITLE);
     String description = metaData.get(CQ_TABLE_DESCRIPTION);
     String parent = metaData.get(CQ_TABLE_DEPENDS_ON);
+    String constraintName = metaData.get(CQ_EXTENSION_CONSTRAINT_NAME);
+
+    TableBuilder tableBuilder =
+        Table.builder().name(name).constraintName(constraintName).columns(columns);
 
-    TableBuilder tableBuilder = Table.builder().name(name).columns(columns);
     if (title != null) {
       tableBuilder.title(title);
     }

lib/src/main/java/io/cloudquery/schema/Column.java

@@ -10,7 +10,6 @@
 public class Column {
   private String name;
   private String description;
-  private String constraintName;
   private ArrowType type;
   private ColumnResolver resolver;
   private boolean primaryKey;

lib/src/main/java/io/cloudquery/schema/Table.java

@@ -126,6 +126,7 @@ public static int maxDepth(List<Table> tables) {
   }
 
   @NonNull private String name;
+  @Builder.Default private String constraintName = "";
   private TableResolver resolver;
   private String title;
   private String description;

lib/src/test/java/io/cloudquery/helper/ArrowHelperTest.java

@@ -1,5 +1,9 @@
 package io.cloudquery.helper;
 
+import static io.cloudquery.helper.ArrowHelper.CQ_EXTENSION_CONSTRAINT_NAME;
+import static io.cloudquery.helper.ArrowHelper.CQ_EXTENSION_INCREMENTAL;
+import static io.cloudquery.helper.ArrowHelper.CQ_EXTENSION_PRIMARY_KEY;
+import static io.cloudquery.helper.ArrowHelper.CQ_EXTENSION_UNIQUE;
 import static io.cloudquery.helper.ArrowHelper.CQ_TABLE_DEPENDS_ON;
 import static io.cloudquery.helper.ArrowHelper.CQ_TABLE_DESCRIPTION;
 import static io.cloudquery.helper.ArrowHelper.CQ_TABLE_NAME;
@@ -27,7 +31,13 @@ public class ArrowHelperTest {
           .parent(Table.builder().name("parent").build())
           .columns(
               List.of(
-                  Column.builder().name("column1").type(ArrowType.Utf8.INSTANCE).build(),
+                  Column.builder()
+                      .name("column1")
+                      .type(ArrowType.Utf8.INSTANCE)
+                      .unique(true)
+                      .incrementalKey(true)
+                      .primaryKey(true)
+                      .build(),
                   Column.builder().name("column2").type(ArrowType.Utf8.INSTANCE).build()))
           .build();
 
@@ -36,15 +46,34 @@ public void testToArrowSchema() {
     Schema arrowSchema = ArrowHelper.toArrowSchema(TEST_TABLE);
 
     assertEquals(arrowSchema.getFields().get(0).getName(), "column1");
+    assertEquals(
+        arrowSchema.getFields().get(0).getMetadata(),
+        Map.of(
+            CQ_EXTENSION_UNIQUE,
+            "true",
+            CQ_EXTENSION_INCREMENTAL,
+            "true",
+            CQ_EXTENSION_PRIMARY_KEY,
+            "true"));
     assertEquals(arrowSchema.getFields().get(1).getName(), "column2");
+    assertEquals(
+        arrowSchema.getFields().get(1).getMetadata(),
+        Map.of(
+            CQ_EXTENSION_UNIQUE,
+            "false",
+            CQ_EXTENSION_INCREMENTAL,
+            "false",
+            CQ_EXTENSION_PRIMARY_KEY,
+            "false"));
 
     assertEquals(
         arrowSchema.getCustomMetadata(),
         Map.of(
             CQ_TABLE_NAME, "table1",
             CQ_TABLE_DESCRIPTION, "A simple test table",
             CQ_TABLE_TITLE, "Test table title",
-            CQ_TABLE_DEPENDS_ON, "parent"));
+            CQ_TABLE_DEPENDS_ON, "parent",
+            CQ_EXTENSION_CONSTRAINT_NAME, ""));
   }
 
   @Test