From 106f8259d34a40294217f2a6e511d869c7d0c959 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 26 Oct 2010 11:40:06 -0300 Subject: [PATCH] Change syntax to add a new enum value to ALTER TYPE ADD LABEL Per discussion. --- doc/src/sgml/ref/alter_type.sgml | 8 ++-- src/backend/parser/gram.y | 16 ++++---- src/test/regress/expected/enum.out | 74 ++++++++++++++++++------------------ src/test/regress/sql/enum.sql | 74 ++++++++++++++++++------------------ 4 files changed, 86 insertions(+), 86 deletions(-) diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml index 90de2e8..13c39f9 100644 --- a/doc/src/sgml/ref/alter_type.sgml +++ b/doc/src/sgml/ref/alter_type.sgml @@ -28,7 +28,7 @@ ALTER TYPE name OWNER TO name RENAME ATTRIBUTE attribute_name TO new_attribute_name ALTER TYPE name RENAME TO new_name ALTER TYPE name SET SCHEMA new_schema -ALTER TYPE name ADD new_enum_value [ { BEFORE | AFTER } existing_enum_value ] +ALTER TYPE name ADD LABEL new_enum_value [ { BEFORE | AFTER } existing_enum_value ] where action is one of: @@ -106,7 +106,7 @@ ALTER TYPE name ADD - ADD [ BEFORE | AFTER ] + ADD LABEL [ BEFORE | AFTER ] This form adds a new value to an enum type. If the new value's place in @@ -238,7 +238,7 @@ ALTER TYPE name ADD Notes - ALTER TYPE ... ADD (the form that adds a new value to an + ALTER TYPE ... ADD LABEL (the form that adds a new value to an enum type) cannot be executed inside a transaction block. @@ -292,7 +292,7 @@ ALTER TYPE compfoo ADD ATTRIBUTE f3 int; To add a new value to an enum type in a particular sort position: -ALTER TYPE colors ADD 'orange' AFTER 'red'; +ALTER TYPE colors ADD LABEL 'orange' AFTER 'red'; diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 1394b21..5847531 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -3871,30 +3871,30 @@ enum_val_list: Sconst *****************************************************************************/ AlterEnumStmt: - ALTER TYPE_P any_name ADD_P Sconst + ALTER TYPE_P any_name ADD_P LABEL Sconst { AlterEnumStmt *n = makeNode(AlterEnumStmt); n->typeName = $3; - n->newVal = $5; + n->newVal = $6; n->newValNeighbor = NULL; n->newValIsAfter = true; $$ = (Node *) n; } - | ALTER TYPE_P any_name ADD_P Sconst BEFORE Sconst + | ALTER TYPE_P any_name ADD_P LABEL Sconst BEFORE Sconst { AlterEnumStmt *n = makeNode(AlterEnumStmt); n->typeName = $3; - n->newVal = $5; - n->newValNeighbor = $7; + n->newVal = $6; + n->newValNeighbor = $8; n->newValIsAfter = false; $$ = (Node *) n; } - | ALTER TYPE_P any_name ADD_P Sconst AFTER Sconst + | ALTER TYPE_P any_name ADD_P LABEL Sconst AFTER Sconst { AlterEnumStmt *n = makeNode(AlterEnumStmt); n->typeName = $3; - n->newVal = $5; - n->newValNeighbor = $7; + n->newVal = $6; + n->newValNeighbor = $8; n->newValIsAfter = true; $$ = (Node *) n; } diff --git a/src/test/regress/expected/enum.out b/src/test/regress/expected/enum.out index b1ba3f1..34ecc86 100644 --- a/src/test/regress/expected/enum.out +++ b/src/test/regress/expected/enum.out @@ -39,7 +39,7 @@ ORDER BY 2; mars | 3 (3 rows) -ALTER TYPE planets ADD 'uranus'; +ALTER TYPE planets ADD LABEL 'uranus'; SELECT enumlabel, enumsortorder FROM pg_enum WHERE enumtypid = 'planets'::regtype @@ -52,10 +52,10 @@ ORDER BY 2; uranus | 4 (4 rows) -ALTER TYPE planets ADD 'mercury' BEFORE 'venus'; -ALTER TYPE planets ADD 'saturn' BEFORE 'uranus'; -ALTER TYPE planets ADD 'jupiter' AFTER 'mars'; -ALTER TYPE planets ADD 'neptune' AFTER 'uranus'; +ALTER TYPE planets ADD LABEL 'mercury' BEFORE 'venus'; +ALTER TYPE planets ADD LABEL 'saturn' BEFORE 'uranus'; +ALTER TYPE planets ADD LABEL 'jupiter' AFTER 'mars'; +ALTER TYPE planets ADD LABEL 'neptune' AFTER 'uranus'; SELECT enumlabel, enumsortorder FROM pg_enum WHERE enumtypid = 'planets'::regtype @@ -89,46 +89,46 @@ ORDER BY enumlabel::planets; (8 rows) -- errors for adding labels -ALTER TYPE planets ADD +ALTER TYPE planets ADD LABEL 'plutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutopluto'; ERROR: invalid enum label "plutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutopluto" DETAIL: Labels must be 63 characters or less. -ALTER TYPE planets ADD 'pluto' AFTER 'zeus'; +ALTER TYPE planets ADD LABEL 'pluto' AFTER 'zeus'; ERROR: "zeus" is not an existing enum label -- -- Test inserting so many values that we have to renumber -- create type insenum as enum ('L1', 'L2'); -alter type insenum add 'i1' before 'L2'; -alter type insenum add 'i2' before 'L2'; -alter type insenum add 'i3' before 'L2'; -alter type insenum add 'i4' before 'L2'; -alter type insenum add 'i5' before 'L2'; -alter type insenum add 'i6' before 'L2'; -alter type insenum add 'i7' before 'L2'; -alter type insenum add 'i8' before 'L2'; -alter type insenum add 'i9' before 'L2'; -alter type insenum add 'i10' before 'L2'; -alter type insenum add 'i11' before 'L2'; -alter type insenum add 'i12' before 'L2'; -alter type insenum add 'i13' before 'L2'; -alter type insenum add 'i14' before 'L2'; -alter type insenum add 'i15' before 'L2'; -alter type insenum add 'i16' before 'L2'; -alter type insenum add 'i17' before 'L2'; -alter type insenum add 'i18' before 'L2'; -alter type insenum add 'i19' before 'L2'; -alter type insenum add 'i20' before 'L2'; -alter type insenum add 'i21' before 'L2'; -alter type insenum add 'i22' before 'L2'; -alter type insenum add 'i23' before 'L2'; -alter type insenum add 'i24' before 'L2'; -alter type insenum add 'i25' before 'L2'; -alter type insenum add 'i26' before 'L2'; -alter type insenum add 'i27' before 'L2'; -alter type insenum add 'i28' before 'L2'; -alter type insenum add 'i29' before 'L2'; -alter type insenum add 'i30' before 'L2'; +alter type insenum add label 'i1' before 'L2'; +alter type insenum add label 'i2' before 'L2'; +alter type insenum add label 'i3' before 'L2'; +alter type insenum add label 'i4' before 'L2'; +alter type insenum add label 'i5' before 'L2'; +alter type insenum add label 'i6' before 'L2'; +alter type insenum add label 'i7' before 'L2'; +alter type insenum add label 'i8' before 'L2'; +alter type insenum add label 'i9' before 'L2'; +alter type insenum add label 'i10' before 'L2'; +alter type insenum add label 'i11' before 'L2'; +alter type insenum add label 'i12' before 'L2'; +alter type insenum add label 'i13' before 'L2'; +alter type insenum add label 'i14' before 'L2'; +alter type insenum add label 'i15' before 'L2'; +alter type insenum add label 'i16' before 'L2'; +alter type insenum add label 'i17' before 'L2'; +alter type insenum add label 'i18' before 'L2'; +alter type insenum add label 'i19' before 'L2'; +alter type insenum add label 'i20' before 'L2'; +alter type insenum add label 'i21' before 'L2'; +alter type insenum add label 'i22' before 'L2'; +alter type insenum add label 'i23' before 'L2'; +alter type insenum add label 'i24' before 'L2'; +alter type insenum add label 'i25' before 'L2'; +alter type insenum add label 'i26' before 'L2'; +alter type insenum add label 'i27' before 'L2'; +alter type insenum add label 'i28' before 'L2'; +alter type insenum add label 'i29' before 'L2'; +alter type insenum add label 'i30' before 'L2'; -- The exact values of enumsortorder will now depend on the local properties -- of float4, but in any reasonable implementation we should get at least -- 20 splits before having to renumber; so only hide values > 20. diff --git a/src/test/regress/sql/enum.sql b/src/test/regress/sql/enum.sql index 70bf8c5..fa7e755 100644 --- a/src/test/regress/sql/enum.sql +++ b/src/test/regress/sql/enum.sql @@ -26,17 +26,17 @@ FROM pg_enum WHERE enumtypid = 'planets'::regtype ORDER BY 2; -ALTER TYPE planets ADD 'uranus'; +ALTER TYPE planets ADD LABEL 'uranus'; SELECT enumlabel, enumsortorder FROM pg_enum WHERE enumtypid = 'planets'::regtype ORDER BY 2; -ALTER TYPE planets ADD 'mercury' BEFORE 'venus'; -ALTER TYPE planets ADD 'saturn' BEFORE 'uranus'; -ALTER TYPE planets ADD 'jupiter' AFTER 'mars'; -ALTER TYPE planets ADD 'neptune' AFTER 'uranus'; +ALTER TYPE planets ADD LABEL 'mercury' BEFORE 'venus'; +ALTER TYPE planets ADD LABEL 'saturn' BEFORE 'uranus'; +ALTER TYPE planets ADD LABEL 'jupiter' AFTER 'mars'; +ALTER TYPE planets ADD LABEL 'neptune' AFTER 'uranus'; SELECT enumlabel, enumsortorder FROM pg_enum @@ -49,10 +49,10 @@ WHERE enumtypid = 'planets'::regtype ORDER BY enumlabel::planets; -- errors for adding labels -ALTER TYPE planets ADD +ALTER TYPE planets ADD LABEL 'plutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutoplutopluto'; -ALTER TYPE planets ADD 'pluto' AFTER 'zeus'; +ALTER TYPE planets ADD LABEL 'pluto' AFTER 'zeus'; -- -- Test inserting so many values that we have to renumber @@ -60,36 +60,36 @@ ALTER TYPE planets ADD 'pluto' AFTER 'zeus'; create type insenum as enum ('L1', 'L2'); -alter type insenum add 'i1' before 'L2'; -alter type insenum add 'i2' before 'L2'; -alter type insenum add 'i3' before 'L2'; -alter type insenum add 'i4' before 'L2'; -alter type insenum add 'i5' before 'L2'; -alter type insenum add 'i6' before 'L2'; -alter type insenum add 'i7' before 'L2'; -alter type insenum add 'i8' before 'L2'; -alter type insenum add 'i9' before 'L2'; -alter type insenum add 'i10' before 'L2'; -alter type insenum add 'i11' before 'L2'; -alter type insenum add 'i12' before 'L2'; -alter type insenum add 'i13' before 'L2'; -alter type insenum add 'i14' before 'L2'; -alter type insenum add 'i15' before 'L2'; -alter type insenum add 'i16' before 'L2'; -alter type insenum add 'i17' before 'L2'; -alter type insenum add 'i18' before 'L2'; -alter type insenum add 'i19' before 'L2'; -alter type insenum add 'i20' before 'L2'; -alter type insenum add 'i21' before 'L2'; -alter type insenum add 'i22' before 'L2'; -alter type insenum add 'i23' before 'L2'; -alter type insenum add 'i24' before 'L2'; -alter type insenum add 'i25' before 'L2'; -alter type insenum add 'i26' before 'L2'; -alter type insenum add 'i27' before 'L2'; -alter type insenum add 'i28' before 'L2'; -alter type insenum add 'i29' before 'L2'; -alter type insenum add 'i30' before 'L2'; +alter type insenum add label 'i1' before 'L2'; +alter type insenum add label 'i2' before 'L2'; +alter type insenum add label 'i3' before 'L2'; +alter type insenum add label 'i4' before 'L2'; +alter type insenum add label 'i5' before 'L2'; +alter type insenum add label 'i6' before 'L2'; +alter type insenum add label 'i7' before 'L2'; +alter type insenum add label 'i8' before 'L2'; +alter type insenum add label 'i9' before 'L2'; +alter type insenum add label 'i10' before 'L2'; +alter type insenum add label 'i11' before 'L2'; +alter type insenum add label 'i12' before 'L2'; +alter type insenum add label 'i13' before 'L2'; +alter type insenum add label 'i14' before 'L2'; +alter type insenum add label 'i15' before 'L2'; +alter type insenum add label 'i16' before 'L2'; +alter type insenum add label 'i17' before 'L2'; +alter type insenum add label 'i18' before 'L2'; +alter type insenum add label 'i19' before 'L2'; +alter type insenum add label 'i20' before 'L2'; +alter type insenum add label 'i21' before 'L2'; +alter type insenum add label 'i22' before 'L2'; +alter type insenum add label 'i23' before 'L2'; +alter type insenum add label 'i24' before 'L2'; +alter type insenum add label 'i25' before 'L2'; +alter type insenum add label 'i26' before 'L2'; +alter type insenum add label 'i27' before 'L2'; +alter type insenum add label 'i28' before 'L2'; +alter type insenum add label 'i29' before 'L2'; +alter type insenum add label 'i30' before 'L2'; -- The exact values of enumsortorder will now depend on the local properties -- of float4, but in any reasonable implementation we should get at least -- 1.7.1