mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-05 19:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts: Remove newlines from end of generated SQL

Browse Source 
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 <fabriziomello@gmail.com>
This commit is contained in:
Peter Eisentraut 2014-02-10 21:47:19 -05:00
parent 2895415205
commit d3c4c47155
9 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/scripts/clusterdb.c
View File

@ -201,7 +201,7 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
appendPQExpBufferStr(&sql, " VERBOSE");
if (table)
appendPQExpBuffer(&sql, " %s", table);
appendPQExpBufferStr(&sql, ";\n");
appendPQExpBufferStr(&sql, ";");
conn = connectDatabase(dbname, host, port, username, prompt_password,
progname, false);

8
src/bin/scripts/createdb.c
View File

@ -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)

6
src/bin/scripts/createlang.c
View File

@ -207,12 +207,12 @@ main(int argc, char *argv[])
* older server, and it's easy enough to continue supporting the old way.
*/
if (PQserverVersion(conn) >= 90100)
printfPQExpBuffer(&sql, "CREATE EXTENSION \"%s\";\n", langname);
printfPQExpBuffer(&sql, "CREATE EXTENSION \"%s\";", langname);
else
printfPQExpBuffer(&sql, "CREATE LANGUAGE \"%s\";\n", langname);
printfPQExpBuffer(&sql, "CREATE LANGUAGE \"%s\";", langname);
if (echo)
printf("%s", sql.data);
printf("%s\n", sql.data);
result = PQexec(conn, sql.data);
if (PQresultStatus(result) != PGRES_COMMAND_OK)
{

4
src/bin/scripts/createuser.c
View File

@ -320,10 +320,10 @@ main(int argc, char *argv[])
appendPQExpBuffer(&sql, "%s", fmtId(cell->val));
}
}
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)

4
src/bin/scripts/dropdb.c
View File

@ -121,7 +121,7 @@ main(int argc, char *argv[])
initPQExpBuffer(&sql);
appendPQExpBuffer(&sql, "DROP DATABASE %s%s;\n",
appendPQExpBuffer(&sql, "DROP DATABASE %s%s;",
(if_exists ? "IF EXISTS " : ""), fmtId(dbname));
/* Avoid trying to drop postgres db while we are connected to it. */
@ -132,7 +132,7 @@ main(int argc, char *argv[])
host, port, username, 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)
{

4
src/bin/scripts/droplang.c
View File

@ -211,10 +211,10 @@ main(int argc, char *argv[])
* Attempt to drop the language. We do not use CASCADE, so that the drop
* will fail if there are any functions in the language.
*/
printfPQExpBuffer(&sql, "DROP EXTENSION \"%s\";\n", langname);
printfPQExpBuffer(&sql, "DROP EXTENSION \"%s\";", langname);
if (echo)
printf("%s", sql.data);
printf("%s\n", sql.data);
result = PQexec(conn, sql.data);
if (PQresultStatus(result) != PGRES_COMMAND_OK)
{

4
src/bin/scripts/dropuser.c
View File

@ -125,14 +125,14 @@ main(int argc, char *argv[])
}
initPQExpBuffer(&sql);
appendPQExpBuffer(&sql, "DROP ROLE %s%s;\n",
appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
(if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
conn = connectDatabase("postgres", host, port, username, prompt_password,
progname, false);
if (echo)
printf("%s", sql.data);
printf("%s\n", sql.data);
result = PQexec(conn, sql.data);
if (PQresultStatus(result) != PGRES_COMMAND_OK)

4
src/bin/scripts/reindexdb.c
View File

@ -253,7 +253,7 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
appendPQExpBuffer(&sql, " INDEX %s", name);
else if (strcmp(type, "DATABASE") == 0)
appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
appendPQExpBufferStr(&sql, ";\n");
appendPQExpBufferStr(&sql, ";");
conn = connectDatabase(dbname, host, port, username, prompt_password,
progname, false);
@ -320,7 +320,7 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
initPQExpBuffer(&sql);
appendPQExpBuffer(&sql, "REINDEX SYSTEM %s;\n", dbname);
appendPQExpBuffer(&sql, "REINDEX SYSTEM %s;", dbname);
conn = connectDatabase(dbname, host, port, username, prompt_password,
progname, false);

2
src/bin/scripts/vacuumdb.c
View File

@ -298,7 +298,7 @@ vacuum_one_database(const char *dbname, bool full, bool verbose, bool and_analyz
}
if (table)
appendPQExpBuffer(&sql, " %s", table);
appendPQExpBufferStr(&sql, ";\n");
appendPQExpBufferStr(&sql, ";");
if (!executeMaintenanceCommand(conn, sql.data, echo))
{