Merge pull request lynndylanhurley#814 from hiptest/fix-327-concern-c…

…ause-app-to-connect-to-db Prevent getting table info if not connected to db
Jylth · Jan 21, 2017 · 98c0348 · 98c0348
2 parents 23c04a2 + 6d764da
commit 98c0348
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/app/models/devise_token_auth/concerns/user.rb b/app/models/devise_token_auth/concerns/user.rb
@@ -95,7 +95,15 @@ module ClassMethods
 
 
     def tokens_has_json_column_type?
-      table_exists? && self.columns_hash['tokens'] && self.columns_hash['tokens'].type.in?([:json, :jsonb])
+      database_exists? && table_exists? && self.columns_hash['tokens'] && self.columns_hash['tokens'].type.in?([:json, :jsonb])
+    end
+
+    def database_exists?
+      ActiveRecord::Base.connection
+    rescue ActiveRecord::NoDatabaseError
+      false
+    else
+      true
     end
   end