From 0127a60904f8f392d60111c07ac80f461fe26c22 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Thu, 7 Sep 2023 09:39:34 -0400 Subject: [PATCH] 20300: Fix where(nil, ...) case. Rails 5 accepted where(nil, ...) as a no-op, but in Rails 6 that's an error. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- services/api/app/models/arvados_model.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb index cf9e2c277f..c909e47cef 100644 --- a/services/api/app/models/arvados_model.rb +++ b/services/api/app/models/arvados_model.rb @@ -464,6 +464,7 @@ class ArvadosModel < ApplicationRecord end end + return self if sql_conds == nil self.where(sql_conds, user_uuids: all_user_uuids.collect{|c| c["target_uuid"]}, permission_link_classes: ['permission']) -- 2.30.2