From d9303e48429133396443a4eeb35cdd45e1225b29 Mon Sep 17 00:00:00 2001
From: Yuya Ebihara <ebyhry@gmail.com>
Date: Mon, 13 Apr 2026 08:16:16 +0900
Subject: [PATCH] Fix DESCRIBE OUTPUT with versioned tables

---
 .../trino/sql/analyzer/StatementAnalyzer.java |  6 ++---
 .../iceberg/BaseIcebergConnectorTest.java     | 26 +++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
index cac970de0786..c51a1d2edaac 100644
--- a/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
+++ b/core/trino-main/src/main/java/io/trino/sql/analyzer/StatementAnalyzer.java
@@ -6071,9 +6071,6 @@ private Optional<TableVersion> extractTableVersion(Table table, Optional<Express
             if (version.isEmpty()) {
                 return tableVersion;
             }
-            if (analysis.isDescribe()) {
-                throw semanticException(NOT_SUPPORTED, table, "DESCRIBE is not supported if a versioned table uses parameters");
-            }
             ExpressionAnalysis expressionAnalysis = analyzeExpression(version.get(), scope.get());
             analysis.recordSubqueries(table, expressionAnalysis);
 
@@ -6081,6 +6078,9 @@ private Optional<TableVersion> extractTableVersion(Table table, Optional<Express
             Type versionType = expressionAnalysis.getType(version.get());
             PointerType pointerType = toPointerType(table.getQueryPeriod().get().getRangeType());
             if (versionType == UNKNOWN) {
+                if (analysis.isDescribe()) {
+                    throw semanticException(NOT_SUPPORTED, table, "DESCRIBE is not supported if a versioned table uses parameters");
+                }
                 throw semanticException(INVALID_ARGUMENTS, table.getQueryPeriod().get(), "Pointer value cannot be NULL");
             }
             Object evaluatedVersion = evaluateConstant(version.get(), versionType, analysis.getParameters(), plannerContext, session, accessControl);
diff --git a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
index 9bd3a382daab..2b1564e64a51 100644
--- a/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
+++ b/plugin/trino-iceberg/src/test/java/io/trino/plugin/iceberg/BaseIcebergConnectorTest.java
@@ -7948,6 +7948,32 @@ public void testPreparedStatementWithParameterizedVersionedTable()
         assertQueryFails(session, "DESCRIBE OUTPUT my_query", ".* DESCRIBE is not supported if a versioned table uses parameters");
     }
 
+    @Test
+    public void testDescribeOutputWithVersionedTable()
+    {
+        try (TestTable table = newTrinoTable("test", "(x int)", List.of("1"))) {
+            Session firstSession = Session.builder(getSession())
+                    .addPreparedStatement("my_query", "SELECT * FROM %s FOR VERSION AS OF %s".formatted(table.getName(), getCurrentSnapshotId(table.getName())))
+                    .build();
+            assertThat(query(firstSession, "DESCRIBE OUTPUT my_query"))
+                    .matches("VALUES ('x', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)");
+
+            // Add a new snapshot with a new column for a different output
+            assertUpdate("ALTER TABLE " + table.getName() + " ADD COLUMN y int");
+            assertUpdate("INSERT INTO " + table.getName() + " VALUES (2, 2)", 1);
+
+            Session secondSession = Session.builder(getSession())
+                    .addPreparedStatement("my_query", "SELECT * FROM %s FOR VERSION AS OF %s".formatted(table.getName(), getCurrentSnapshotId(table.getName())))
+                    .build();
+            assertThat(query(firstSession, "DESCRIBE OUTPUT my_query"))
+                    .matches("VALUES ('x', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)");
+            assertThat(query(secondSession, "DESCRIBE OUTPUT my_query"))
+                    .matches("VALUES" +
+                            "('x', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)," +
+                            "('y', 'iceberg', 'tpch', '" + table.getName() + "', 'integer', 4, false)");
+        }
+    }
+
     @Test
     public void testDeleteRetainsTableHistory()
     {