mirror of
https://github.com/postgres/postgres.git
synced 2025-10-18 04:29:09 +03:00
Use appendStringInfoString/Char et al where appropriate.
Patch by David Rowley. Backpatch to 9.5, as some of the calls were new in 9.5, and keeping the code in sync with master makes future backpatching easier.
This commit is contained in:
@@ -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, ";");
|
||||
appendPQExpBufferChar(&sql, ';');
|
||||
|
||||
conn = connectDatabase(dbname, host, port, username, prompt_password,
|
||||
progname, false);
|
||||
|
@@ -195,7 +195,7 @@ main(int argc, char *argv[])
|
||||
if (lc_ctype)
|
||||
appendPQExpBuffer(&sql, " LC_CTYPE '%s'", lc_ctype);
|
||||
|
||||
appendPQExpBufferStr(&sql, ";");
|
||||
appendPQExpBufferChar(&sql, ';');
|
||||
|
||||
/* No point in trying to use postgres db when creating postgres db. */
|
||||
if (maintenance_db == NULL && strcmp(dbname, "postgres") == 0)
|
||||
@@ -222,7 +222,7 @@ main(int argc, char *argv[])
|
||||
{
|
||||
printfPQExpBuffer(&sql, "COMMENT ON DATABASE %s IS ", fmtId(dbname));
|
||||
appendStringLiteralConn(&sql, comment, conn);
|
||||
appendPQExpBufferStr(&sql, ";");
|
||||
appendPQExpBufferChar(&sql, ';');
|
||||
|
||||
if (echo)
|
||||
printf("%s\n", sql.data);
|
||||
|
@@ -321,7 +321,7 @@ main(int argc, char *argv[])
|
||||
appendPQExpBuffer(&sql, "%s", fmtId(cell->val));
|
||||
}
|
||||
}
|
||||
appendPQExpBufferStr(&sql, ";");
|
||||
appendPQExpBufferChar(&sql, ';');
|
||||
|
||||
if (echo)
|
||||
printf("%s\n", sql.data);
|
||||
|
@@ -295,7 +295,7 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
|
||||
appendPQExpBuffer(&sql, " SCHEMA %s", name);
|
||||
else if (strcmp(type, "DATABASE") == 0)
|
||||
appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
|
||||
appendPQExpBufferStr(&sql, ";");
|
||||
appendPQExpBufferChar(&sql, ';');
|
||||
|
||||
conn = connectDatabase(dbname, host, port, username, prompt_password,
|
||||
progname, false);
|
||||
|
@@ -392,7 +392,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
|
||||
ntups = PQntuples(res);
|
||||
for (i = 0; i < ntups; i++)
|
||||
{
|
||||
appendPQExpBuffer(&buf, "%s",
|
||||
appendPQExpBufferStr(&buf,
|
||||
fmtQualifiedId(PQserverVersion(conn),
|
||||
PQgetvalue(res, i, 1),
|
||||
PQgetvalue(res, i, 0)));
|
||||
@@ -643,7 +643,7 @@ prepare_vacuum_command(PQExpBuffer sql, PGconn *conn, vacuumingOptions *vacopts,
|
||||
sep = comma;
|
||||
}
|
||||
if (sep != paren)
|
||||
appendPQExpBufferStr(sql, ")");
|
||||
appendPQExpBufferChar(sql, ')');
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user