diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index 7094016a9c..b11220119d 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -915,7 +915,8 @@ add_local_bool_reloption(local_relopts *relopts, const char *name, */ static relopt_ternary * init_ternary_reloption(uint32 kinds, const char *name, const char *desc, - pg_ternary default_val, const char* unset_alias, LOCKMODE lockmode) + pg_ternary default_val, const char *unset_alias, + LOCKMODE lockmode) { relopt_ternary *newoption; @@ -933,7 +934,8 @@ init_ternary_reloption(uint32 kinds, const char *name, const char *desc, */ void add_ternary_reloption(uint32 kinds, const char *name, const char *desc, - pg_ternary default_val, const char* unset_alias, LOCKMODE lockmode) + pg_ternary default_val, const char *unset_alias, + LOCKMODE lockmode) { relopt_ternary *newoption; @@ -952,7 +954,7 @@ add_ternary_reloption(uint32 kinds, const char *name, const char *desc, void add_local_ternary_reloption(local_relopts *relopts, const char *name, const char *desc, pg_ternary default_val, - const char* unset_alias, int offset) + const char *unset_alias, int offset) { relopt_ternary *newoption; @@ -1723,10 +1725,10 @@ parse_one_reloption(relopt_value *option, char *text_str, int text_len, if (validate && !parsed) ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("invalid value for option \"%s\": %s", + errmsg("invalid value for option \"%s\": %s", option->gen->name, value), - errdetail("Valid values are \"on\", \"off\", and \"%s\".", - opt->unset_alias))); + errdetail("Valid values are \"on\", \"off\", \"true\", \"false\", \"yes\", \"no\", \"1\", \"0\", and \"%s\".", + opt->unset_alias))); } break; case RELOPT_TYPE_INT: @@ -1901,7 +1903,8 @@ fillRelOptions(void *rdopts, Size basesize, break; case RELOPT_TYPE_TERNARY: *(pg_ternary *) itempos = options[i].isset ? - options[i].ternary_val : PG_TERNARY_UNSET; + options[i].ternary_val : + ((relopt_ternary *) options[i].gen)->default_val; break; case RELOPT_TYPE_INT: *(int *) itempos = options[i].isset ? diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c index 0f58f61879..2d69c3549b 100644 --- a/src/backend/access/gist/gistutil.c +++ b/src/backend/access/gist/gistutil.c @@ -913,7 +913,8 @@ gistoptions(Datum reloptions, bool validate) { static const relopt_parse_elt tab[] = { {"fillfactor", RELOPT_TYPE_INT, offsetof(GiSTOptions, fillfactor)}, - {"buffering", RELOPT_TYPE_ENUM, offsetof(GiSTOptions, buffering_mode)} + {"buffering", RELOPT_TYPE_TERNARY, + offsetof(GiSTOptions, buffering_mode)} }; return (bytea *) build_reloptions(reloptions, validate, diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h index 1c5ea85e76..599a99ec2e 100644 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@ -98,8 +98,8 @@ typedef struct relopt_bool typedef struct relopt_ternary { relopt_gen gen; - const char *unset_alias; /* word that will be treated as unset value */ - int default_val; + const char *unset_alias; /* word treated as unset, or NULL */ + pg_ternary default_val; } relopt_ternary; typedef struct relopt_int @@ -191,8 +191,8 @@ extern relopt_kind add_reloption_kind(void); extern void add_bool_reloption(uint32 kinds, const char *name, const char *desc, bool default_val, LOCKMODE lockmode); extern void add_ternary_reloption(uint32 kinds, const char *name, - const char *desc, pg_ternary default_val, - const char* unset_alias, LOCKMODE lockmode); + const char *desc, pg_ternary default_val, + const char *unset_alias, LOCKMODE lockmode); extern void add_int_reloption(uint32 kinds, const char *name, const char *desc, int default_val, int min_val, int max_val, LOCKMODE lockmode); @@ -213,9 +213,9 @@ extern void add_local_bool_reloption(local_relopts *relopts, const char *name, const char *desc, bool default_val, int offset); extern void add_local_ternary_reloption(local_relopts *relopts, - const char *name, const char *desc, - pg_ternary default_val, const char* unset_alias, - int offset); + const char *name, const char *desc, + pg_ternary default_val, + const char *unset_alias, int offset); extern void add_local_int_reloption(local_relopts *relopts, const char *name, const char *desc, int default_val, int min_val, int max_val, int offset); diff --git a/src/test/modules/dummy_index_am/expected/reloptions.out b/src/test/modules/dummy_index_am/expected/reloptions.out index 90abbe2e37..ea07de1d6e 100644 --- a/src/test/modules/dummy_index_am/expected/reloptions.out +++ b/src/test/modules/dummy_index_am/expected/reloptions.out @@ -123,7 +123,7 @@ ERROR: invalid value for boolean option "option_ternary_1": do_not_know_yet ALTER INDEX dummy_test_idx SET (option_ternary_2 = 'do_not_know_yet'); -- ok ALTER INDEX dummy_test_idx SET (option_ternary_2 = 'illegal_value'); -- error ERROR: invalid value for option "option_ternary_2": illegal_value -DETAIL: Valid values are "on", "off", and "do_not_know_yet". +DETAIL: Valid values are "on", "off", "true", "false", "yes", "no", "1", "0", and "do_not_know_yet". SELECT unnest(reloptions) FROM pg_class WHERE relname = 'dummy_test_idx'; unnest ---------------------------------- diff --git a/src/test/regress/expected/gist.out b/src/test/regress/expected/gist.out index 19dc547d5f..ea2acb8fbe 100644 --- a/src/test/regress/expected/gist.out +++ b/src/test/regress/expected/gist.out @@ -9,11 +9,12 @@ create index gist_pointidx on gist_point_tbl using gist(p); create index gist_pointidx2 on gist_point_tbl using gist(p) with (buffering = on, fillfactor=50); create index gist_pointidx3 on gist_point_tbl using gist(p) with (buffering = off); create index gist_pointidx4 on gist_point_tbl using gist(p) with (buffering = auto); -drop index gist_pointidx2, gist_pointidx3, gist_pointidx4; +create index gist_pointidx4b on gist_point_tbl using gist(p) with (buffering = true); +drop index gist_pointidx2, gist_pointidx3, gist_pointidx4, gist_pointidx4b; -- Make sure bad values are refused create index gist_pointidx5 on gist_point_tbl using gist(p) with (buffering = invalid_value); ERROR: invalid value for option "buffering": invalid_value -DETAIL: Valid values are "on", "off", and "auto". +DETAIL: Valid values are "on", "off", "true", "false", "yes", "no", "1", "0", and "auto". create index gist_pointidx5 on gist_point_tbl using gist(p) with (fillfactor=9); ERROR: value 9 out of bounds for option "fillfactor" DETAIL: Valid values are between "10" and "100". diff --git a/src/test/regress/expected/reloptions.out b/src/test/regress/expected/reloptions.out index 6e65cd5c3d..d85eb68380 100644 --- a/src/test/regress/expected/reloptions.out +++ b/src/test/regress/expected/reloptions.out @@ -134,6 +134,23 @@ SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass; {vacuum_index_cleanup=auto} (1 row) +-- boolean synonyms are accepted +DROP TABLE reloptions_test; +CREATE TABLE reloptions_test(i INT) WITH (vacuum_index_cleanup=true); +SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass; + reloptions +----------------------------- + {vacuum_index_cleanup=true} +(1 row) + +DROP TABLE reloptions_test; +CREATE TABLE reloptions_test(i INT) WITH (vacuum_index_cleanup=false); +SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass; + reloptions +------------------------------ + {vacuum_index_cleanup=false} +(1 row) + -- Test vacuum_truncate option DROP TABLE reloptions_test; CREATE TEMP TABLE reloptions_test(i INT NOT NULL, j text) diff --git a/src/test/regress/sql/gist.sql b/src/test/regress/sql/gist.sql index 6f1fc65f12..0683574719 100644 --- a/src/test/regress/sql/gist.sql +++ b/src/test/regress/sql/gist.sql @@ -11,7 +11,8 @@ create index gist_pointidx on gist_point_tbl using gist(p); create index gist_pointidx2 on gist_point_tbl using gist(p) with (buffering = on, fillfactor=50); create index gist_pointidx3 on gist_point_tbl using gist(p) with (buffering = off); create index gist_pointidx4 on gist_point_tbl using gist(p) with (buffering = auto); -drop index gist_pointidx2, gist_pointidx3, gist_pointidx4; +create index gist_pointidx4b on gist_point_tbl using gist(p) with (buffering = true); +drop index gist_pointidx2, gist_pointidx3, gist_pointidx4, gist_pointidx4b; -- Make sure bad values are refused create index gist_pointidx5 on gist_point_tbl using gist(p) with (buffering = invalid_value); diff --git a/src/test/regress/sql/reloptions.sql b/src/test/regress/sql/reloptions.sql index c99673db9e..d4ba177090 100644 --- a/src/test/regress/sql/reloptions.sql +++ b/src/test/regress/sql/reloptions.sql @@ -80,6 +80,14 @@ DROP TABLE reloptions_test; CREATE TABLE reloptions_test(i INT) WITH (vacuum_index_cleanup=auto); SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass; +-- boolean synonyms are accepted +DROP TABLE reloptions_test; +CREATE TABLE reloptions_test(i INT) WITH (vacuum_index_cleanup=true); +SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass; +DROP TABLE reloptions_test; +CREATE TABLE reloptions_test(i INT) WITH (vacuum_index_cleanup=false); +SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass; + -- Test vacuum_truncate option DROP TABLE reloptions_test;