From 317e1a5ca686cbea3de57b8b669fc8c11ebc5905 Mon Sep 17 00:00:00 2001
From: Tirumarai Selvan A <tiru@hasura.io>
Date: Fri, 5 Apr 2019 12:06:40 +0530
Subject: [PATCH] fix regression introduced by alpha41 and add corresponding
 test

---
 server/src-lib/Hasura/RQL/DDL/EventTrigger.hs             | 2 +-
 .../queries/event_triggers/update_query/update-setup.yaml | 8 ++++++++
 server/tests-py/test_events.py                            | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/server/src-lib/Hasura/RQL/DDL/EventTrigger.hs b/server/src-lib/Hasura/RQL/DDL/EventTrigger.hs
index 25ea8b5d9c125..cac39d911cf06 100644
--- a/server/src-lib/Hasura/RQL/DDL/EventTrigger.hs
+++ b/server/src-lib/Hasura/RQL/DDL/EventTrigger.hs
@@ -167,6 +167,7 @@ updateEventTriggerToCatalog
   -> EventTriggerConf
   -> Q.TxE QErr ()
 updateEventTriggerToCatalog qt allCols strfyNum etc = do
+  updateEventTriggerDef name etc
   delTriggerQ name
   mkTriggerQ name qt allCols strfyNum opsdef
   where
@@ -368,5 +369,4 @@ updateEventTriggerDef trigName trigConf =
       SET
       configuration = $1
       WHERE name = $2
-      RETURNING id
     |] (Q.AltJ $ toJSON trigConf, trigName) True
diff --git a/server/tests-py/queries/event_triggers/update_query/update-setup.yaml b/server/tests-py/queries/event_triggers/update_query/update-setup.yaml
index 19b7a0b6707fa..e82968ed307bb 100644
--- a/server/tests-py/queries/event_triggers/update_query/update-setup.yaml
+++ b/server/tests-py/queries/event_triggers/update_query/update-setup.yaml
@@ -15,3 +15,11 @@ args:
       num_retries: 5
       interval_sec: 5
     replace: true
+- type: select
+  args:
+    table:
+      schema: hdb_catalog
+      name: event_triggers
+    columns: ["configuration"]
+    where:
+      name: t1_cols
diff --git a/server/tests-py/test_events.py b/server/tests-py/test_events.py
index 064ed602b4be8..a822fa2386845 100755
--- a/server/tests-py/test_events.py
+++ b/server/tests-py/test_events.py
@@ -201,6 +201,7 @@ def transact(self, request, hge_ctx):
         assert st_code == 200, resp
         st_code, resp = hge_ctx.v1q_f('queries/event_triggers/update_query/update-setup.yaml')
         assert st_code == 200, '{}'.format(resp)
+        assert resp[1][0]["configuration"]["webhook"] == 'http://127.0.0.1:5592/new'
         yield
         st_code, resp = hge_ctx.v1q_f('queries/event_triggers/update_query/teardown.yaml')
         assert st_code == 200, resp