From: Michael Paquier <michael@paquier.xyz>
Date: Wed, 22 Nov 2023 00:32:42 +0000 (+0900)
Subject: Fix query checking consistency of table amhandlers in opr_sanity.sql
X-Git-Tag: REL_12_18~64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=deec80ef11d1f0312d1761cb4d6d529bc1de5974;p=thirdparty%2Fpostgresql.git

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
---

diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index 500184c1c56..e85aa413463 100644
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -1848,7 +1848,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 624bea46cea..cb64d7d77c3 100644
--- a/src/test/regress/sql/opr_sanity.sql
+++ b/src/test/regress/sql/opr_sanity.sql
@@ -1213,7 +1213,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