diff options
Diffstat (limited to 'src/bin/scripts/reindexdb.c')
| -rw-r--r-- | src/bin/scripts/reindexdb.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index 0c8c90c22a4..43f61013ef1 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -264,7 +264,7 @@ main(int argc, char *argv[]) * specified */ if (indexes.head == NULL && tables.head == NULL && schemas.head == NULL) - reindex_one_database(dbname, dbname, "DATABASE", host, port, + reindex_one_database(NULL, dbname, "DATABASE", host, port, username, prompt_password, progname, echo, verbose); } @@ -281,6 +281,9 @@ reindex_one_database(const char *name, const char *dbname, const char *type, PGconn *conn; + conn = connectDatabase(dbname, host, port, username, prompt_password, + progname, false, false); + initPQExpBuffer(&sql); appendPQExpBufferStr(&sql, "REINDEX"); @@ -295,26 +298,23 @@ reindex_one_database(const char *name, const char *dbname, const char *type, else if (strcmp(type, "SCHEMA") == 0) appendPQExpBuffer(&sql, " SCHEMA %s", name); else if (strcmp(type, "DATABASE") == 0) - appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name)); + appendPQExpBuffer(&sql, " DATABASE %s", fmtId(PQdb(conn))); appendPQExpBufferChar(&sql, ';'); - conn = connectDatabase(dbname, host, port, username, prompt_password, - progname, false, false); - if (!executeMaintenanceCommand(conn, sql.data, echo)) { if (strcmp(type, "TABLE") == 0) fprintf(stderr, _("%s: reindexing of table \"%s\" in database \"%s\" failed: %s"), - progname, name, dbname, PQerrorMessage(conn)); + progname, name, PQdb(conn), PQerrorMessage(conn)); if (strcmp(type, "INDEX") == 0) fprintf(stderr, _("%s: reindexing of index \"%s\" in database \"%s\" failed: %s"), - progname, name, dbname, PQerrorMessage(conn)); + progname, name, PQdb(conn), PQerrorMessage(conn)); if (strcmp(type, "SCHEMA") == 0) fprintf(stderr, _("%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"), - progname, name, dbname, PQerrorMessage(conn)); + progname, name, PQdb(conn), PQerrorMessage(conn)); else fprintf(stderr, _("%s: reindexing of database \"%s\" failed: %s"), - progname, dbname, PQerrorMessage(conn)); + progname, PQdb(conn), PQerrorMessage(conn)); PQfinish(conn); exit(1); } @@ -360,9 +360,11 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port, const char *username, enum trivalue prompt_password, const char *progname, bool echo, bool verbose) { + PGconn *conn; PQExpBufferData sql; - PGconn *conn; + conn = connectDatabase(dbname, host, port, username, prompt_password, + progname, false, false); initPQExpBuffer(&sql); @@ -371,10 +373,8 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port, if (verbose) appendPQExpBuffer(&sql, " (VERBOSE)"); - appendPQExpBuffer(&sql, " SYSTEM %s;", dbname); + appendPQExpBuffer(&sql, " SYSTEM %s;", PQdb(conn)); - conn = connectDatabase(dbname, host, port, username, prompt_password, - progname, false, false); if (!executeMaintenanceCommand(conn, sql.data, echo)) { fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"), |