farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More explicit error message if the version functions are not found

Browse Source
This commit is contained in:
Daniele Varrazzo 2012-11-23 00:55:53 +00:00
parent 0e74882429
commit 700a1a6c48
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pg_repack.c
View File

@ -186,6 +186,7 @@ static bool kill_ddl(PGconn *conn, Oid relid, bool terminate);
static bool lock_access_share(PGconn *conn, Oid relid, const char *target_name); static bool lock_access_share(PGconn *conn, Oid relid, const char *target_name);
#define SQLSTATE_INVALID_SCHEMA_NAME "3F000" #define SQLSTATE_INVALID_SCHEMA_NAME "3F000"
#define SQLSTATE_UNDEFINED_FUNCTION "42883"
#define SQLSTATE_QUERY_CANCELED "57014" #define SQLSTATE_QUERY_CANCELED "57014"
static bool sqlstate_equals(PGresult *res, const char *state) static bool sqlstate_equals(PGresult *res, const char *state)
@ -477,12 +478,16 @@ repack_one_database(const char *orderby, char *errbuf, size_t errsize)
} }
else else
{ {
if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME)) if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME)
|| sqlstate_equals(res, SQLSTATE_UNDEFINED_FUNCTION))
{ {
/* Schema repack does not exist. Skip the database. */ /* Schema repack does not exist, or version too old (version
* functions not found). Skip the database.
*/
if (errbuf) if (errbuf)
snprintf(errbuf, errsize, snprintf(errbuf, errsize,
"%s is not installed in the database", PROGRAM_NAME); "%s %s is not installed in the database",
PROGRAM_NAME, PROGRAM_VERSION);
} }
else else
{ {