Merge branch 'version_check'

bin/pg_repack.c

@@ -83,7 +83,7 @@ typedef struct repack_index
 } repack_index;
 
 static void repack_all_databases(const char *order_by);
-static bool repack_one_database(const char *order_by, const char *table);
+static bool repack_one_database(const char *order_by, const char *table, char *errbuf, size_t errsize);
 static void repack_one_table(const repack_table *table, const char *order_by);
 static void repack_cleanup(bool fatal, void *userdata);
 
@@ -152,10 +152,11 @@ main(int argc, char *argv[])
 	}
 	else
 	{
-		if (!repack_one_database(orderby, table))
+		char	errbuf[256];
+		if (!repack_one_database(orderby, table, errbuf, sizeof(errbuf)))
 			ereport(ERROR,
-				(errcode(ENOENT),
+				(errcode(ERROR),
-				 errmsg("%s is not installed", PROGRAM_NAME)));
+				 errmsg("%s", errbuf)));
 	}
 
 	return 0;
@@ -178,6 +179,7 @@ repack_all_databases(const char *orderby)
 	for (i = 0; i < PQntuples(result); i++)
 	{
 		bool	ret;
+		char	errbuf[256];
 
 		dbname = PQgetvalue(result, i, 0);
 
@@ -187,14 +189,14 @@ repack_all_databases(const char *orderby)
 			fflush(stdout);
 		}
 
-		ret = repack_one_database(orderby, NULL);
+		ret = repack_one_database(orderby, NULL, errbuf, sizeof(errbuf));
 
 		if (pgut_log_level >= INFO)
 		{
 			if (ret)
 				printf("\n");
 			else
-				printf(" ... skipped\n");
+				printf(" ... skipped: %s\n", errbuf);
 			fflush(stdout);
 		}
 	}
@@ -225,9 +227,9 @@ getoid(PGresult *res, int row, int col)
  * Call repack_one_table for the target table or each table in a database.
  */
 static bool
-repack_one_database(const char *orderby, const char *table)
+repack_one_database(const char *orderby, const char *table, char *errbuf, size_t errsize)
 {
-	bool			ret = true;
+	bool			ret = false;
 	PGresult	   *res;
 	int				i;
 	int				num;
@@ -237,6 +239,57 @@ repack_one_database(const char *orderby, const char *table)
 
 	reconnect(ERROR);
 
+	/* Query the extension version. Exit if no match */
+	res = execute_elevel("select repack.version(), repack.version_sql()",
+		0, NULL, DEBUG2);
+	if (PQresultStatus(res) == PGRES_TUPLES_OK)
+	{
+		const char	   *libver;
+		char			buf[64];
+
+		/* the string is something like "pg_repack 1.1.7" */
+		snprintf(buf, sizeof(buf), "%s %s", PROGRAM_NAME, PROGRAM_VERSION);
+
+		/* check the version of the C library */
+		libver = getstr(res, 0, 0);
+		if (0 != strcmp(buf, libver))
+		{
+			if (errbuf)
+				snprintf(errbuf, errsize,
+					"program '%s' does not match database library '%s'",
+					buf, libver);
+			goto cleanup;
+		}
+
+		/* check the version of the SQL extension */
+		libver = getstr(res, 0, 1);
+		if (0 != strcmp(buf, libver))
+		{
+			if (errbuf)
+				snprintf(errbuf, errsize,
+					"extension '%s' required, found extension '%s'",
+					buf, libver);
+			goto cleanup;
+		}
+	}
+	else
+	{
+		if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME))
+		{
+			/* Schema repack does not exist. Skip the database. */
+			if (errbuf)
+				snprintf(errbuf, errsize,
+					"%s is not installed in the database", PROGRAM_NAME);
+		}
+		else
+		{
+			/* Return the error message otherwise */
+			if (errbuf)
+				snprintf(errbuf, errsize, "%s", PQerrorMessage(connection));
+		}
+		goto cleanup;
+	}
+
 	/* Disable statement timeout. */
 	command("SET statement_timeout = 0", 0, NULL);
 
