Make PROCEDURAL optional in CREATE/DROP LANGUAGE.

bmomjian · bmomjian · commit 4b71943bb29a · 2000-11-04T21:04:56.000Z
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.12 2000/10/05 19:48:17 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/create_language.sgml,v 1.13 2000/11/04 21:04:54 momjian Exp $
 Postgres documentation
 -->
 
@@ -23,7 +23,7 @@ Postgres documentation
    <date>1999-07-20</date>
   </refsynopsisdivinfo>
   <synopsis>
-CREATE [ TRUSTED ] PROCEDURAL LANGUAGE '<replaceable class="parameter">langname</replaceable>'
+CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE '<replaceable class="parameter">langname</replaceable>'
     HANDLER <replaceable class="parameter">call_handler</replaceable>
     LANCOMPILER '<replaceable class="parameter">comment</replaceable>'
   </synopsis>
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.7 1999/07/22 15:09:10 thomas Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/drop_language.sgml,v 1.8 2000/11/04 21:04:54 momjian Exp $
 Postgres documentation
 -->
 
@@ -23,7 +23,7 @@ Postgres documentation
    <date>1999-07-20</date>
   </refsynopsisdivinfo>
   <synopsis>
-DROP PROCEDURAL LANGUAGE '<replaceable class="PARAMETER">name</replaceable>'
+DROP [ PROCEDURAL ] LANGUAGE '<replaceable class="PARAMETER">name</replaceable>'
   </synopsis>
   
   <refsect2 id="R2-SQL-DROPLANGUAGE-1">
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.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,15 +1668,20 @@ 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;
 				$$ = (Node *)n;
 			}
 		;
 
+opt_procedural: PROCEDURAL		{ $$ = TRUE; }
+			| /*EMPTY*/			{ $$ = TRUE; }
+		;
+		
 /*****************************************************************************
  *
  *		QUERIES :
diff --git a/src/tools/pgcvslog b/src/tools/pgcvslog
@@ -8,8 +8,10 @@
 # cvs log -d '>1999-06-14 00:00:00 GMT' . > log
 #
 # pre and post-branch logs:
+# find . -name CVS -type d -exec touch '{}/Entries.Static' \;
 # cvs log -d'2000-05-08 00:00:00 GMT<2000-05-29 00:00:00 GMT'
 # cvs log -d'>2000-05-29 00:00:00 GMT' -rREL7_0_PATCHES
+# find . -name CVS -type d -exec rm '{}/Entries.Static' \;
 #
 
 cat "$@" |
@@ -18,7 +20,7 @@ cat "$@" |
 # we don't print anything from the -- or == line and the date:
 
 awk '
-	$0 ~ /^Working file:/	{workingfile = $0}
+	$0 ~ /^Working file:/	{workingfile = "/" $3}
 
 	($0 ~ /^====*$/ || $0 ~ /^----*$/) && skip == "N" \
 	{
@@ -27,7 +29,7 @@ awk '
 		{
 			printf ("%s| %10d|%s\n", datetime, NR, "");
 			printf ("%s| %10d|%s\n", datetime, NR, "---");
-			printf ("%s| %10d|%s\n", datetime, NR+1, "");
+/*			printf ("%s| %10d|%s\n", datetime, NR+1, "");*/
 		}
 	}
 
