[ARVADOS] updated: 874f973f3af6b5dee65bfa3c55658430dadb5451

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/test/integration/pipeline_instances_test.rb | 2 +-
 services/api/app/models/arvados_model.rb                   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

       via  874f973f3af6b5dee65bfa3c55658430dadb5451 (commit)
      from  3566686444d84498031b8fdef9cbe78bcbf54b9a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 874f973f3af6b5dee65bfa3c55658430dadb5451
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Wed Jan 7 14:27:00 2015 -0500

    4523: exclude text type columns from searchable_columns for ilike operator

diff --git a/apps/workbench/test/integration/pipeline_instances_test.rb b/apps/workbench/test/integration/pipeline_instances_test.rb
index b4dc546..6a5d097 100644
--- a/apps/workbench/test/integration/pipeline_instances_test.rb
+++ b/apps/workbench/test/integration/pipeline_instances_test.rb
@@ -443,7 +443,7 @@ class PipelineInstancesTest < ActionDispatch::IntegrationTest
     ['admin', nil, 40, 200],
     ['admin', 'FUSE project', 1, 1],
     ['admin', 'pipeline_10', 2, 2],
-    ['active', 'containing at least two', 2, 100],    # component description
+    ['active', 'containing at least two', 0, 100],  # components column (of type text) is currently not searchable
     ['active', nil, 10, 100],
     ['active', 'no such match', 0, 0],
   ].each do |user, search_filter, expected_min, expected_max|
diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index a170fb9..fc46337 100644
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -60,8 +60,14 @@ class ArvadosModel < ActiveRecord::Base
     textonly_operator = !operator.match(/[<=>]/)
     self.columns.select do |col|
       case col.type
-      when :string, :text
+      when :string
         true
+      when :text
+        if operator == 'ilike'
+          false
+        else
+          true
+        end
       when :datetime, :integer, :boolean
         !textonly_operator
       else

-----------------------------------------------------------------------


hooks/post-receive
--