From 64cc2070ede65a9e64cbff8ec53682591481b962 Mon Sep 17 00:00:00 2001
From: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri, 6 Apr 2018 14:47:53 +0900
Subject: [PATCH] Fix the broken behavior made by restricting the search path

This commit doesn't include the change of regression test files.
---
 bin/pg_repack.c      | 11 ++++++-----
 lib/pg_repack.sql.in |  6 ++++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bin/pg_repack.c b/bin/pg_repack.c
index 9a62a47..7793f61 100644
--- a/bin/pg_repack.c
+++ b/bin/pg_repack.c
@@ -1926,6 +1926,7 @@ repack_table_indexes(PGresult *index_details)
 	params[1] = utoa(table, buffer[1]);
 	params[2] = tablespace;
 	schema_name = getstr(index_details, 0, 5);
+	/* table_name is schema-qualified */
 	table_name = getstr(index_details, 0, 4);
 
 	/* Keep track of which of the table's indexes we have successfully
@@ -1958,7 +1959,7 @@ repack_table_indexes(PGresult *index_details)
 							 "WHERE pgc.relname = 'index_%u' "
 							 "AND nsp.nspname = $1", index);
 			params[0] = schema_name;
-			elog(INFO, "repacking index \"%s\".\"%s\"", schema_name, idx_name);
+			elog(INFO, "repacking index \"%s\"", idx_name);
 			res = execute(sql.data, 1, params);
 			if (PQresultStatus(res) != PGRES_TUPLES_OK)
 			{
@@ -1990,8 +1991,8 @@ repack_table_indexes(PGresult *index_details)
 			if (PQntuples(res) < 1)
 			{
 				elog(WARNING,
-					"unable to generate SQL to CREATE work index for %s.%s",
-					schema_name, getstr(index_details, i, 0));
+					"unable to generate SQL to CREATE work index for %s",
+					getstr(index_details, i, 0));
 				continue;
 			}
 
@@ -2121,7 +2122,7 @@ repack_all_indexes(char *errbuf, size_t errsize)
 	if (r_index.head)
 	{
 		appendStringInfoString(&sql,
-			"SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid, idx.indrelid::regclass, n.nspname"
+			"SELECT repack.oid2text(i.oid), idx.indexrelid, idx.indisvalid, idx.indrelid, repack.oid2text(idx.indrelid), n.nspname"
 			" FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid"
 			" JOIN pg_namespace n ON n.oid = i.relnamespace"
 			" WHERE idx.indexrelid = $1::regclass ORDER BY indisvalid DESC, i.relname, n.nspname");
@@ -2131,7 +2132,7 @@ repack_all_indexes(char *errbuf, size_t errsize)
 	else if (table_list.head || parent_table_list.head)
 	{
 		appendStringInfoString(&sql,
-			"SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid, $1::text, n.nspname"
+			"SELECT repack.oid2text(i.oid), idx.indexrelid, idx.indisvalid, idx.indrelid, $1::text, n.nspname"
 			" FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid"
 			" JOIN pg_namespace n ON n.oid = i.relnamespace"
 			" WHERE idx.indrelid = $1::regclass ORDER BY indisvalid DESC, i.relname, n.nspname");
diff --git a/lib/pg_repack.sql.in b/lib/pg_repack.sql.in
index 249547c..99003b6 100644
--- a/lib/pg_repack.sql.in
+++ b/lib/pg_repack.sql.in
@@ -23,11 +23,13 @@ CREATE AGGREGATE repack.array_accum (
     initcond = '{}'
 );
 
+-- Always specify search_path to 'pg_catalog' so that we
+-- always can get schema-qualified relation name
 CREATE FUNCTION repack.oid2text(oid) RETURNS text AS
 $$
 	SELECT textin(regclassout($1));
 $$
-LANGUAGE sql STABLE STRICT;
+LANGUAGE sql STABLE STRICT SET search_path to 'pg_catalog';
 
 CREATE FUNCTION repack.get_index_columns(oid, text) RETURNS text AS
 $$
@@ -235,7 +237,7 @@ CREATE VIEW repack.primary_keys AS
    GROUP BY indrelid;
 
 CREATE VIEW repack.tables AS
-  SELECT R.oid::regclass AS relname,
+  SELECT repack.oid2text(R.oid) AS relname,
          R.oid AS relid,
          R.reltoastrelid AS reltoastrelid,
          CASE WHEN R.reltoastrelid = 0 THEN 0 ELSE (