Fix some incorrectness in upgrade_adapt.sql on query for WITH OIDS

michaelpq · michaelpq · commit 3022cb143396 · 2022-12-23T11:26:49.000+09:00
The query used to disable WITH OIDS in all the relations making use of it was checking for materialized views, but this is not a supported operation. On the contrary, this needs to be done on foreign tables. While on it, use quote_ident() in the ALTER TABLE strings built on the relation name. Author: Anton A. Melnikov, Michael Paquier Discussion: https://postgr.es/m/49f389ba-95ce-8a9b-09ae-f60650c0e7c7@inbox.ru Backpatch-through: 12
diff --git a/src/bin/pg_upgrade/upgrade_adapt.sql b/src/bin/pg_upgrade/upgrade_adapt.sql
@@ -72,10 +72,10 @@ DO $stmt$
     FROM pg_class
     WHERE relname !~ '^pg_'
       AND relhasoids
-      AND relkind in ('r','m')
+      AND relkind in ('r', 'f')
     ORDER BY 1
   LOOP
-    execute 'ALTER TABLE ' || rec || ' SET WITHOUT OIDS';
+    EXECUTE 'ALTER TABLE ' || quote_ident(rec) || ' SET WITHOUT OIDS';
   END LOOP;
   END; $stmt$;
 \endif
