Update test runner for pg 16 and add pgsodium.seclabel view easily se…

…e labled columns.
michelp · Sep 20, 2023 · a00a493 · a00a493
1 parent dc411ab
commit a00a493
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git 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
@@ -125,3 +125,14 @@ $$
   LANGUAGE plpgsql
   SET search_path=''
 ;
+
+CREATE VIEW pgsodium.seclabel AS
+    SELECT nspname, relname, attname, label
+    FROM pg_seclabel sl,
+         pg_class c,
+         pg_attribute a,
+         pg_namespace n
+    WHERE sl.objoid = c.oid
+    AND c.oid = a.attrelid
+    AND a.attnum = sl.objsubid
+    AND n.oid = c.relnamespace;
diff --git 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
@@ -175,7 +175,8 @@ SELECT bag_eq($$
     ('view pgsodium.decrypted_key'                                                                                 ::text),
     ('view pgsodium.mask_columns'                                                                                  ::text),
     ('view pgsodium.masking_rule'                                                                                  ::text),
-    ('view pgsodium.valid_key'                                                                                     ::text)
+    ('view pgsodium.valid_key'                                                                                     ::text),
+    ('view pgsodium.seclabel'                                                                                      ::text)
   $$,
   'Check extension object list');
 
@@ -460,7 +461,8 @@ SELECT views_are('pgsodium', ARRAY[
     'decrypted_key',
     'mask_columns',
     'masking_rule',
-    'valid_key'
+    'valid_key',
+    'seclabel'
 ]);
 
 ---- VIEW decrypted_key