Allow use functions with no arguments in DEFAULT

vadim4o · vadim4o · commit f79b7a56b450 · 1997-09-24T08:31:04.000Z
Allow use IDENT as arguments of trigger functions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.48 1997/09/20 16:11:42 thomas Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.49 1997/09/24 08:31:04 vadim Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -484,6 +484,11 @@ default_expr:  AexprConst
 					$$ = nconc( $$, $3);
 					$$ = lappend( $$, makeString(")"));
 				}
+			| name '(' ')'
+				{
+					$$ = makeList( makeString($1), makeString("("), -1);
+					$$ = lappend( $$, makeString(")"));
+				}
 			| default_expr Op default_expr
 				{
 					if (!strcmp("<=", $2) || !strcmp(">=", $2))
@@ -841,12 +846,19 @@ TriggerFuncArgs: TriggerFuncArg
 		;
 
 TriggerFuncArg: ICONST
-				{
+					{
 						char *s = (char *) palloc (256);
 						sprintf (s, "%d", $1);
 						$$ = s;
-				}
+					}
+				| FCONST
+					{
+						char *s = (char *) palloc (256);
+						sprintf (s, "%g", $1);
+						$$ = s;
+					}
 				| Sconst		{  $$ = $1; }
+				| IDENT			{  $$ = $1; }
 		;
 
 DropTrigStmt:	DROP TRIGGER name ON relation_name

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.48 1997/09/20 16:11:42 thomas Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.49 1997/09/24 08:31:04 vadim Exp $`
`14`	`14`	`*`
`15`	`15`	`* HISTORY`
`16`	`16`	`* AUTHOR DATE MAJOR EVENT`
`@@ -484,6 +484,11 @@ default_expr: AexprConst`
`484`	`484`	`$$ = nconc( $$, $3);`
`485`	`485`	`$$ = lappend( $$, makeString(")"));`
`486`	`486`	`}`
	`487`	`+ \| name '(' ')'`
	`488`	`+ {`
	`489`	`+ $$ = makeList( makeString($1), makeString("("), -1);`
	`490`	`+ $$ = lappend( $$, makeString(")"));`
	`491`	`+ }`
`487`	`492`	`\| default_expr Op default_expr`
`488`	`493`	`{`
`489`	`494`	`if (!strcmp("<=", $2) \|\| !strcmp(">=", $2))`
`@@ -841,12 +846,19 @@ TriggerFuncArgs: TriggerFuncArg`
`841`	`846`	`;`
`842`	`847`
`843`	`848`	`TriggerFuncArg: ICONST`
`844`		`- {`
	`849`	`+ {`
`845`	`850`	`char s = (char ) palloc (256);`
`846`	`851`	`sprintf (s, "%d", $1);`
`847`	`852`	`$$ = s;`
`848`		`- }`
	`853`	`+ }`
	`854`	`+ \| FCONST`
	`855`	`+ {`
	`856`	`+ char s = (char ) palloc (256);`
	`857`	`+ sprintf (s, "%g", $1);`
	`858`	`+ $$ = s;`
	`859`	`+ }`
`849`	`860`	`\| Sconst { $$ = $1; }`
	`861`	`+ \| IDENT { $$ = $1; }`
`850`	`862`	`;`
`851`	`863`
`852`	`864`	`DropTrigStmt: DROP TRIGGER name ON relation_name`