diff options
| -rw-r--r-- | app/models/issue_query.rb | 20 | ||||
| -rw-r--r-- | test/unit/query_test.rb | 4 |
2 files changed, 16 insertions, 8 deletions
diff --git a/app/models/issue_query.rb b/app/models/issue_query.rb index a0420c994..410f053f5 100644 --- a/app/models/issue_query.rb +++ b/app/models/issue_query.rb @@ -725,7 +725,6 @@ class IssueQuery < Query relation_type = relation_options[:reverse] || relation_type join_column, target_join_column = target_join_column, join_column end - ids = value.first.to_s.scan(/\d+/).map(&:to_i).uniq sql = case operator when "*", "!*" @@ -736,13 +735,18 @@ class IssueQuery < Query " WHERE #{IssueRelation.table_name}.relation_type =" \ " '#{self.class.connection.quote_string(relation_type)}')" when "=", "!" - op = (operator == "=" ? 'IN' : 'NOT IN') - "#{Issue.table_name}.id #{op}" \ - " (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column}" \ - " FROM #{IssueRelation.table_name}" \ - " WHERE #{IssueRelation.table_name}.relation_type =" \ - " '#{self.class.connection.quote_string(relation_type)}'" \ - " AND #{IssueRelation.table_name}.#{target_join_column} IN (#{ids.join(",")}))" + ids = value.first.to_s.scan(/\d+/).map(&:to_i).uniq + if ids.present? + op = (operator == "=" ? 'IN' : 'NOT IN') + "#{Issue.table_name}.id #{op}" \ + " (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column}" \ + " FROM #{IssueRelation.table_name}" \ + " WHERE #{IssueRelation.table_name}.relation_type =" \ + " '#{self.class.connection.quote_string(relation_type)}'" \ + " AND #{IssueRelation.table_name}.#{target_join_column} IN (#{ids.join(",")}))" + else + "1=0" + end when "=p", "=!p", "!p" op = (operator == "!p" ? 'NOT IN' : 'IN') comp = (operator == "=!p" ? '<>' : '=') diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb index 8c5b5e1c8..bb3eecb04 100644 --- a/test/unit/query_test.rb +++ b/test/unit/query_test.rb @@ -1651,6 +1651,10 @@ class QueryTest < ActiveSupport::TestCase assert_equal [1, 2, 3], find_issues_with_query(query).map(&:id).sort query = IssueQuery.new(:name => '_') + query.filters = {"relates" => {:operator => '=', :values => ['invalid']}} + assert_equal [], find_issues_with_query(query).map(&:id) + + query = IssueQuery.new(:name => '_') query.filters = {"relates" => {:operator => '!', :values => ['1']}} assert_equal Issue.where.not(:id => [2, 3]).order(:id).ids, find_issues_with_query(query).map(&:id).sort |