From: Michael Paquier <michael@paquier.xyz>
Date: Thu, 18 Nov 2021 03:52:49 +0000 (+0900)
Subject: Fix quoting of ACL item in table for upgrade binary compatibility checks
X-Git-Tag: REL_15_BETA1~1168
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac1c7458b17633d1e53a01393d12774c10cb6a91;p=thirdparty%2Fpostgresql.git

Fix quoting of ACL item in table for upgrade binary compatibility checks

Per buildfarm member prion, that runs the regression tests under a role
name that uses a hyphen.  Issue introduced by 835bcba.

Discussion: https://postgr.es/m/YZW4MvzCZ+hQ34vw@paquier.xyz
Backpatch-through: 12
---

diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 3ffd9d0d712..257b6cac125 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -713,7 +713,7 @@ CREATE TABLE tab_core_types AS SELECT
   'abc'::refcursor,
   '1 2'::int2vector,
   '1 2'::oidvector,
-  format('%s=UC/%s', USER, USER)::aclitem,
+  format('%I=UC/%I', USER, USER)::aclitem AS aclitem,
   'a fat cat sat on a mat and ate a fat rat'::tsvector,
   'fat & rat'::tsquery,
   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid,
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index f92773b75ee..8281076423e 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -535,7 +535,7 @@ CREATE TABLE tab_core_types AS SELECT
   'abc'::refcursor,
   '1 2'::int2vector,
   '1 2'::oidvector,
-  format('%s=UC/%s', USER, USER)::aclitem,
+  format('%I=UC/%I', USER, USER)::aclitem AS aclitem,
   'a fat cat sat on a mat and ate a fat rat'::tsvector,
   'fat & rat'::tsquery,
   'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::uuid,