add base.combine_table_schema_and_name(...) and use it in audit+historization
This commit is contained in:
parent
4e0ad790e9
commit
ce40126e6b
@ -82,7 +82,7 @@ If you have at least Docker and the Java JDK installed in appropriate versions a
|
||||
|
||||
# the following command should return a JSON array with just all packages visible for the admin of the customer yyy:
|
||||
curl \
|
||||
-H 'current-subject: superuser-alex@hostsharing.net' -H 'assumed-roles: test_customer#yyy:ADMIN' \
|
||||
-H 'current-subject: superuser-alex@hostsharing.net' -H 'assumed-roles: test.customer#yyy:ADMIN' \
|
||||
http://localhost:8080/api/test/packages
|
||||
|
||||
# add a new customer
|
||||
|
@ -4,5 +4,16 @@
|
||||
-- ============================================================================
|
||||
--changeset michael.hoennig:base-SCHEMA endDelimiter:--//
|
||||
-- ----------------------------------------------------------------------------
|
||||
|
||||
-- FIXME: remove this block
|
||||
do $$
|
||||
declare
|
||||
changesetCount int;
|
||||
begin
|
||||
changesetCount := (select count(*) from databasechangelog);
|
||||
assert changesetCount = 0, 'total changesets executed: ' || changesetCount;
|
||||
end;
|
||||
$$;
|
||||
|
||||
CREATE SCHEMA base;
|
||||
--//
|
||||
|
@ -127,6 +127,7 @@ begin
|
||||
end; $$;
|
||||
--//
|
||||
|
||||
|
||||
-- ============================================================================
|
||||
--changeset michael.hoennig:context-base.ASSUMED-ROLES endDelimiter:--//
|
||||
-- ----------------------------------------------------------------------------
|
||||
|
@ -0,0 +1,18 @@
|
||||
--liquibase formatted sql
|
||||
|
||||
|
||||
-- ============================================================================
|
||||
--changeset michael.hoennig:base-COMBINE-TABLE-SCHEMA-AND-NAME endDelimiter:--//
|
||||
-- ----------------------------------------------------------------------------
|
||||
|
||||
create or replace function base.combine_table_schema_and_name(tableSchema name, tableName name)
|
||||
returns text
|
||||
language plpgsql as $$
|
||||
begin
|
||||
if tableSchema is null or tableSchema = 'public' or tableSchema = '' then
|
||||
return tableName::text;
|
||||
else
|
||||
return tableSchema::text || '.' || tableName::text;
|
||||
end if;
|
||||
end; $$;
|
||||
--//
|
@ -77,9 +77,11 @@ create or replace function base.tx_journal_trigger()
|
||||
declare
|
||||
curTask text;
|
||||
curTxId xid8;
|
||||
tableSchemaAndName text;
|
||||
begin
|
||||
curTask := base.currentTask();
|
||||
curTxId := pg_current_xact_id();
|
||||
tableSchemaAndName := base.combine_table_schema_and_name(tg_table_schema, tg_table_name);
|
||||
|
||||
insert
|
||||
into base.tx_context (txId, txTimestamp, currentSubject, assumedRoles, currentTask, currentRequest)
|
||||
@ -90,20 +92,20 @@ begin
|
||||
case tg_op
|
||||
when 'INSERT' then insert
|
||||
into base.tx_journal
|
||||
values (curTxId,
|
||||
tg_table_name, new.uuid, tg_op::base.tx_operation,
|
||||
values (curTxId, tableSchemaAndName,
|
||||
new.uuid, tg_op::base.tx_operation,
|
||||
to_jsonb(new));
|
||||
when 'UPDATE' then insert
|
||||
into base.tx_journal
|
||||
values (curTxId,
|
||||
tg_table_name, old.uuid, tg_op::base.tx_operation,
|
||||
values (curTxId, tableSchemaAndName,
|
||||
old.uuid, tg_op::base.tx_operation,
|
||||
base.jsonb_changes_delta(to_jsonb(old), to_jsonb(new)));
|
||||
when 'DELETE' then insert
|
||||
into base.tx_journal
|
||||
values (curTxId,
|
||||
tg_table_name, old.uuid, 'DELETE'::base.tx_operation,
|
||||
values (curTxId,tableSchemaAndName,
|
||||
old.uuid, 'DELETE'::base.tx_operation,
|
||||
null::jsonb);
|
||||
else raise exception 'Trigger op % not supported for %.', tg_op, tg_table_name;
|
||||
else raise exception 'Trigger op % not supported for %.', tg_op, tableSchemaAndName;
|
||||
end case;
|
||||
return null;
|
||||
end; $$;
|
||||
|
@ -81,8 +81,8 @@ begin
|
||||
"alive" := false;
|
||||
end if;
|
||||
|
||||
sql := format('INSERT INTO %3$I_ex VALUES (DEFAULT, pg_current_xact_id(), %1$L, %2$L, $1.*)', TG_OP, alive, TG_TABLE_NAME);
|
||||
raise notice 'sql: %', sql;
|
||||
sql := format('INSERT INTO %3$I_ex VALUES (DEFAULT, pg_current_xact_id(), %1$L, %2$L, $1.*)',
|
||||
TG_OP, alive, base.combine_table_schema_and_name(tg_table_schema, tg_table_name)::name);
|
||||
execute sql using "row";
|
||||
|
||||
return "row";
|
||||
|
@ -21,6 +21,8 @@ databaseChangeLog:
|
||||
file: db/changelog/0-base/009-check-environment.sql
|
||||
- include:
|
||||
file: db/changelog/0-base/010-context.sql
|
||||
- include:
|
||||
file: db/changelog/0-base/011-table-schema-and-name.sql
|
||||
- include:
|
||||
file: db/changelog/0-base/020-audit-log.sql
|
||||
- include:
|
||||
|
Loading…
Reference in New Issue
Block a user