Return correct nullable value in system.jdbc.columns

trinodb · Mar 24, 2022 · 92e43cd · 92e43cd
1 parent 98cfaf6
commit 92e43cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java b/client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java
@@ -658,6 +658,7 @@ public void testGetColumns()
                 assertEquals(rs.getString("TABLE_SCHEM"), "information_schema");
                 assertEquals(rs.getString("TABLE_NAME"), "tables");
                 assertEquals(rs.getString("COLUMN_NAME"), "table_name");
+                assertEquals(rs.getString("IS_NULLABLE"), "YES");
                 assertEquals(rs.getInt("DATA_TYPE"), Types.VARCHAR);
                 assertTrue(rs.next());
                 assertEquals(rs.getString("TABLE_CAT"), "hive");
@@ -724,6 +725,14 @@ public void testGetColumns()
             }
         }
 
+        try (Connection connection = createConnection()) {
+            try (ResultSet rs = connection.getMetaData().getColumns(TEST_CATALOG, "tiny", "supplier", "suppkey")) {
+                assertColumnMetadata(rs);
+                assertTrue(rs.next());
+                assertEquals(rs.getString("IS_NULLABLE"), "NO");
+            }
+        }
+
         try (Connection connection = createConnection("blackhole", "blackhole");
                 Statement statement = connection.createStatement()) {
             assertEquals(statement.executeUpdate(

diff --git a/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ColumnJdbcTable.java b/core/trino-main/src/main/java/io/trino/connector/system/jdbc/ColumnJdbcTable.java
@@ -326,7 +326,7 @@ private static void addColumnRows(Builder builder, String catalog, SchemaTableNa
                     null,
                     charOctetLength(column.getType()),
                     ordinalPosition,
-                    "",
+                    column.isNullable() ? "YES" : "NO",
                     null,
                     null,
                     null,

diff --git a/...no-product-tests/src/main/resources/io/trino/tests/product/jdbc/get_nation_columns.result b/...no-product-tests/src/main/resources/io/trino/tests/product/jdbc/get_nation_columns.result
@@ -1,5 +1,5 @@
 -- delimiter: |; ignoreOrder: false; ignoreExcessRows: false;
-hive|default|nation|n_nationkey|-5|bigint|19|0|null|10|2|null|null|null|null|null|1||null|null|null|null|null|null|
-hive|default|nation|n_name|12|varchar(25)|25|0|null|null|2|null|null|null|null|25|2||null|null|null|null|null|null|
-hive|default|nation|n_regionkey|-5|bigint|19|0|null|10|2|null|null|null|null|null|3||null|null|null|null|null|null|
-hive|default|nation|n_comment|12|varchar(152)|152|0|null|null|2|null|null|null|null|152|4||null|null|null|null|null|null|
+hive|default|nation|n_nationkey|-5|bigint|19|0|null|10|2|null|null|null|null|null|1|YES|null|null|null|null|null|null|
+hive|default|nation|n_name|12|varchar(25)|25|0|null|null|2|null|null|null|null|25|2|YES|null|null|null|null|null|null|
+hive|default|nation|n_regionkey|-5|bigint|19|0|null|10|2|null|null|null|null|null|3|YES|null|null|null|null|null|null|
+hive|default|nation|n_comment|12|varchar(152)|152|0|null|null|2|null|null|null|null|152|4|YES|null|null|null|null|null|null|
-Original file line number
+Diff line change
@@ Expand Up @@
                         null,
                         charOctetLength(column.getType()),
                         ordinalPosition,
-                        "",
+                        column.isNullable() ? "YES" : "NO",
                         null,
                         null,
                         null,
@@ Expand Down @@