Empty search_path in Autovacuum and non-psql/pgbench clients.

[postgresql] / src / bin / scripts / dropuser.c

diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index df91eec22c9156c2c292a4277135ff47feb3218f..d9e7f7b0364110f48b735f88b5a32446daa3ad4b 100644 (file)
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -2,7 +2,7 @@
  *
  * dropuser
  *
- * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/dropuser.c
@@ -12,7 +12,7 @@
 
 #include "postgres_fe.h"
 #include "common.h"
-#include "dumputils.h"
+#include "fe_utils/string_utils.h"
 
 
 static void help(const char *progname);
@@ -46,6 +46,7 @@ main(int argc, char *argv[])
        enum trivalue prompt_password = TRI_DEFAULT;
        bool            echo = false;
        bool            interactive = false;
+       char            dropuser_buf[128];
 
        PQExpBufferData sql;
 
@@ -108,7 +109,11 @@ main(int argc, char *argv[])
        if (dropuser == NULL)
        {
                if (interactive)
-                       dropuser = simple_prompt("Enter name of role to drop: ", 128, true);
+               {
+                       simple_prompt("Enter name of role to drop: ",
+                                                 dropuser_buf, sizeof(dropuser_buf), true);
+                       dropuser = dropuser_buf;
+               }
                else
                {
                        fprintf(stderr, _("%s: missing required argument role name\n"), progname);
@@ -129,7 +134,7 @@ main(int argc, char *argv[])
                                          (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
        conn = connectDatabase("postgres", host, port, username, prompt_password,
-                                                  progname, false, false);
+                                                  progname, echo, false, false);
 
        if (echo)
                printf("%s\n", sql.data);