fixup! Support creating table with column comment in Delta Lake

plugin/trino-delta-lake/src/main/java/io/trino/plugin/deltalake/transactionlog/DeltaLakeSchemaSupport.java

@@ -371,14 +371,8 @@ private static Optional<Location> getLocation(JsonProcessingException e)
 
     private static Optional<String> getComment(JsonNode node)
     {
-        JsonNode metadata = node.get("metadata");
-        if (metadata == null) {
-            return Optional.empty();
-        }
-        JsonNode comment = metadata.get("comment");
-        if (comment == null) {
-            return Optional.empty();
-        }
-        return Optional.ofNullable(comment.asText());
+        return Optional.ofNullable(node.get("metadata"))
+                .map(metadata -> metadata.get("comment"))
+                .map(JsonNode::asText);
     }
 }

testing/trino-product-tests/src/main/java/io/trino/tests/product/deltalake/TestDeltaLakeOssCreateTable.java

@@ -0,0 +1,56 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.trino.tests.product.deltalake;
+
+import io.trino.tempto.ProductTest;
+import io.trino.tempto.query.QueryResult;
+import org.testng.annotations.Test;
+
+import static io.trino.tempto.assertions.QueryAssert.Row.row;
+import static io.trino.tempto.assertions.QueryAssert.assertThat;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_DATABRICKS;
+import static io.trino.tests.product.TestGroups.DELTA_LAKE_OSS;
+import static io.trino.tests.product.TestGroups.PROFILE_SPECIFIC_TESTS;
+import static io.trino.tests.product.hive.util.TemporaryHiveTable.randomTableSuffix;
+import static io.trino.tests.product.utils.QueryExecutors.onDelta;
+import static io.trino.tests.product.utils.QueryExecutors.onTrino;
+import static java.lang.String.format;
+import static org.testng.Assert.assertEquals;
+
+public class TestDeltaLakeOssCreateTable
+        extends ProductTest
+{
+    @Test(groups = {DELTA_LAKE_DATABRICKS, DELTA_LAKE_OSS, PROFILE_SPECIFIC_TESTS})
+    public void testCreateTableWithColumnComment()
+    {
+        String tableName = "delta_column_comment_" + randomTableSuffix();
+        onTrino().executeQuery("CREATE TABLE default." + tableName + "(col INT COMMENT 'test comment')");
+
+        try {
+            assertThat(onTrino().executeQuery("SELECT comment FROM information_schema.columns WHERE table_schema = 'default' AND table_name = '" + tableName + "' AND column_name = 'col'"))
+                    .containsOnly(row("test comment"));
+
+            assertEquals(getColumnCommentOnDelta("default", tableName, "col"), "test comment");
+        }
+        finally {
+            onTrino().executeQuery("DROP TABLE IF EXISTS " + tableName);
+        }
+    }
+
+    private static String getColumnCommentOnDelta(String schemaName, String tableName, String columnName)
+    {
+        QueryResult result = onDelta().executeQuery(format("DESCRIBE %s.%s %s", schemaName, tableName, columnName));
+        return (String) result.row(2).get(1);
+    }
+}