这是indexloc提供的服务，不要输入任何密码
Skip to content

drop trigger functions on updating event triggers #1214

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
merged 3 commits into from
Dec 15, 2018
Merged

drop trigger functions on updating event triggers #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aada90
add delTriggerQ and use it for update event trigger
tirumaraiselvan Dec 14, 2018
186cb24
update TestUpdateEvtQuery to consider removal of operation
tirumaraiselvan Dec 14, 2018
2710fe2
Merge branch 'master' into fix-update-event-triggers
0x777 Dec 14, 2018
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
11 changes: 7 additions & 4 deletions server/src-lib/Hasura/RQL/DDL/Subscribe.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ mkTriggerQ trid trn qt allCols (TriggerOpsDef insert update delete) = do
Just sql -> Q.multiQE defaultTxErrorHandler (Q.fromText sql)
Nothing -> throw500 "no trigger sql generated"

delTriggerQ :: TriggerName -> Q.TxE QErr ()
delTriggerQ trn = mapM_ (\op -> Q.unitQE
defaultTxErrorHandler
(Q.fromText $ getDropFuncSql op trn) () False) [INSERT, UPDATE, DELETE]

addEventTriggerToCatalog
:: QualifiedTable
-> [PGColInfo]
Expand Down Expand Up @@ -161,10 +166,7 @@ delEventTriggerFromCatalog trn = do
hdb_catalog.event_triggers
WHERE name = $1
|] (Identity trn) True
mapM_ tx [INSERT, UPDATE, DELETE]
where
tx :: Ops -> Q.TxE QErr ()
tx op = Q.multiQE defaultTxErrorHandler (Q.fromText $ getDropFuncSql op trn)
delTriggerQ trn

updateEventTriggerToCatalog
:: QualifiedTable
Expand All @@ -181,6 +183,7 @@ updateEventTriggerToCatalog qt allCols etc = do
RETURNING id
|] (Q.AltJ $ toJSON etc, name) True
trid <- getTrid ids
delTriggerQ name
mkTriggerQ trid name qt allCols opsdef
return trid
where
Expand Down
2 changes: 0 additions & 2 deletions server/tests-py/queries/event_triggers/update_query/update-setup.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ args:
table:
schema: hge_tests
name: test_t1
insert:
columns: ["c1"]
update:
columns: ["c1"]
delete:
Expand Down
3 changes: 2 additions & 1 deletion server/tests-py/test_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ def test_update_basic(self, hge_ctx):
headers = {}
st_code, resp = insert(hge_ctx, table, init_row)
assert st_code == 200, resp
check_event(hge_ctx, "t1_cols", table, "INSERT", exp_ev_data, headers, "/new")
with pytest.raises(queue.Empty):
check_event(hge_ctx, "t1_cols", table, "INSERT", exp_ev_data, headers, "/new")

where_exp = {"c1": 1}
set_exp = {"c2": "world"}
Expand Down