Merge pull request #843 from hiptest/fix-327-concern-cause-app-to-con…

…nect-to-db Better implementation to test if connection to db is active
lynndylanhurley · Jul 6, 2017 · c158898 · c158898
2 parents 9fdf831 + 3e8657f
commit c158898
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
@@ -99,11 +99,7 @@ def tokens_has_json_column_type?
     end
 
     def database_exists?
-      ActiveRecord::Base.connection
-    rescue ActiveRecord::NoDatabaseError
-      false
-    else
-      true
+      ActiveRecord::Base.connection_pool.with_connection { |con| con.active? } rescue false
     end
   end