@@ -46,6 +48,8 @@ awk '
 		datetime=$2"-"$3
 		if (workingfile != "" && skip == "N")
 		{
+			gsub(";", "", $5);
+			printf ("%s| %10d|  %70s\n", datetime, NR-2, $5);
 			printf ("%s| %10d|%s\n", datetime, NR-1, workingfile);
 			printf ("%s| %10d|%s\n", datetime, NR, $0);
 			printf ("%s| %10d|%s\n", datetime, NR+1, "");
@@ -59,7 +63,7 @@ sort | cut -d'|' -f3 | cat |
 # collect duplicate narratives
 awk '	BEGIN	{ slot = 0;}
 	{
-		if ($0 ~ /^Working file:/)
+		if ($0 ~ /^\//)
 		{
 			if (slot != oldslot)
 				same = 0;

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.202 2000/10/31 10:22:10 petere Exp $`
	`14`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.203 2000/11/04 21:04:55 momjian Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -154,7 +154,7 @@ static void doNegateFloat(Value *v);`
`154`	`154`	`%type <str> user_valid_clause`
`155`	`155`	`%type <list> user_list, user_group_clause, users_in_new_group_clause`
`156`	`156`
`157`		`-%type <boolean> TriggerActionTime, TriggerForSpec, PLangTrusted`
	`157`	`+%type <boolean> TriggerActionTime, TriggerForSpec, PLangTrusted, opt_procedural`
`158`	`158`
`159`	`159`	`%type <str> OptConstrFromTable`
`160`	`160`
`@@ -1654,7 +1654,7 @@ IntegerOnly: Iconst`
`1654`	`1654`	`*`
`1655`	`1655`	`*****************************************************************************/`
`1656`	`1656`
`1657`		`-CreatePLangStmt: CREATE PLangTrusted PROCEDURAL LANGUAGE Sconst`
	`1657`	`+CreatePLangStmt: CREATE PLangTrusted opt_procedural LANGUAGE Sconst`
`1658`	`1658`	`HANDLER def_name LANCOMPILER Sconst`
`1659`	`1659`	`{`
`1660`	`1660`	`CreatePLangStmt *n = makeNode(CreatePLangStmt);`
`@@ -1668,15 +1668,20 @@ CreatePLangStmt: CREATE PLangTrusted PROCEDURAL LANGUAGE Sconst`
`1668`	`1668`
`1669`	`1669`	`PLangTrusted: TRUSTED { $$ = TRUE; }`
`1670`	`1670`	`\| /EMPTY/ { $$ = FALSE; }`
	`1671`	`+ ;`
`1671`	`1672`
`1672`		`-DropPLangStmt: DROP PROCEDURAL LANGUAGE Sconst`
	`1673`	`+DropPLangStmt: DROP opt_procedural LANGUAGE Sconst`
`1673`	`1674`	`{`
`1674`	`1675`	`DropPLangStmt *n = makeNode(DropPLangStmt);`
`1675`	`1676`	`n->plname = $4;`
`1676`	`1677`	`$$ = (Node *)n;`
`1677`	`1678`	`}`
`1678`	`1679`	`;`
`1679`	`1680`
	`1681`	`+opt_procedural: PROCEDURAL { $$ = TRUE; }`
	`1682`	`+ \| /EMPTY/ { $$ = TRUE; }`
	`1683`	`+ ;`
	`1684`	`+`
`1680`	`1685`	`/*****************************************************************************`
`1681`	`1686`	`*`
`1682`	`1687`	`* QUERIES :`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,10 @@`
`8`	`8`	`# cvs log -d '>1999-06-14 00:00:00 GMT' . > log`
`9`	`9`	`#`
`10`	`10`	`# pre and post-branch logs:`
	`11`	`+# find . -name CVS -type d -exec touch '{}/Entries.Static' \;`
`11`	`12`	`# cvs log -d'2000-05-08 00:00:00 GMT<2000-05-29 00:00:00 GMT'`
`12`	`13`	`# cvs log -d'>2000-05-29 00:00:00 GMT' -rREL7_0_PATCHES`
	`14`	`+# find . -name CVS -type d -exec rm '{}/Entries.Static' \;`
`13`	`15`	`#`
`14`	`16`
`15`	`17`	`cat "$@" \|`
`@@ -18,7 +20,7 @@ cat "$@" \|`
`18`	`20`	`# we don't print anything from the -- or == line and the date:`
`19`	`21`
`20`	`22`	`awk '`
`21`		`- $0 ~ /^Working file:/ {workingfile = $0}`
	`23`	`+ $0 ~ /^Working file:/ {workingfile = "/" $3}`
`22`	`24`
`23`	`25`	`($0 ~ /^====$/ \|\| $0 ~ /^----$/) && skip == "N" \`
`24`	`26`	`{`
`@@ -27,7 +29,7 @@ awk '`
`27`	`29`	`{`
`28`	`30`	`printf ("%s\| %10d\|%s\n", datetime, NR, "");`
`29`	`31`	`printf ("%s\| %10d\|%s\n", datetime, NR, "---");`
`30`		`- printf ("%s\| %10d\|%s\n", datetime, NR+1, "");`
	`32`	`+/* printf ("%s\| %10d\|%s\n", datetime, NR+1, "");*/`
`31`	`33`	`}`
`32`	`34`	`}`
`33`	`35`
`@@ -46,6 +48,8 @@ awk '`
`46`	`48`	`datetime=$2"-"$3`
`47`	`49`	`if (workingfile != "" && skip == "N")`
`48`	`50`	`{`
	`51`	`+ gsub(";", "", $5);`
	`52`	`+ printf ("%s\| %10d\| %70s\n", datetime, NR-2, $5);`
`49`	`53`	`printf ("%s\| %10d\|%s\n", datetime, NR-1, workingfile);`
`50`	`54`	`printf ("%s\| %10d\|%s\n", datetime, NR, $0);`
`51`	`55`	`printf ("%s\| %10d\|%s\n", datetime, NR+1, "");`
`@@ -59,7 +63,7 @@ sort \| cut -d'\|' -f3 \| cat \|`
`59`	`63`	`# collect duplicate narratives`
`60`	`64`	`awk ' BEGIN { slot = 0;}`
`61`	`65`	`{`
`62`		`- if ($0 ~ /^Working file:/)`
	`66`	`+ if ($0 ~ /^\//)`
`63`	`67`	`{`
`64`	`68`	`if (slot != oldslot)`
`65`	`69`	`same = 0;`