Merge pull request #86885 from rafiss/backport22.1-86607

cockroachdb · Aug 26, 2022 · 9afc3fe · 9afc3fe
2 parents ec7de3c + 958ea0c
commit 9afc3fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/sql/conn_executor_exec.go b/pkg/sql/conn_executor_exec.go
@@ -815,7 +815,7 @@ func formatWithPlaceholders(ast tree.Statement, evalCtx *tree.EvalContext) strin
 			fmtFlags,
 			tree.FmtPlaceholderFormat(func(ctx *tree.FmtCtx, placeholder *tree.Placeholder) {
 				d, err := placeholder.Eval(evalCtx)
-				if err != nil {
+				if err != nil || d == nil {
 					// Fall back to the default behavior if something goes wrong.
 					ctx.Printf("$%d", placeholder.Idx+1)
 					return