From 3ebd9387c4515cc5272e12e0138cd8035fedaaea Mon Sep 17 00:00:00 2001 From: amit Date: Tue, 12 Dec 2017 10:33:11 +0900 Subject: [PATCH v3] Allow Boolean values in partition FOR VALUES clause --- doc/src/sgml/ref/create_table.sgml | 6 +++--- src/backend/parser/gram.y | 24 +++++++++++++++++++----- src/test/regress/expected/create_table.out | 14 ++++++++++++++ src/test/regress/sql/create_table.sql | 7 +++++++ 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index a0c9a6d257..eaa79ae333 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -86,9 +86,9 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI and partition_bound_spec is: -IN ( { numeric_literal | string_literal | NULL } [, ...] ) | -FROM ( { numeric_literal | string_literal | MINVALUE | MAXVALUE } [, ...] ) - TO ( { numeric_literal | string_literal | MINVALUE | MAXVALUE } [, ...] ) | +IN ( { numeric_literal | string_literal | TRUE | FALSE | NULL } [, ...] ) | +FROM ( { numeric_literal | string_literal | TRUE | FALSE | MINVALUE | MAXVALUE } [, ...] ) + TO ( { numeric_literal | string_literal | TRUE | FALSE | MINVALUE | MAXVALUE } [, ...] ) | WITH ( MODULUS numeric_literal, REMAINDER numeric_literal ) index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are: diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 459a227e57..15b5c85a6e 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -152,6 +152,7 @@ static Node *makeFloatConst(char *str, int location); static Node *makeBitStringConst(char *str, int location); static Node *makeNullAConst(int location); static Node *makeAConst(Value *v, int location); +static Node *makeBoolAConstCast(bool state, int location); static Node *makeBoolAConst(bool state, int location); static RoleSpec *makeRoleSpec(RoleSpecType type, int location); static void check_qualified_name(List *names, core_yyscan_t yyscanner); @@ -2793,6 +2794,8 @@ partbound_datum: Sconst { $$ = makeStringConst($1, @1); } | NumericOnly { $$ = makeAConst($1, @1); } | NULL_P { $$ = makeNullAConst(@1); } + | TRUE_P { $$ = makeBoolAConst(true, @1); } + | FALSE_P { $$ = makeBoolAConst(false, @1); } ; partbound_datum_list: @@ -13826,7 +13829,7 @@ func_expr_common_subexpr: { XmlExpr *x = (XmlExpr *) makeXmlExpr(IS_XMLPARSE, NULL, NIL, - list_make2($4, makeBoolAConst($5, -1)), + list_make2($4, makeBoolAConstCast($5, -1)), @1); x->xmloption = $3; $$ = (Node *)x; @@ -14777,11 +14780,11 @@ AexprConst: Iconst } | TRUE_P { - $$ = makeBoolAConst(true, @1); + $$ = makeBoolAConstCast(true, @1); } | FALSE_P { - $$ = makeBoolAConst(false, @1); + $$ = makeBoolAConstCast(false, @1); } | NULL_P { @@ -15597,10 +15600,21 @@ makeAConst(Value *v, int location) return n; } -/* makeBoolAConst() +/* makeBoolAConstCast() * Create an A_Const string node and put it inside a boolean cast. */ static Node * +makeBoolAConstCast(bool state, int location) +{ + A_Const *n = (A_Const *) makeBoolAConst(state, location); + + return makeTypeCast((Node *)n, SystemTypeName("bool"), -1); +} + +/* makeBoolAConst() + * Create an A_Const string node containing valid bool type values. + */ +static Node * makeBoolAConst(bool state, int location) { A_Const *n = makeNode(A_Const); @@ -15609,7 +15623,7 @@ makeBoolAConst(bool state, int location) n->val.val.str = (state ? "t" : "f"); n->location = location; - return makeTypeCast((Node *)n, SystemTypeName("bool"), -1); + return (Node *) n; } /* makeRoleSpec diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index 8e745402ae..c541a652c4 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -863,3 +863,17 @@ Partition key: LIST (a) Number of partitions: 0 DROP TABLE parted_col_comment; +-- boolean partitions +create table boolspart (a bool) partition by list (a); +create table boolspart_t partition of boolspart for values in (true); +create table boolspart_f partition of boolspart for values in (false); +\d+ boolspart + Table "public.boolspart" + Column | Type | Collation | Nullable | Default | Storage | Stats target | Description +--------+---------+-----------+----------+---------+---------+--------------+------------- + a | boolean | | | | plain | | +Partition key: LIST (a) +Partitions: boolspart_f FOR VALUES IN (false), + boolspart_t FOR VALUES IN (true) + +drop table boolspart; diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index 8f9991ef18..c71e9f938e 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -707,3 +707,10 @@ COMMENT ON COLUMN parted_col_comment.a IS 'Partition key'; SELECT obj_description('parted_col_comment'::regclass); \d+ parted_col_comment DROP TABLE parted_col_comment; + +-- boolean partitions +create table boolspart (a bool) partition by list (a); +create table boolspart_t partition of boolspart for values in (true); +create table boolspart_f partition of boolspart for values in (false); +\d+ boolspart +drop table boolspart; -- 2.11.0