18691: Fix wrong column name in clear_permissions.
authorTom Clegg <tom@curii.com>
Thu, 3 Mar 2022 20:23:06 +0000 (15:23 -0500)
committerTom Clegg <tom@curii.com>
Thu, 3 Mar 2022 20:23:06 +0000 (15:23 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

services/api/app/models/group.rb

index 93bafc45a272f47ce0d1664d624fb9c126af2483..e3df460298f2182d6399898f7f9eeeeb0c8533ff 100644 (file)
@@ -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