summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Korotkov <akorotkov@postgresql.org>2023-04-23 13:55:49 +0300
committerAlexander Korotkov <akorotkov@postgresql.org>2023-04-23 13:58:41 +0300
commitcd115c3530bd59bb0305d62ccef1c9504207ff4c (patch)
treeb4129e01bc1f0374fa1476e451317b5e91951ef7
parent0ec0e2095579ca16fb4f3aee086e57fd1a7533eb (diff)
downloadpostgresql-cd115c3530bd59bb0305d62ccef1c9504207ff4c.tar.gz
Fix custom validators call in build_local_reloptions()
We need to call them only when validate == true. Backpatch to 13, where opclass options were introduced. Reported-by: Tom Lane Discussion: https://postgr.es/m/2656633.1681831542%40sss.pgh.pa.us Reviewed-by: Tom Lane, Pavel Borisov Backpatch-through: 13
-rw-r--r--src/backend/access/common/reloptions.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index 14c23101ad..90cb3951fc 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -1969,8 +1969,9 @@ build_local_reloptions(local_relopts *relopts, Datum options, bool validate)
fillRelOptions(opts, relopts->relopt_struct_size, vals, noptions, validate,
elems, noptions);
- foreach(lc, relopts->validators)
- ((relopts_validator) lfirst(lc)) (opts, vals, noptions);
+ if (validate)
+ foreach(lc, relopts->validators)
+ ((relopts_validator) lfirst(lc)) (opts, vals, noptions);
if (elems)
pfree(elems);