Don't print NO ACTION foreign key actions in dumps and psql \d.

bmomjian · bmomjian · commit 6b196c075495 · 2003-02-03T15:17:24.000Z
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
@@ -3,7 +3,7 @@
  *				back to source text
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.132 2003/01/10 21:08:15 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.133 2003/02/03 15:17:24 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -642,7 +642,7 @@ pg_get_constraintdef(PG_FUNCTION_ARGS)
 				switch (conForm->confupdtype)
 				{
 					case FKCONSTR_ACTION_NOACTION:
-						string = "NO ACTION";
+						string = "";
 						break;
 					case FKCONSTR_ACTION_RESTRICT:
 						string = "RESTRICT";
@@ -662,12 +662,13 @@ pg_get_constraintdef(PG_FUNCTION_ARGS)
 						string = "";	/* keep compiler quiet */
 						break;
 				}
-				appendStringInfo(&buf, " ON UPDATE %s", string);
+				if (strlen(string) != 0)
+					appendStringInfo(&buf, " ON UPDATE %s", string);
 
 				switch (conForm->confdeltype)
 				{
 					case FKCONSTR_ACTION_NOACTION:
-						string = "NO ACTION";
+						string = "";
 						break;
 					case FKCONSTR_ACTION_RESTRICT:
 						string = "RESTRICT";
@@ -687,7 +688,8 @@ pg_get_constraintdef(PG_FUNCTION_ARGS)
 						string = "";	/* keep compiler quiet */
 						break;
 				}
-				appendStringInfo(&buf, " ON DELETE %s", string);
+				if (strlen(string) != 0)
+					appendStringInfo(&buf, " ON DELETE %s", string);
 
 				if (conForm->condeferrable)
 					appendStringInfo(&buf, " DEFERRABLE");

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`* back to source text`
`4`	`4`	`*`
`5`	`5`	`* IDENTIFICATION`
`6`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.132 2003/01/10 21:08:15 tgl Exp $`
	`6`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/ruleutils.c,v 1.133 2003/02/03 15:17:24 momjian Exp $`
`7`	`7`	`*`
`8`	`8`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`9`	`9`	`*`
`@@ -642,7 +642,7 @@ pg_get_constraintdef(PG_FUNCTION_ARGS)`
`642`	`642`	`switch (conForm->confupdtype)`
`643`	`643`	`{`
`644`	`644`	`case FKCONSTR_ACTION_NOACTION:`
`645`		`- string = "NO ACTION";`
	`645`	`+ string = "";`
`646`	`646`	`break;`
`647`	`647`	`case FKCONSTR_ACTION_RESTRICT:`
`648`	`648`	`string = "RESTRICT";`
`@@ -662,12 +662,13 @@ pg_get_constraintdef(PG_FUNCTION_ARGS)`
`662`	`662`	`string = ""; /* keep compiler quiet */`
`663`	`663`	`break;`
`664`	`664`	`}`
`665`		`- appendStringInfo(&buf, " ON UPDATE %s", string);`
	`665`	`+ if (strlen(string) != 0)`
	`666`	`+ appendStringInfo(&buf, " ON UPDATE %s", string);`
`666`	`667`
`667`	`668`	`switch (conForm->confdeltype)`
`668`	`669`	`{`
`669`	`670`	`case FKCONSTR_ACTION_NOACTION:`
`670`		`- string = "NO ACTION";`
	`671`	`+ string = "";`
`671`	`672`	`break;`
`672`	`673`	`case FKCONSTR_ACTION_RESTRICT:`
`673`	`674`	`string = "RESTRICT";`
`@@ -687,7 +688,8 @@ pg_get_constraintdef(PG_FUNCTION_ARGS)`
`687`	`688`	`string = ""; /* keep compiler quiet */`
`688`	`689`	`break;`
`689`	`690`	`}`
`690`		`- appendStringInfo(&buf, " ON DELETE %s", string);`
	`691`	`+ if (strlen(string) != 0)`
	`692`	`+ appendStringInfo(&buf, " ON DELETE %s", string);`
`691`	`693`
`692`	`694`	`if (conForm->condeferrable)`
`693`	`695`	`appendStringInfo(&buf, " DEFERRABLE");`