3235: Fix SQL query.
authorTom Clegg <tom@curoverse.com>
Fri, 25 Jul 2014 02:10:30 +0000 (22:10 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 25 Jul 2014 02:10:30 +0000 (22:10 -0400)
services/api/app/controllers/arvados/v1/groups_controller.rb

index d69cd6c74a0c4bf499e72a40e47d2eb196c2f82c..bb74b909eb64baeaa1341cd724c0a1ad21b4c280 100644 (file)
@@ -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")