From 6f3495bd5a49333a23d956841bc5ddcc96cfb178 Mon Sep 17 00:00:00 2001
From: PhongChuong <phong.hoa.chuong@gmail.com>
Date: Mon, 24 Jun 2024 15:37:51 -0400
Subject: [PATCH] fix: add clustering value to ListTables result

---
 .../bigquery/spi/v2/HttpBigQueryRpc.java      |  3 +-
 .../cloud/bigquery/it/ITBigQueryTest.java     | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
index 5dd39eaed..93337d8ca 100644
--- a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
+++ b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/spi/v2/HttpBigQueryRpc.java
@@ -364,7 +364,8 @@ public Table apply(TableList.Tables tablePb) {
                       .setType(tablePb.getType())
                       .setCreationTime(tablePb.getCreationTime())
                       .setTimePartitioning(tablePb.getTimePartitioning())
-                      .setRangePartitioning(tablePb.getRangePartitioning());
+                      .setRangePartitioning(tablePb.getRangePartitioning())
+                      .setClustering(tablePb.getClustering());
                 }
               }));
     } catch (IOException ex) {
diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
index b346b1692..6a7a4e26b 100644
--- a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
+++ b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/it/ITBigQueryTest.java
@@ -1903,6 +1903,41 @@ public void testCreateAndGetTable() {
     assertTrue(remoteTable.delete());
   }
 
+  @Test
+  public void testCreateAndListTable() {
+    String tableName = "test_create_and_list_table";
+    TableId tableId = TableId.of(DATASET, tableName);
+    TimePartitioning partitioning = TimePartitioning.of(Type.DAY);
+    Clustering clustering =
+        Clustering.newBuilder().setFields(ImmutableList.of(STRING_FIELD_SCHEMA.getName())).build();
+    StandardTableDefinition tableDefinition =
+        StandardTableDefinition.newBuilder()
+            .setSchema(TABLE_SCHEMA)
+            .setTimePartitioning(partitioning)
+            .setClustering(clustering)
+            .build();
+    Table createdTable = bigquery.create(TableInfo.of(tableId, tableDefinition));
+    assertNotNull(createdTable);
+    assertEquals(DATASET, createdTable.getTableId().getDataset());
+    assertEquals(tableName, createdTable.getTableId().getTable());
+
+    Page<Table> tables = bigquery.listTables(DATASET);
+    boolean found = false;
+    Iterator<Table> tableIterator = tables.getValues().iterator();
+    // Find createdTable and validate the table definition.
+    while (tableIterator.hasNext() && !found) {
+      Table table = tableIterator.next();
+      if (table.getTableId().equals(createdTable.getTableId())) {
+        StandardTableDefinition definition = table.getDefinition();
+        assertThat(definition.getClustering()).isNotNull();
+        assertThat(definition.getTimePartitioning()).isNotNull();
+        found = true;
+      }
+    }
+    assertTrue(found);
+    assertTrue(createdTable.delete());
+  }
+
   @Test
   public void testCreateAndGetTableWithBasicTableMetadataView() {
     String tableName = "test_create_and_get_table_with_basic_metadata_view";