sql: allow EXECUTE parameter to be assignment cast

Release note (bug fix): Fixed a bug where EXECUTE did not accept placeholder arguments if the type did not exactly match.
cockroachdb · Aug 10, 2022 · 76d3266 · 76d3266
1 parent 8bcd0cd
commit 76d3266
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/pkg/sql/execute.go b/pkg/sql/execute.go
@@ -54,7 +54,7 @@ func (p *planner) fillInPlaceholders(
 			}
 		}
 		typedExpr, err := schemaexpr.SanitizeVarFreeExpr(
-			ctx, e, typ, "EXECUTE parameter" /* context */, &semaCtx, volatility.Volatile, false, /*allowAssignmentCast*/
+			ctx, e, typ, "EXECUTE parameter" /* context */, &semaCtx, volatility.Volatile, true, /*allowAssignmentCast*/
 		)
 		if err != nil {
 			return nil, pgerror.WithCandidateCode(err, pgcode.WrongObjectType)

diff --git a/pkg/sql/logictest/testdata/logic_test/cast b/pkg/sql/logictest/testdata/logic_test/cast
@@ -263,10 +263,14 @@ INSERT INTO assn_cast(s) VALUES (1)
 statement ok
 PREPARE insert_s AS INSERT INTO assn_cast(s) VALUES ($1)
 
-# TODO(mgartner): This should succeed to match the behavior of Postgres.
-statement error expected EXECUTE parameter expression to have type string, but \'1\' has type int
-EXECUTE insert_s(1)
+statement ok
+EXECUTE insert_s(2)
 
+query T rowsort
+SELECT s FROM assn_cast WHERE s IS NOT NULL
+----
+1
+2
 
 # Tests for assignment casts of DEFAULT expressions.
 subtest assignment_casts_default

diff --git a/pkg/sql/logictest/testdata/logic_test/prepare b/pkg/sql/logictest/testdata/logic_test/prepare
@@ -86,8 +86,10 @@ EXECUTE a(3, 1)
 query error could not parse "foo" as type int
 EXECUTE a('foo', 1)
 
-query error expected EXECUTE parameter expression to have type int, but '3.5' has type decimal
+query I
 EXECUTE a(3.5, 1)
+----
+5
 
 query error aggregate functions are not allowed in EXECUTE parameter
 EXECUTE a(max(3), 1)
@@ -162,21 +164,24 @@ EXECUTE i(2)
 query error could not parse "foo" as type int
 EXECUTE i('foo')
 
-query error expected EXECUTE parameter expression to have type int, but '2.3' has type decimal
-EXECUTE i(2.3)
-
 query I
-EXECUTE i(3.3::int)
+EXECUTE i(3.3)
 ----
 4
 
+query I
+EXECUTE i(4.3::int)
+----
+5
+
 query I colnames
 EXECUTE s
 ----
 a
 1
 2
 3
+4
 
 # DISCARD ROWS drops the results, but does not affect the schema or the
 # internal plan.
@@ -286,12 +291,13 @@ EXECUTE wrongTypeImpossibleCast('crabgas')
 statement ok
 PREPARE s AS SELECT a FROM t; PREPARE p1 AS UPSERT INTO t(a) VALUES($1) RETURNING a
 
-query I
+query I rowsort
 EXECUTE s
 ----
 1
 2
 3
+4
 
 query I
 EXECUTE p1(123)
@@ -301,31 +307,34 @@ EXECUTE p1(123)
 statement ok
 PREPARE p2 AS UPDATE t SET a = a + $1 RETURNING a
 
-query I
+query I rowsort
 EXECUTE s
 ----
 1
 2
 3
+4
 123
 
-query I
+query I rowsort
 EXECUTE p2(123)
 ----
 124
 125
 126
+127
 246
 
 statement ok
 PREPARE p3 AS DELETE FROM t WHERE a = $1 RETURNING a
 
-query I
+query I rowsort
 EXECUTE s
 ----
 124
 125
 126
+127
 246
 
 query I
@@ -1418,5 +1427,7 @@ CREATE TABLE t81315_2 (
 PREPARE q81315_2 AS SELECT * FROM t81315_2 WHERE k = $1;
 INSERT INTO t81315_2 VALUES (1, 1)
 
-statement error expected EXECUTE parameter expression to have type int
+query II
 EXECUTE q81315_2(1::DECIMAL)
+----
+1  1