From 3dadeef5d9ffe94deac926d7266a2ec64795e159 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Wed, 22 Nov 2023 09:32:35 +0900 Subject: [PATCH] Fix query checking consistency of table amhandlers in opr_sanity.sql As written, the query checked for an access method of type 's', which is not an AM type supported in the core code. Error introduced by 8586bf7ed888. As this query is not checking what it should, backpatch all the way down. Reviewed-by: Aleksander Alekseev Discussion: https://postgr.es/m/ZVxJkAJrKbfHETiy@paquier.xyz Backpatch-through: 12 --- src/test/regress/expected/opr_sanity.out | 2 +- src/test/regress/sql/opr_sanity.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out index 69475d84303..0b45208f124 100644 --- a/src/test/regress/expected/opr_sanity.out +++ b/src/test/regress/expected/opr_sanity.out @@ -1886,7 +1886,7 @@ WHERE p2.oid = p1.amhandler AND p1.amtype = 'i' AND -- Check for table amhandler functions with the wrong signature SELECT p1.oid, p1.amname, p2.oid, p2.proname FROM pg_am AS p1, pg_proc AS p2 -WHERE p2.oid = p1.amhandler AND p1.amtype = 's' AND +WHERE p2.oid = p1.amhandler AND p1.amtype = 't' AND (p2.prorettype != 'table_am_handler'::regtype OR p2.proretset OR p2.pronargs != 1 diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql index 5a9c4796923..41dcb9a1900 100644 --- a/src/test/regress/sql/opr_sanity.sql +++ b/src/test/regress/sql/opr_sanity.sql @@ -1195,7 +1195,7 @@ WHERE p2.oid = p1.amhandler AND p1.amtype = 'i' AND SELECT p1.oid, p1.amname, p2.oid, p2.proname FROM pg_am AS p1, pg_proc AS p2 -WHERE p2.oid = p1.amhandler AND p1.amtype = 's' AND +WHERE p2.oid = p1.amhandler AND p1.amtype = 't' AND (p2.prorettype != 'table_am_handler'::regtype OR p2.proretset OR p2.pronargs != 1 -- 2.39.5