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 <tom@curii.com>

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index cf9e2c277f7e6364078e8fa43a82732985823b3e..c909e47cef7ff10e4e4b01cc5221713c7d78a542 100644 (file)
--- 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'])