summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorBruce Momjian2000-11-04 21:04:56 +0000
committerBruce Momjian2000-11-04 21:04:56 +0000
commit4b71943bb29a976d380e058156bd3110b6ec723b (patch)
treedb3ffb7778565b109f3ea465a2d75ef70d5b2121 /src/backend/parser
parent90c63942c4a208e05a2ca4070815dd0662559717 (diff)
Make PROCEDURAL optional in CREATE/DROP LANGUAGE.
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/gram.y13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index ece0493acf9..f6859429f2a 100644
--- 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.202 2000/10/31 10:22:10 petere Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.203 2000/11/04 21:04:55 momjian Exp $
*
* HISTORY
* AUTHOR DATE MAJOR EVENT
@@ -154,7 +154,7 @@ static void doNegateFloat(Value *v);
%type <str> user_valid_clause
%type <list> user_list, user_group_clause, users_in_new_group_clause
-%type <boolean> TriggerActionTime, TriggerForSpec, PLangTrusted
+%type <boolean> TriggerActionTime, TriggerForSpec, PLangTrusted, opt_procedural
%type <str> OptConstrFromTable
@@ -1654,7 +1654,7 @@ IntegerOnly: Iconst
*
*****************************************************************************/
-CreatePLangStmt: CREATE PLangTrusted PROCEDURAL LANGUAGE Sconst
+CreatePLangStmt: CREATE PLangTrusted opt_procedural LANGUAGE Sconst
HANDLER def_name LANCOMPILER Sconst
{
CreatePLangStmt *n = makeNode(CreatePLangStmt);
@@ -1668,8 +1668,9 @@ CreatePLangStmt: CREATE PLangTrusted PROCEDURAL LANGUAGE Sconst
PLangTrusted: TRUSTED { $$ = TRUE; }
| /*EMPTY*/ { $$ = FALSE; }
+ ;
-DropPLangStmt: DROP PROCEDURAL LANGUAGE Sconst
+DropPLangStmt: DROP opt_procedural LANGUAGE Sconst
{
DropPLangStmt *n = makeNode(DropPLangStmt);
n->plname = $4;
@@ -1677,6 +1678,10 @@ DropPLangStmt: DROP PROCEDURAL LANGUAGE Sconst
}
;
+opt_procedural: PROCEDURAL { $$ = TRUE; }
+ | /*EMPTY*/ { $$ = TRUE; }
+ ;
+
/*****************************************************************************
*
* QUERIES :