From: Tom Clegg <tom@curoverse.com>
Date: Fri, 25 Jul 2014 02:10:30 +0000 (-0400)
Subject: 3235: Fix SQL query.
X-Git-Tag: 1.1.0~2405^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/35e5f5ac9f0dcfe3868e9f31c6500f1af759a1af?ds=sidebyside;hp=dea31790e175096c0df8f5a395696aab940f39d7

3235: Fix SQL query.
---

diff --git a/services/api/app/controllers/arvados/v1/groups_controller.rb b/services/api/app/controllers/arvados/v1/groups_controller.rb
index d69cd6c74a..bb74b909eb 100644
--- a/services/api/app/controllers/arvados/v1/groups_controller.rb
+++ b/services/api/app/controllers/arvados/v1/groups_controller.rb
@@ -65,9 +65,10 @@ class Arvados::V1::GroupsController < ApplicationController
         cond_params << opts[:owner_uuid]
       end
       if opts[:include_linked]
-        conds << " OR #{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'} AND links.tail_uuid=#{klass.sanitize @object.uuid})"
+        conds << "#{klass.table_name}.uuid IN (SELECT head_uuid FROM links WHERE link_class=#{klass.sanitize 'name'} AND links.tail_uuid=#{klass.sanitize @object.uuid})"
       end
       if conds.any?
+        cond_sql = '(' + conds.join(') OR (') + ')'
         @objects = @objects.where(cond_sql, *cond_params)
       end
       @objects = @objects.order("#{klass.table_name}.uuid")