Merge pull request #137791 from cockroachdb/blathers/backport-release…

…-24.2-137744 release-24.2: sql: allow CLOSE CURSOR in read-only txns
cockroachdb · Dec 24, 2024 · 4aec7dd · 4aec7dd
2 parents edcaac3 + 05321e6
commit 4aec7dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/txn b/pkg/sql/logictest/testdata/logic_test/txn
@@ -1483,13 +1483,16 @@ SET SESSION AUTHORIZATION DEFAULT
 statement ok
 BEGIN
 
-# DECLARE and FETCH CURSOR should work in a read-only txn.
+# DECLARE, FETCH, and CLOSE CURSOR should work in a read-only txn.
 statement ok
 DECLARE foo CURSOR FOR SELECT 1
 
 statement ok
 FETCH 1 foo
 
+statement ok
+CLOSE foo
+
 statement ok
 COMMIT
 

diff --git a/pkg/sql/sem/tree/stmt.go b/pkg/sql/sem/tree/stmt.go
@@ -749,7 +749,7 @@ func (*CannedOptPlan) StatementTag() string { return "PREPARE AS OPT PLAN" }
 func (*CloseCursor) StatementReturnType() StatementReturnType { return Ack }
 
 // StatementType implements the Statement interface.
-func (*CloseCursor) StatementType() StatementType { return TypeDCL }
+func (*CloseCursor) StatementType() StatementType { return TypeDML }
 
 // StatementTag returns a short string identifying the type of statement.
 func (*CloseCursor) StatementTag() string { return "CLOSE" }