Merge branch 'master' into 4523-search-index

Conflicts:
	services/api/db/migrate/20141208164553_owner_uuid_index.rb
	services/api/db/structure.sql
	services/api/test/unit/arvados_model_test.rb

diff --cc services/api/test/unit/arvados_model_test.rb
index b353793b6b49367e952cb43d30f5d95c524b23c1,8c7576478912199371360b43154e3318480f49dc..63b47731f0e40e8effdf474926ffeb4f41eb6934
--- 1/services/api/test/unit/arvados_model_test.rb
--- 2/services/api/test/unit/arvados_model_test.rb
+++ b/services/api/test/unit/arvados_model_test.rb
@@@ -87,64 -87,26 +87,47 @@@ class ArvadosModelTest < ActiveSupport:
      end
    end
  
-   test "unique uuid index exists on all models with the column uuid" do
-     tables = ActiveRecord::Base.connection.tables
-     tables.each do |table|
-       columns = ActiveRecord::Base.connection.columns(table)
- 
-       uuid_column = columns.select do |column|
-         column.name == 'uuid'
-       end
- 
-       if !uuid_column.empty?
-         indexes = ActiveRecord::Base.connection.indexes(table)
-         uuid_index = indexes.select do |index|
-           index.columns == ['uuid'] and index.unique == true
-         end
- 
-         assert !uuid_index.empty?, "#{table} does not have unique uuid index"
-       end
-     end
-   end
- 
-   test "owner uuid index exists on all models with the owner_uuid column" do
-     all_tables = ActiveRecord::Base.connection.tables
- 
-     all_tables.each do |table|
-       columns = ActiveRecord::Base.connection.columns(table)
- 
-       uuid_column = columns.select do |column|
-         column.name == 'owner_uuid'
-       end
- 
-       if !uuid_column.empty?
-         indexes = ActiveRecord::Base.connection.indexes(table)
-         owner_uuid_index = indexes.select do |index|
-           index.columns == ['owner_uuid']
+   [['uuid', {unique: true}],
+    ['owner_uuid', {}]].each do |the_column, requires|
+     test "unique index on all models with #{the_column}" do
+       checked = 0
+       ActiveRecord::Base.connection.tables.each do |table|
+         columns = ActiveRecord::Base.connection.columns(table)
+ 
+         next unless columns.collect(&:name).include? the_column
+ 
+         indexes = ActiveRecord::Base.connection.indexes(table).reject do |index|
+           requires.map do |key, val|
+             index.send(key) == val
+           end.include? false
          end
-         assert !owner_uuid_index.empty?, "#{table} does not have owner_uuid index"
+         assert_includes indexes.collect(&:columns), [the_column], 'no index'
+         checked += 1
        end
+       # Sanity check: make sure we didn't just systematically miss everything.
+       assert_operator(10, :<, checked,
+                       "Only #{checked} tables have a #{the_column}?!")
      end
    end
 +
 +  test "search index exists on models that go into projects" do
 +    all_tables =  ActiveRecord::Base.connection.tables
 +    all_tables.delete 'schema_migrations'
 +
 +    all_tables.each do |table|
 +      table_class = table.classify.constantize
 +      if table_class.respond_to?('searchable_columns')
 +        search_index_columns = table_class.searchable_columns('ilike')
 +
 +        indexes = ActiveRecord::Base.connection.indexes(table)
 +        search_index_by_columns = indexes.select do |index|
 +          index.columns == search_index_columns
 +        end
 +        search_index_by_name = indexes.select do |index|
 +          index.name == "#{table}_search_index"
 +        end
 +        assert !search_index_by_columns.empty?, "#{table} has no search index with columns #{search_index_columns}. Instead found search index with columns #{search_index_by_name.first.andand.columns}"
 +      end
 +    end
 +  end
  end