1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254
|
--- sql/pgtap.sql
+++ sql/pgtap.sql
@@ -675,7 +675,7 @@
' caught: no exception' ||
E'\n wanted: ' || COALESCE( errcode, 'an exception' )
);
-EXCEPTION WHEN OTHERS OR ASSERT_FAILURE THEN
+EXCEPTION WHEN OTHERS THEN
IF (errcode IS NULL OR SQLSTATE = errcode)
AND ( errmsg IS NULL OR SQLERRM = errmsg)
THEN
@@ -779,7 +779,7 @@
BEGIN
EXECUTE code;
RETURN ok( TRUE, descr );
-EXCEPTION WHEN OTHERS OR ASSERT_FAILURE THEN
+EXCEPTION WHEN OTHERS THEN
-- There should have been no exception.
GET STACKED DIAGNOSTICS
detail = PG_EXCEPTION_DETAIL,
@@ -10339,233 +10339,6 @@
), $2);
$$ LANGUAGE SQL immutable;
--- policies_are( schema, table, policies[], description )
-CREATE OR REPLACE FUNCTION policies_are( NAME, NAME, NAME[], TEXT )
-RETURNS TEXT AS $$
- SELECT _are(
- 'policies',
- ARRAY(
- SELECT p.polname
- FROM pg_catalog.pg_policy p
- JOIN pg_catalog.pg_class c ON c.oid = p.polrelid
- JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
- WHERE n.nspname = $1
- AND c.relname = $2
- EXCEPT
- SELECT $3[i]
- FROM generate_series(1, array_upper($3, 1)) s(i)
- ),
- ARRAY(
- SELECT $3[i]
- FROM generate_series(1, array_upper($3, 1)) s(i)
- EXCEPT
- SELECT p.polname
- FROM pg_catalog.pg_policy p
- JOIN pg_catalog.pg_class c ON c.oid = p.polrelid
- JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
- WHERE n.nspname = $1
- AND c.relname = $2
- ),
- $4
- );
-$$ LANGUAGE SQL;
-
--- policies_are( schema, table, policies[] )
-CREATE OR REPLACE FUNCTION policies_are( NAME, NAME, NAME[] )
-RETURNS TEXT AS $$
- SELECT policies_are( $1, $2, $3, 'Table ' || quote_ident($1) || '.' || quote_ident($2) || ' should have the correct policies' );
-$$ LANGUAGE SQL;
-
--- policies_are( table, policies[], description )
-CREATE OR REPLACE FUNCTION policies_are( NAME, NAME[], TEXT )
-RETURNS TEXT AS $$
- SELECT _are(
- 'policies',
- ARRAY(
- SELECT p.polname
- FROM pg_catalog.pg_policy p
- JOIN pg_catalog.pg_class c ON c.oid = p.polrelid
- JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
- WHERE c.relname = $1
- AND n.nspname NOT IN ('pg_catalog', 'information_schema')
- EXCEPT
- SELECT $2[i]
- FROM generate_series(1, array_upper($2, 1)) s(i)
- ),
- ARRAY(
- SELECT $2[i]
- FROM generate_series(1, array_upper($2, 1)) s(i)
- EXCEPT
- SELECT p.polname
- FROM pg_catalog.pg_policy p
- JOIN pg_catalog.pg_class c ON c.oid = p.polrelid
- JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
- AND n.nspname NOT IN ('pg_catalog', 'information_schema')
- ),
- $3
- );
-$$ LANGUAGE SQL;
-
--- policies_are( table, policies[] )
-CREATE OR REPLACE FUNCTION policies_are( NAME, NAME[] )
-RETURNS TEXT AS $$
- SELECT policies_are( $1, $2, 'Table ' || quote_ident($1) || ' should have the correct policies' );
-$$ LANGUAGE SQL;
-
--- policy_roles_are( schema, table, policy, roles[], description )
-CREATE OR REPLACE FUNCTION policy_roles_are( NAME, NAME, NAME, NAME[], TEXT )
-RETURNS TEXT AS $$
- SELECT _are(
- 'policy roles',
- ARRAY(
- SELECT pr.rolname
- FROM pg_catalog.pg_policy AS pp
- JOIN pg_catalog.pg_roles AS pr ON pr.oid = ANY (pp.polroles)
- JOIN pg_catalog.pg_class AS pc ON pc.oid = pp.polrelid
- JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
- WHERE pn.nspname = $1
- AND pc.relname = $2
- AND pp.polname = $3
- EXCEPT
- SELECT $4[i]
- FROM generate_series(1, array_upper($4, 1)) s(i)
- ),
- ARRAY(
- SELECT $4[i]
- FROM generate_series(1, array_upper($4, 1)) s(i)
- EXCEPT
- SELECT pr.rolname
- FROM pg_catalog.pg_policy AS pp
- JOIN pg_catalog.pg_roles AS pr ON pr.oid = ANY (pp.polroles)
- JOIN pg_catalog.pg_class AS pc ON pc.oid = pp.polrelid
- JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
- WHERE pn.nspname = $1
- AND pc.relname = $2
- AND pp.polname = $3
- ),
- $5
- );
-$$ LANGUAGE SQL;
-
--- policy_roles_are( schema, table, policy, roles[] )
-CREATE OR REPLACE FUNCTION policy_roles_are( NAME, NAME, NAME, NAME[] )
-RETURNS TEXT AS $$
- SELECT policy_roles_are( $1, $2, $3, $4, 'Policy ' || quote_ident($3) || ' for table ' || quote_ident($1) || '.' || quote_ident($2) || ' should have the correct roles' );
-$$ LANGUAGE SQL;
-
--- policy_roles_are( table, policy, roles[], description )
-CREATE OR REPLACE FUNCTION policy_roles_are( NAME, NAME, NAME[], TEXT )
-RETURNS TEXT AS $$
- SELECT _are(
- 'policy roles',
- ARRAY(
- SELECT pr.rolname
- FROM pg_catalog.pg_policy AS pp
- JOIN pg_catalog.pg_roles AS pr ON pr.oid = ANY (pp.polroles)
- JOIN pg_catalog.pg_class AS pc ON pc.oid = pp.polrelid
- JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
- WHERE pc.relname = $1
- AND pp.polname = $2
- AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
- EXCEPT
- SELECT $3[i]
- FROM generate_series(1, array_upper($3, 1)) s(i)
- ),
- ARRAY(
- SELECT $3[i]
- FROM generate_series(1, array_upper($3, 1)) s(i)
- EXCEPT
- SELECT pr.rolname
- FROM pg_catalog.pg_policy AS pp
- JOIN pg_catalog.pg_roles AS pr ON pr.oid = ANY (pp.polroles)
- JOIN pg_catalog.pg_class AS pc ON pc.oid = pp.polrelid
- JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
- WHERE pc.relname = $1
- AND pp.polname = $2
- AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
- ),
- $4
- );
-$$ LANGUAGE SQL;
-
--- policy_roles_are( table, policy, roles[] )
-CREATE OR REPLACE FUNCTION policy_roles_are( NAME, NAME, NAME[] )
-RETURNS TEXT AS $$
- SELECT policy_roles_are( $1, $2, $3, 'Policy ' || quote_ident($2) || ' for table ' || quote_ident($1) || ' should have the correct roles' );
-$$ LANGUAGE SQL;
-
--- policy_cmd_is( schema, table, policy, command, description )
-CREATE OR REPLACE FUNCTION policy_cmd_is( NAME, NAME, NAME, text, text )
-RETURNS TEXT AS $$
-DECLARE
- cmd text;
-BEGIN
- SELECT
- CASE pp.polcmd WHEN 'r' THEN 'SELECT'
- WHEN 'a' THEN 'INSERT'
- WHEN 'w' THEN 'UPDATE'
- WHEN 'd' THEN 'DELETE'
- ELSE 'ALL'
- END
- FROM pg_catalog.pg_policy AS pp
- JOIN pg_catalog.pg_class AS pc ON pc.oid = pp.polrelid
- JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
- WHERE pn.nspname = $1
- AND pc.relname = $2
- AND pp.polname = $3
- INTO cmd;
-
- RETURN is( cmd, upper($4), $5 );
-END;
-$$ LANGUAGE plpgsql;
-
--- policy_cmd_is( schema, table, policy, command )
-CREATE OR REPLACE FUNCTION policy_cmd_is( NAME, NAME, NAME, text )
-RETURNS TEXT AS $$
- SELECT policy_cmd_is(
- $1, $2, $3, $4,
- 'Policy ' || quote_ident($3)
- || ' for table ' || quote_ident($1) || '.' || quote_ident($2)
- || ' should apply to ' || upper($4) || ' command'
- );
-$$ LANGUAGE sql;
-
--- policy_cmd_is( table, policy, command, description )
-CREATE OR REPLACE FUNCTION policy_cmd_is( NAME, NAME, text, text )
-RETURNS TEXT AS $$
-DECLARE
- cmd text;
-BEGIN
- SELECT
- CASE pp.polcmd WHEN 'r' THEN 'SELECT'
- WHEN 'a' THEN 'INSERT'
- WHEN 'w' THEN 'UPDATE'
- WHEN 'd' THEN 'DELETE'
- ELSE 'ALL'
- END
- FROM pg_catalog.pg_policy AS pp
- JOIN pg_catalog.pg_class AS pc ON pc.oid = pp.polrelid
- JOIN pg_catalog.pg_namespace AS pn ON pn.oid = pc.relnamespace
- WHERE pc.relname = $1
- AND pp.polname = $2
- AND pn.nspname NOT IN ('pg_catalog', 'information_schema')
- INTO cmd;
-
- RETURN is( cmd, upper($3), $4 );
-END;
-$$ LANGUAGE plpgsql;
-
--- policy_cmd_is( table, policy, command )
-CREATE OR REPLACE FUNCTION policy_cmd_is( NAME, NAME, text )
-RETURNS TEXT AS $$
- SELECT policy_cmd_is(
- $1, $2, $3,
- 'Policy ' || quote_ident($2)
- || ' for table ' || quote_ident($1)
- || ' should apply to ' || upper($3) || ' command'
- );
-$$ LANGUAGE sql;
-
/******************** INHERITANCE ***********************************************/
/*
* Internal function to test whether the specified table in the specified schema
|