From d3c4c471553265e7517be24bae64b81967f6df40 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 10 Feb 2014 21:47:19 -0500 Subject: scripts: Remove newlines from end of generated SQL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This results in spurious empty lines in the server log. Instead, add the newlines only when printing out the --echo output. In some cases, this was already done, leading to two newlines being printed. Clean that up as well. From: Fabrízio de Royes Mello --- src/bin/scripts/createdb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/bin/scripts/createdb.c') diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c index edd18f7423e..64badd6bd30 100644 --- a/src/bin/scripts/createdb.c +++ b/src/bin/scripts/createdb.c @@ -195,7 +195,7 @@ main(int argc, char *argv[]) if (lc_ctype) appendPQExpBuffer(&sql, " LC_CTYPE '%s'", lc_ctype); - appendPQExpBufferStr(&sql, ";\n"); + appendPQExpBufferStr(&sql, ";"); /* No point in trying to use postgres db when creating postgres db. */ if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0) @@ -205,7 +205,7 @@ main(int argc, char *argv[]) prompt_password, progname); if (echo) - printf("%s", sql.data); + printf("%s\n", sql.data); result = PQexec(conn, sql.data); if (PQresultStatus(result) != PGRES_COMMAND_OK) @@ -222,10 +222,10 @@ main(int argc, char *argv[]) { printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname)); appendStringLiteralConn(&sql, comment, conn); - appendPQExpBufferStr(&sql, ";\n"); + appendPQExpBufferStr(&sql, ";"); if (echo) - printf("%s", sql.data); + printf("%s\n", sql.data); result = PQexec(conn, sql.data); if (PQresultStatus(result) != PGRES_COMMAND_OK) -- cgit v1.2.3