postgres.git / summary / log / commit / refs

commit    614ce64f6c78a73861785e65d80deec8d280a5e9
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Wed Jul 03 00:07:35 2013 +0000
First released in: 9.4.0

    pg_restore: Error about incompatible options
    
    This mirrors the equivalent error cases in pg_dump.


 src/bin/pg_dump/pg_restore.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index c585098c72b..985c82621ba 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -314,6 +314,20 @@ main(int argc, char **argv)
 		opts->useDB = 1;
 	}
 
+	if (opts->dataOnly && opts->schemaOnly)
+	{
+		fprintf(stderr, _("%s: options -s/--schema-only and -a/--data-only cannot be used together\n"),
+				progname);
+		exit_nicely(1);
+	}
+
+	if (opts->dataOnly && opts->dropSchema)
+	{
+		fprintf(stderr, _("%s: options -c/--clean and -a/--data-only cannot be used together\n"),
+				progname);
+		exit_nicely(1);
+	}
+
 	/* Can't do single-txn mode with multiple connections */
 	if (opts->single_txn && numWorkers > 1)
 	{


[parent: 368202501539]