Merge pull request #12130 from mvdbeek/legacy_postgres_testing

[21.05] Fix history audit table tow trigger
galaxyproject · Jun 11, 2021 · e64dab3 · e64dab3
2 parents 03d31a5 + 5e1cf71
commit e64dab3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/api_paste.yaml b/.github/workflows/api_paste.yaml
@@ -12,7 +12,8 @@ jobs:
         python-version: ['3.7']
     services:
       postgres:
-        image: postgres:13
+        # Run tests on the oldest Galaxy-supported version
+        image: postgres:9.6
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: postgres

diff --git a/lib/galaxy/model/migrate/triggers/update_audit_table.py b/lib/galaxy/model/migrate/triggers/update_audit_table.py
@@ -107,7 +107,9 @@ def row_trigger_def(source_table, id_field, operation, when="AFTER", function_ke
         return f"""
             CREATE TRIGGER {trigger_name}
             {when} {operation} ON {source_table}
-            FOR EACH ROW EXECUTE {function_keyword} {fn}();
+            FOR EACH ROW
+            WHEN (NEW.{id_field} IS NOT NULL)
+            EXECUTE {function_keyword} {fn}();
         """
 
     # pick row or statement triggers depending on postgres version