diff -U3 /tmp/cirrus-ci-build/src/test/regress/expected/rules.out /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rules.out
--- /tmp/cirrus-ci-build/src/test/regress/expected/rules.out	2024-10-20 15:03:15.522913509 +0000
+++ /tmp/cirrus-ci-build/src/test/recovery/tmp_check/results/rules.out	2024-10-20 15:09:37.996660894 +0000
@@ -1401,15 +1401,18 @@
 pg_ownerships| SELECT (a.classid)::regclass AS classid,
     a.objid,
     a.objsubid,
-    (pg_identify_object(a.classid, a.objid, a.objsubid)).type AS type,
-    (pg_identify_object(a.classid, a.objid, a.objsubid)).schema AS schema,
-    (pg_identify_object(a.classid, a.objid, a.objsubid)).name AS name,
-    (pg_identify_object(a.classid, a.objid, a.objsubid)).identity AS identity,
+    identify.type,
+    identify.schema,
+    identify.name,
+    identify.identity,
     (a.refobjid)::regrole AS owner
    FROM ((pg_shdepend a
      JOIN pg_database ON (((pg_database.datname = current_database()) AND (pg_database.oid = a.dbid))))
-     JOIN pg_authid ON (((pg_authid.oid = a.refobjid) AND (a.refclassid = ('pg_authid'::regclass)::oid))))
-  WHERE (a.deptype = 'o'::"char");
+     JOIN pg_authid ON (((pg_authid.oid = a.refobjid) AND (a.refclassid = ('pg_authid'::regclass)::oid)))),
+    LATERAL pg_identify_object(a.classid, a.objid, a.objsubid) identify(type, schema, name, identity)
+  WHERE ((a.deptype = 'o'::"char") AND (a.dbid = ( SELECT pg_database_1.oid
+           FROM pg_database pg_database_1
+          WHERE (pg_database_1.datname = current_database()))));
 pg_policies| SELECT n.nspname AS schemaname,
     c.relname AS tablename,
     pol.polname AS policyname,
@@ -1468,18 +1471,22 @@
    FROM ( SELECT pg_shdepend.classid,
             pg_shdepend.objid,
             pg_shdepend.objsubid,
-            (pg_identify_object(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid)).type AS type,
-            (pg_identify_object(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid)).schema AS schema,
-            (pg_identify_object(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid)).name AS name,
-            (pg_identify_object(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid)).identity AS identity,
-            (aclexplode(pg_get_acl(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid))).grantor AS grantor,
-            (aclexplode(pg_get_acl(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid))).grantee AS grantee,
-            (aclexplode(pg_get_acl(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid))).privilege_type AS privilege_type,
-            (aclexplode(pg_get_acl(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid))).is_grantable AS is_grantable
+            identify.type,
+            identify.schema,
+            identify.name,
+            identify.identity,
+            aclexplode.grantor,
+            aclexplode.grantee,
+            aclexplode.privilege_type,
+            aclexplode.is_grantable
            FROM ((pg_shdepend
              JOIN pg_database ON (((pg_database.datname = current_database()) AND (pg_database.oid = pg_shdepend.dbid))))
-             JOIN pg_authid ON (((pg_authid.oid = pg_shdepend.refobjid) AND (pg_shdepend.refclassid = ('pg_authid'::regclass)::oid))))
-          WHERE (pg_shdepend.deptype = 'a'::"char")) a;
+             JOIN pg_authid ON (((pg_authid.oid = pg_shdepend.refobjid) AND (pg_shdepend.refclassid = ('pg_authid'::regclass)::oid)))),
+            LATERAL pg_identify_object(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid) identify(type, schema, name, identity),
+            LATERAL aclexplode(pg_get_acl(pg_shdepend.classid, pg_shdepend.objid, pg_shdepend.objsubid)) aclexplode(grantor, grantee, privilege_type, is_grantable)
+          WHERE ((pg_shdepend.deptype = 'a'::"char") AND (pg_shdepend.dbid = ( SELECT pg_database_1.oid
+                   FROM pg_database pg_database_1
+                  WHERE (pg_database_1.datname = current_database()))))) a;
 pg_publication_tables| SELECT p.pubname,
     n.nspname AS schemaname,
     c.relname AS tablename,