fix: Partition check in trigger query + tests

Author: cheerfulstoic

lib/ecto_watch/watcher_trigger_validator.ex

@@ -148,19 +148,14 @@ defmodule EctoWatch.WatcherTriggerValidator do
       """
       SELECT trigger_name, event_object_schema, event_object_table
       FROM information_schema.triggers
-      WHERE trigger_name LIKE 'ew_%'
-        AND EXISTS (
-          SELECT 1
-          FROM pg_class c
-            JOIN pg_namespace n ON c.relnamespace = n.oid
-          WHERE n.nspname = event_object_schema
-            AND c.relname = event_object_table
-            AND NOT EXISTS (
-              SELECT 1
-              FROM pg_inherits inh
-              WHERE inh.inhrelid = c.oid
-            )
-        )
+        JOIN pg_class
+          ON pg_class.relname = event_object_table
+        JOIN pg_namespace
+          ON pg_class.relnamespace = pg_namespace.oid AND
+             pg_namespace.nspname = event_object_schema
+        LEFT JOIN pg_inherits
+          ON pg_inherits.inhrelid = pg_class.oid
+      WHERE trigger_name LIKE 'ew_%' AND pg_inherits.inhrelid IS NULL
       """
     )
     |> Enum.map(fn [name, table_schema, table_name] ->

test/ecto_watch_test.exs

@@ -730,7 +730,7 @@ defmodule EctoWatchTest do
     end
   end
 
-  describe "trigger cleanup" do
+  describe "trigger validation" do
     setup do
       Ecto.Adapters.SQL.query!(
         TestRepo,
@@ -772,7 +772,7 @@ defmodule EctoWatchTest do
         TestRepo,
         """
         CREATE TRIGGER ew_partition_level_trigger
-          AFTER UPDATE ON \"public\".\"partitioned_part1\" FOR EACH ROW
+          AFTER UPDATE ON \"public\".\"partitioned_root\" FOR EACH ROW
           EXECUTE PROCEDURE \"public\".non_ecto_watch_func();
         """,
         []
@@ -819,15 +819,17 @@ defmodule EctoWatchTest do
           Process.sleep(2_000)
         end)
 
+      IO.puts(log)
+
       assert log =~
-               ~r/Found the following extra EctoWatch triggers:\n\n"ew_some_weird_trigger" in the table "public"\."things"\n\n\.\.\.but they were not specified in the watcher options/
+               ~r/Found the following extra EctoWatch triggers:\n\n"ew_partition_level_trigger" in the table "public"\."partitioned_root"\n"ew_some_weird_trigger" in the table "public"\."things"\n\n\.\.\.but they were not specified in the watcher options/
 
       assert log =~
                ~r/Found the following extra EctoWatch functions:\n\n"ew_some_weird_func" in the schema "public"/
 
       refute log =~ ~r/non_ecto_watch_trigger/
       refute log =~ ~r/non_ecto_watch_func/
-      refute log =~ ~r/ew_partition_level_trigger/
+      refute log =~ ~r/partitioned_part1/
     end
 
     test "actual cleanup" do
@@ -860,7 +862,7 @@ defmodule EctoWatchTest do
 
       assert "ew_some_weird_trigger" not in values
       assert "non_ecto_watch_trigger" in values
-      assert "ew_partition_level_trigger" in values
+      assert "ew_partition_level_trigger" not in values
 
       %Postgrex.Result{rows: rows} =
         Ecto.Adapters.SQL.query!(