Disable use of -c and -a together in pg_dump; they don't make sense together.

bmomjian · bmomjian · commit 9afa3058350b · 2002-08-27T21:04:58.000Z
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -22,7 +22,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.292 2002/08/27 18:57:26 petere Exp $
+ *	  $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.293 2002/08/27 21:04:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -468,6 +468,12 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+	if (dataOnly && outputClean)
+	{
+		write_msg(NULL, "The options \"clean\" (-c) and \"data only\" (-a) cannot be used together.\n");
+		exit(1);
+	}
+
 	if (outputBlobs && selectTablename != NULL && strlen(selectTablename) > 0)
 	{
 		write_msg(NULL, "Large object output is not supported for a single table.\n");

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*`
`23`	`23`	`*`
`24`	`24`	`* IDENTIFICATION`
`25`		`- * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.292 2002/08/27 18:57:26 petere Exp $`
	`25`	`+ * $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.293 2002/08/27 21:04:58 momjian Exp $`
`26`	`26`	`*`
`27`	`27`	`*-------------------------------------------------------------------------`
`28`	`28`	`*/`
`@@ -468,6 +468,12 @@ main(int argc, char **argv)`
`468`	`468`	`exit(1);`
`469`	`469`	`}`
`470`	`470`
	`471`	`+ if (dataOnly && outputClean)`
	`472`	`+ {`
	`473`	`+ write_msg(NULL, "The options \"clean\" (-c) and \"data only\" (-a) cannot be used together.\n");`
	`474`	`+ exit(1);`
	`475`	`+ }`
	`476`	`+`
`471`	`477`	`if (outputBlobs && selectTablename != NULL && strlen(selectTablename) > 0)`
`472`	`478`	`{`
`473`	`479`	`write_msg(NULL, "Large object output is not supported for a single table.\n");`