Commit f79b7a56 authored by Vadim B. Mikheev's avatar Vadim B. Mikheev

Allow use functions with no arguments in DEFAULT

Allow use IDENT as arguments of trigger functions
parent eec61086
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* *
* *
* IDENTIFICATION * 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 * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -484,6 +484,11 @@ default_expr: AexprConst ...@@ -484,6 +484,11 @@ default_expr: AexprConst
$$ = nconc( $$, $3); $$ = nconc( $$, $3);
$$ = lappend( $$, makeString(")")); $$ = lappend( $$, makeString(")"));
} }
| name '(' ')'
{
$$ = makeList( makeString($1), makeString("("), -1);
$$ = lappend( $$, makeString(")"));
}
| default_expr Op default_expr | default_expr Op default_expr
{ {
if (!strcmp("<=", $2) || !strcmp(">=", $2)) if (!strcmp("<=", $2) || !strcmp(">=", $2))
...@@ -846,7 +851,14 @@ TriggerFuncArg: ICONST ...@@ -846,7 +851,14 @@ TriggerFuncArg: ICONST
sprintf (s, "%d", $1); sprintf (s, "%d", $1);
$$ = s; $$ = s;
} }
| FCONST
{
char *s = (char *) palloc (256);
sprintf (s, "%g", $1);
$$ = s;
}
| Sconst { $$ = $1; } | Sconst { $$ = $1; }
| IDENT { $$ = $1; }
; ;
DropTrigStmt: DROP TRIGGER name ON relation_name DropTrigStmt: DROP TRIGGER name ON relation_name
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment