Skip to content

[Cherry-Pick] log old and new fqid for notifcation on Update #423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrenkert merged 2 commits into from
Mar 26, 2026
+64 −44
Merged

[Cherry-Pick] log old and new fqid for notifcation on Update #423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da4c15f
log old and new fqid for notifcation on update (#400)
LinKaKling Mar 19, 2026
fdb7121
Merge branch 'staging-t1/4.3.1' into apply/staging-t1/commit-a9a4810c…
hjanott Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 32 additions & 22 deletions dev/sql/schema_relational.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,27 @@ END;
$sequences_trigger$
LANGUAGE plpgsql;

CREATE OR REPLACE PROCEDURE log_field_change(
operation_var TEXT,
fqid_var TEXT,
fields TEXT[]
) AS
$log_field_change$
BEGIN
INSERT INTO os_notify_log_t (operation, fqid, xact_id, timestamp, updated_fields)
VALUES (operation_var, fqid_var, pg_current_xact_id(), now(), fields)
ON CONFLICT (operation, fqid, xact_id) DO UPDATE SET updated_fields = (
SELECT ARRAY(
SELECT DISTINCT e
FROM unnest(COALESCE(os_notify_log_t.updated_fields, '{}'::varchar[])) AS e
UNION
SELECT DISTINCT e
FROM unnest(COALESCE(EXCLUDED.updated_fields, '{}'::varchar[])) AS e
)
);
END;
$log_field_change$ LANGUAGE plpgsql;

CREATE FUNCTION log_modified_models() RETURNS trigger AS $log_modified_trigger$
DECLARE
escaped_table_name varchar;
Expand All @@ -71,17 +92,7 @@ BEGIN
updated_fields_var := akeys((new_hstore - old_hstore) || (old_hstore - new_hstore));
END IF;

INSERT INTO os_notify_log_t (operation, fqid, xact_id, timestamp, updated_fields)
VALUES (operation_var, fqid_var, pg_current_xact_id(), 'now', updated_fields_var)
ON CONFLICT (operation,fqid,xact_id) DO UPDATE SET updated_fields = (
SELECT ARRAY(
SELECT DISTINCT e
FROM unnest(COALESCE(os_notify_log_t.updated_fields, '{}'::varchar[])) AS e
UNION
SELECT DISTINCT e
FROM unnest(COALESCE(EXCLUDED.updated_fields, '{}'::varchar[])) AS e
)
);
CALL log_field_change(operation_var, fqid_var, updated_fields_var);

RETURN NULL; -- AFTER TRIGGER needs no return
END;
Expand Down Expand Up @@ -160,17 +171,16 @@ BEGIN

IF foreign_id IS NOT NULL THEN
fqid_var := foreign_table || '/' || foreign_id;
INSERT INTO os_notify_log_t (operation, fqid, xact_id, timestamp, updated_fields)
VALUES ('update', fqid_var, pg_current_xact_id(), now(), ARRAY[fk_field])
ON CONFLICT (operation,fqid,xact_id) DO UPDATE SET updated_fields = (
SELECT ARRAY(
SELECT DISTINCT e
FROM unnest(COALESCE(os_notify_log_t.updated_fields, '{}'::varchar[])) AS e
UNION
SELECT DISTINCT e
FROM unnest(COALESCE(EXCLUDED.updated_fields, '{}'::varchar[])) AS e
)
);
CALL log_field_change('update', fqid_var, ARRAY[fk_field]);
END IF;

--when update there must be a notification for the old foreign_fqid
IF (TG_OP = 'UPDATE') THEN
EXECUTE format('SELECT ($1).%I', ref_column) INTO foreign_id USING OLD;
IF foreign_id IS NOT NULL THEN
fqid_var := foreign_table || '/' || foreign_id;
CALL log_field_change('update', fqid_var, ARRAY[fk_field]);
END IF;
END IF;

i := i + 3;
Expand Down
54 changes: 32 additions & 22 deletions dev/src/generate_sql_schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,27 @@ class Helper:
$sequences_trigger$
LANGUAGE plpgsql;

CREATE OR REPLACE PROCEDURE log_field_change(
operation_var TEXT,
fqid_var TEXT,
fields TEXT[]
) AS
$log_field_change$
BEGIN
INSERT INTO os_notify_log_t (operation, fqid, xact_id, timestamp, updated_fields)
VALUES (operation_var, fqid_var, pg_current_xact_id(), now(), fields)
ON CONFLICT (operation, fqid, xact_id) DO UPDATE SET updated_fields = (
SELECT ARRAY(
SELECT DISTINCT e
FROM unnest(COALESCE(os_notify_log_t.updated_fields, '{}'::varchar[])) AS e
UNION
SELECT DISTINCT e
FROM unnest(COALESCE(EXCLUDED.updated_fields, '{}'::varchar[])) AS e
)
);
END;
$log_field_change$ LANGUAGE plpgsql;

CREATE FUNCTION log_modified_models() RETURNS trigger AS $log_modified_trigger$
DECLARE
escaped_table_name varchar;
Expand All @@ -1052,17 +1073,7 @@ class Helper:
updated_fields_var := akeys((new_hstore - old_hstore) || (old_hstore - new_hstore));
END IF;

INSERT INTO os_notify_log_t (operation, fqid, xact_id, timestamp, updated_fields)
VALUES (operation_var, fqid_var, pg_current_xact_id(), 'now', updated_fields_var)
ON CONFLICT (operation,fqid,xact_id) DO UPDATE SET updated_fields = (
SELECT ARRAY(
SELECT DISTINCT e
FROM unnest(COALESCE(os_notify_log_t.updated_fields, '{}'::varchar[])) AS e
UNION
SELECT DISTINCT e
FROM unnest(COALESCE(EXCLUDED.updated_fields, '{}'::varchar[])) AS e
)
);
CALL log_field_change(operation_var, fqid_var, updated_fields_var);

RETURN NULL; -- AFTER TRIGGER needs no return
END;
Expand Down Expand Up @@ -1141,17 +1152,16 @@ class Helper:

IF foreign_id IS NOT NULL THEN
fqid_var := foreign_table || '/' || foreign_id;
INSERT INTO os_notify_log_t (operation, fqid, xact_id, timestamp, updated_fields)
VALUES ('update', fqid_var, pg_current_xact_id(), now(), ARRAY[fk_field])
ON CONFLICT (operation,fqid,xact_id) DO UPDATE SET updated_fields = (
SELECT ARRAY(
SELECT DISTINCT e
FROM unnest(COALESCE(os_notify_log_t.updated_fields, '{}'::varchar[])) AS e
UNION
SELECT DISTINCT e
FROM unnest(COALESCE(EXCLUDED.updated_fields, '{}'::varchar[])) AS e
)
);
CALL log_field_change('update', fqid_var, ARRAY[fk_field]);
END IF;

--when update there must be a notification for the old foreign_fqid
IF (TG_OP = 'UPDATE') THEN
EXECUTE format('SELECT ($1).%I', ref_column) INTO foreign_id USING OLD;
IF foreign_id IS NOT NULL THEN
fqid_var := foreign_table || '/' || foreign_id;
CALL log_field_change('update', fqid_var, ARRAY[fk_field]);
END IF;
END IF;

i := i + 3;
Expand Down