Allow use functions with no arguments in DEFAULT

Allow use IDENT as arguments of trigger functions

diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index ae683011ce590cf5627a2d116fd5d78c61d8a80c..650f490566d7a74bc780a7b740914520a8fc3fba 100644 (file)
--- 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