From 21c2eea0d06e9183abc55092226acdb60cc9e58d Mon Sep 17 00:00:00 2001
From: Michel Pelletier <michelp@users.noreply.github.com>
Date: Wed, 1 Nov 2023 11:43:49 -0700
Subject: [PATCH] Update test runner for pg 16 and add pgsodium.seclabel view
 easily see labled columns. (#93)

Co-authored-by: Michel Pelletier <michel@levy.net>
---
 Dockerfile                     | 2 +-
 sql/pgsodium--3.1.8--3.1.9.sql | 2 +-
 test.sh                        | 2 +-
 test/pgsodium_schema.sql       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 08de39f..564843b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 # install base dependences
 RUN apt-get update && \
     apt-get install -y make cmake git curl build-essential m4 sudo gdbserver \
-    gdb libreadline-dev bison flex zlib1g-dev tmux zile zip vim gawk wget
+    gdb libreadline-dev bison flex zlib1g-dev tmux zile zip vim gawk wget libicu-dev pkg-config
 
 # add postgres user and make data dir
 RUN groupadd -r postgres && useradd --no-log-init -r -m -s /bin/bash -g postgres -G sudo postgres
diff --git a/sql/pgsodium--3.1.8--3.1.9.sql b/sql/pgsodium--3.1.8--3.1.9.sql
index 190c850..2a36e58 100644
--- a/sql/pgsodium--3.1.8--3.1.9.sql
+++ b/sql/pgsodium--3.1.8--3.1.9.sql
@@ -95,7 +95,7 @@ BEGIN
 	END IF;
   END LOOP;
 
-  raise notice 'about to masking role % %', source_name, rule.view_name;
+  RAISE NOTICE 'Masking role % %', source_name, rule.view_name;
   PERFORM pgsodium.mask_role(oid::regrole, source_name, rule.view_name)
   FROM pg_roles WHERE pgsodium.has_mask(oid::regrole, source_name);
 
diff --git a/test.sh b/test.sh
index 9a6d7e6..372335c 100755
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-versions=${1:-13 14 15}
+versions=${1:-13 14 15 16}
 
 for version in $versions
 do
diff --git a/test/pgsodium_schema.sql b/test/pgsodium_schema.sql
index da827b4..b182383 100644
--- a/test/pgsodium_schema.sql
+++ b/test/pgsodium_schema.sql
@@ -1009,7 +1009,7 @@ SELECT function_privs_are('pgsodium'::name, proname, proargtypes::regtype[]::tex
     AND oidvectortypes(proargtypes) = 'oid, boolean';
 
 SELECT unnest(ARRAY[
-    is(md5(prosrc), '2b415aec3b2a3421dd4b9c876abe620e',
+    is(md5(prosrc), 'b034b801e006293fa2d4de77db4b1829',
        format('Function pgsodium.%s(%s) body should match checksum',
               proname, pg_get_function_identity_arguments(oid))
     ),