Allow qualified type names in CREATE CAST, DROP CAST. Also allow the

tglsfdc · tglsfdc · commit e24977f3a44f · 2003-02-05T20:16:42.000Z
construction 'SETOF type[]' which for some reason was previously
overlooked (you'd have to name the array type directly to make it work).
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.398 2003/02/03 14:04:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.399 2003/02/05 20:16:42 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -3229,7 +3229,7 @@ any_operator:
  *
  *****************************************************************************/
 
-CreateCastStmt: CREATE CAST '(' ConstTypename AS ConstTypename ')'
+CreateCastStmt: CREATE CAST '(' Typename AS Typename ')'
 					WITH FUNCTION function_with_argtypes cast_context
 				{
 					CreateCastStmt *n = makeNode(CreateCastStmt);
@@ -3239,7 +3239,7 @@ CreateCastStmt: CREATE CAST '(' ConstTypename AS ConstTypename ')'
 					n->context = (CoercionContext) $11;
 					$$ = (Node *)n;
 				}
-			| CREATE CAST '(' ConstTypename AS ConstTypename ')'
+			| CREATE CAST '(' Typename AS Typename ')'
 					WITHOUT FUNCTION cast_context
 				{
 					CreateCastStmt *n = makeNode(CreateCastStmt);
@@ -3257,7 +3257,7 @@ cast_context:  AS IMPLICIT_P					{ $$ = COERCION_IMPLICIT; }
 		;
 
 
-DropCastStmt: DROP CAST '(' ConstTypename AS ConstTypename ')' opt_drop_behavior
+DropCastStmt: DROP CAST '(' Typename AS Typename ')' opt_drop_behavior
 				{
 					DropCastStmt *n = makeNode(DropCastStmt);
 					n->sourcetype = $4;
@@ -4948,9 +4948,10 @@ Typename:	SimpleTypename opt_array_bounds
 					$$ = $1;
 					$$->arrayBounds = $2;
 				}
-			| SETOF SimpleTypename
+			| SETOF SimpleTypename opt_array_bounds
 				{
 					$$ = $2;
+					$$->arrayBounds = $3;
 					$$->setof = TRUE;
 				}
 		;
@@ -5173,6 +5174,8 @@ Bit:		BitWithLength
 				}
 		;
 
+/* ConstBit is like Bit except "BIT" defaults to unspecified length */
+/* See notes for ConstCharacter, which addresses same issue for "CHAR" */
 ConstBit:	BitWithLength
 				{
 					$$ = $1;

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.398 2003/02/03 14:04:24 momjian Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.399 2003/02/05 20:16:42 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -3229,7 +3229,7 @@ any_operator:`
`3229`	`3229`	`*`
`3230`	`3230`	`*****************************************************************************/`
`3231`	`3231`
`3232`		`-CreateCastStmt: CREATE CAST '(' ConstTypename AS ConstTypename ')'`
	`3232`	`+CreateCastStmt: CREATE CAST '(' Typename AS Typename ')'`
`3233`	`3233`	`WITH FUNCTION function_with_argtypes cast_context`
`3234`	`3234`	`{`
`3235`	`3235`	`CreateCastStmt *n = makeNode(CreateCastStmt);`
`@@ -3239,7 +3239,7 @@ CreateCastStmt: CREATE CAST '(' ConstTypename AS ConstTypename ')'`
`3239`	`3239`	`n->context = (CoercionContext) $11;`
`3240`	`3240`	`$$ = (Node *)n;`
`3241`	`3241`	`}`
`3242`		`- \| CREATE CAST '(' ConstTypename AS ConstTypename ')'`
	`3242`	`+ \| CREATE CAST '(' Typename AS Typename ')'`
`3243`	`3243`	`WITHOUT FUNCTION cast_context`
`3244`	`3244`	`{`
`3245`	`3245`	`CreateCastStmt *n = makeNode(CreateCastStmt);`
`@@ -3257,7 +3257,7 @@ cast_context: AS IMPLICIT_P { $$ = COERCION_IMPLICIT; }`
`3257`	`3257`	`;`
`3258`	`3258`
`3259`	`3259`
`3260`		`-DropCastStmt: DROP CAST '(' ConstTypename AS ConstTypename ')' opt_drop_behavior`
	`3260`	`+DropCastStmt: DROP CAST '(' Typename AS Typename ')' opt_drop_behavior`
`3261`	`3261`	`{`
`3262`	`3262`	`DropCastStmt *n = makeNode(DropCastStmt);`
`3263`	`3263`	`n->sourcetype = $4;`
`@@ -4948,9 +4948,10 @@ Typename: SimpleTypename opt_array_bounds`
`4948`	`4948`	`$$ = $1;`
`4949`	`4949`	`$$->arrayBounds = $2;`
`4950`	`4950`	`}`
`4951`		`- \| SETOF SimpleTypename`
	`4951`	`+ \| SETOF SimpleTypename opt_array_bounds`
`4952`	`4952`	`{`
`4953`	`4953`	`$$ = $2;`
	`4954`	`+ $$->arrayBounds = $3;`
`4954`	`4955`	`$$->setof = TRUE;`
`4955`	`4956`	`}`
`4956`	`4957`	`;`
`@@ -5173,6 +5174,8 @@ Bit: BitWithLength`
`5173`	`5174`	`}`
`5174`	`5175`	`;`
`5175`	`5176`
	`5177`	`+/* ConstBit is like Bit except "BIT" defaults to unspecified length */`
	`5178`	`+/* See notes for ConstCharacter, which addresses same issue for "CHAR" */`
`5176`	`5179`	`ConstBit: BitWithLength`
`5177`	`5180`	`{`
`5178`	`5181`	`$$ = $1;`