@@ -261,21 +314,24 @@ repack_one_database(const char *orderby, const char *table)
 		res = execute_elevel(sql.data, 0, NULL, DEBUG2);
 	}
 
+	/* on error skip the database */
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME))
 		{
 			/* Schema repack does not exist. Skip the database. */
-			ret = false;
+			if (errbuf)
-			goto cleanup;
+				snprintf(errbuf, errsize,
+					"%s is not installed in the database", PROGRAM_NAME);
 		}
 		else
 		{
-			/* exit otherwise */
+			/* Return the error message otherwise */
-			printf("%s", PQerrorMessage(connection));
+			if (errbuf)
-			PQclear(res);
+				snprintf(errbuf, errsize, "%s", PQerrorMessage(connection));
-			exit(1);
 		}
+		ret = false;
+		goto cleanup;
 	}
 
 	num = PQntuples(res);
@@ -341,6 +397,7 @@ repack_one_database(const char *orderby, const char *table)
 
 		repack_one_table(&table, orderby);
 	}
+	ret = true;
 
 cleanup:
 	PQclear(res);

doc/pg_repack.rst

@@ -270,7 +270,7 @@ version load the script ``$SHAREDIR/contrib/uninstall_pg_repack.sql`` into the
 database where the error occured and then load
 ``$SHAREDIR/contrib/pg_repack.sql`` again.
 
-pg_repack: repack database "template1" ... skipped
+pg_repack: reorg database "template1" ... skipped: pg_repack is not installed in the database
     pg_repack is not installed in the database when ``--all`` option is
     specified.
 
@@ -281,6 +281,22 @@ ERROR: pg_repack is not installed
 
     Do register pg_repack to the database.
 
+ERROR: program 'pg_repack V1' does not match database library 'pg_repack V2'
+    There is a mismatch between the ``pg_repack`` binary and the database
+    library (``.so`` or ``.dll``).
+
+    The mismatch could be due to the wrong binary in the ``$PATH`` or the
+    wrong database being addressed. Check the program directory and the
+    database; if they are what expected you may need to repeat pg_repack
+    installation.
+
+ERROR: extension 'pg_repack V1' required, found extension 'pg_repack V2'
+    The SQL extension found in the database does not match the version
+    required by the pg_repack program.
+
+    You should drop the extension from the database and reload it as described
+    in the installation_ section.
+
 ERROR: relation "table" has no primary key
     The target table doesn't have PRIMARY KEY.
 

lib/Makefile

@@ -30,7 +30,7 @@ DATA_built = pg_repack.sql
 DATA = uninstall_pg_repack.sql
 endif
 
-USE_PGXS = 1	# use pgxs if not in contrib directory
+USE_PGXS = 1
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
@@ -40,11 +40,12 @@ LIBS := $(filter-out -lxslt, $(LIBS))
 
 pg_repack.sql: pg_repack.sql.in
 	echo "BEGIN;\n" > $@; \
-	sed 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< >> $@; \
+	sed 's,MODULE_PATHNAME,$$libdir/$(MODULE_big),g' $< \
+	| sed 's,REPACK_VERSION,$(REPACK_VERSION),g' >> $@; \
 	echo "\nCOMMIT;" >> $@;
 
 pg_repack--$(REPACK_VERSION).sql: pg_repack.sql.in
-	cat $< > $@;
+	sed 's,REPACK_VERSION,$(REPACK_VERSION),g' $< > $@;
 
 pg_repack.control: pg_repack.control.in
 	sed 's,REPACK_VERSION,$(REPACK_VERSION),g' $< > $@

lib/pg_repack.sql.in

@@ -12,6 +12,10 @@ CREATE FUNCTION repack.version() RETURNS text AS
 'MODULE_PATHNAME', 'repack_version'
 LANGUAGE C IMMUTABLE STRICT;
 
+CREATE FUNCTION repack.version_sql() RETURNS text AS
+$$SELECT 'pg_repack REPACK_VERSION'::text$$
+LANGUAGE SQL IMMUTABLE STRICT;
+
 CREATE AGGREGATE repack.array_accum (
     sfunc = array_append,
     basetype = anyelement,