[ARVADOS] updated: 2.1.0-1976-gbc078b7d0

[Git user]

Summary of changes:
 services/api/app/models/group.rb | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

       via  bc078b7d031968061e439309a6a6dbeb1938a407 (commit)
      from  3725c555044cdd0c137df387c1af5f1a17966227 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit bc078b7d031968061e439309a6a6dbeb1938a407
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 3 15:23:06 2022 -0500

    18691: Fix wrong column name in clear_permissions.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/services/api/app/models/group.rb b/services/api/app/models/group.rb
index 93bafc45a..e3df46029 100644
--- a/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@ -194,11 +194,14 @@ on conflict (group_uuid) do update set trash_at=EXCLUDED.trash_at;
 
   def clear_permissions_trash_frozen
     MaterializedPermission.where(target_uuid: uuid).delete_all
-    ['trashed_groups', 'frozen_groups'].each do |table|
-      ActiveRecord::Base.connection.exec_delete %{
-        delete from #{table} where group_uuid=$1
-      }, "Group.clear_permissions_trash_frozen", [[nil, self.uuid]]
-    end
+    ActiveRecord::Base.connection.exec_delete(
+      "delete from trashed_groups where group_uuid=$1",
+      "Group.clear_permissions_trash_frozen",
+      [[nil, self.uuid]])
+    ActiveRecord::Base.connection.exec_delete(
+      "delete from frozen_groups where uuid=$1",
+      "Group.clear_permissions_trash_frozen",
+      [[nil, self.uuid]])
   end
 
   def assign_name

-----------------------------------------------------------------------


hooks/post-receive
--