More explicit error message if the version functions are not found

dvarrazzo · dvarrazzo · commit 700a1a6c48df · 2013-04-17T18:11:33.000+01:00
diff --git a/bin/pg_repack.c b/bin/pg_repack.c
@@ -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);
 
 #define SQLSTATE_INVALID_SCHEMA_NAME	"3F000"
+#define SQLSTATE_UNDEFINED_FUNCTION		"42883"
 #define SQLSTATE_QUERY_CANCELED			"57014"
 
 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
 	{
-		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)
 				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
 		{

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ static bool kill_ddl(PGconn *conn, Oid relid, bool terminate);`
`186`	`186`	`static bool lock_access_share(PGconn conn, Oid relid, const char target_name);`
`187`	`187`
`188`	`188`	`#define SQLSTATE_INVALID_SCHEMA_NAME "3F000"`
	`189`	`+#define SQLSTATE_UNDEFINED_FUNCTION "42883"`
`189`	`190`	`#define SQLSTATE_QUERY_CANCELED "57014"`
`190`	`191`
`191`	`192`	`static bool sqlstate_equals(PGresult res, const char state)`
`@@ -477,12 +478,16 @@ repack_one_database(const char orderby, char errbuf, size_t errsize)`
`477`	`478`	`}`
`478`	`479`	`else`
`479`	`480`	`{`
`480`		`- if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME))`
	`481`	`+ if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME)`
	`482`	`+ \|\| sqlstate_equals(res, SQLSTATE_UNDEFINED_FUNCTION))`
`481`	`483`	`{`
`482`		`- /* Schema repack does not exist. Skip the database. */`
	`484`	`+ /* Schema repack does not exist, or version too old (version`
	`485`	`+ * functions not found). Skip the database.`
	`486`	`+ */`
`483`	`487`	`if (errbuf)`
`484`	`488`	`snprintf(errbuf, errsize,`
`485`		`- "%s is not installed in the database", PROGRAM_NAME);`
	`489`	`+ "%s %s is not installed in the database",`
	`490`	`+ PROGRAM_NAME, PROGRAM_VERSION);`
`486`	`491`	`}`
`487`	`492`	`else`
`488`	`493`	`{`