From 42c5e32accb593100a57f89ddf07553e9b537be2 Mon Sep 17 00:00:00 2001
From: Stefanni <stefannibrasil@gmail.com>
Date: Fri, 10 Aug 2018 20:50:19 -0700
Subject: [PATCH] Hacking travis

---
 app/models/user.rb         | 4 ++--
 app/services/srch_scope.rb | 2 +-
 db/schema.rb.example       | 3 ++-
 test/unit/user_test.rb     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9b81315090..c630bd0790 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -42,8 +42,8 @@ class User < ActiveRecord::Base
   before_save :set_token
   after_destroy :destroy_drupal_user
 
-  def self.search_by_username(query)
-    User.where('MATCH(username) AGAINST((?) IN BOOLEAN MODE)', query + '*')
+  def self.search(query)
+    User.where('MATCH(bio, username) AGAINST(? IN BOOLEAN MODE)', query + '*')
   end
 
   def new_contributor
diff --git a/app/services/srch_scope.rb b/app/services/srch_scope.rb
index 94505b02b4..24f5f18ec4 100644
--- a/app/services/srch_scope.rb
+++ b/app/services/srch_scope.rb
@@ -2,7 +2,7 @@
 class SrchScope
   def self.find_users(query, limit)
     if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
-      User.search_by_username(query)
+      User.search(query)
           .where('rusers.status = ?', 1)
           .limit(limit)
     else
diff --git a/db/schema.rb.example b/db/schema.rb.example
index 3332ac45ab..ea9d7c7028 100644
--- a/db/schema.rb.example
+++ b/db/schema.rb.example
@@ -336,7 +336,8 @@ ActiveRecord::Schema.define(version: 2018_08_04_215454) do
     t.string   "token"
     t.integer  "status",                                default: 0
     t.integer "password_checker", default: 0
-    t.index ["username"], name: "rusers_username_fulltext_idx", type: :fulltext
+    t.index ["username", "bio"], name: "index_rusers_on_username_and_bio", type: :fulltext if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+    t.index ["username"], name: "rusers_username_fulltext_idx", type: :fulltext if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
   end
 
   create_table "tag_selections", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 46ffbbfc45..35f5b07873 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -37,7 +37,7 @@ class UserTest < ActiveSupport::TestCase
   test 'user mysql native fulltext search' do
     assert User.count > 0
     if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
-      users = User.search_by_username('jeff')
+      users = User.search('jeff')
       assert_not_nil users
       assert users.length > 0
     end