lib/ditty/db.rb in ditty-0.3.2 vs lib/ditty/db.rb in ditty-0.3.3

@@ -1,10 +1,14 @@
 # frozen_string_literal: true
 
 require 'sequel'
 require 'ditty/services/logger'
+require 'active_support'
+require 'active_support/core_ext/object/blank'
 
-if ENV['DATABASE_URL']
+if defined? DB
+  Ditty::Services::Logger.instance.warn 'Database connection already set up'
+elsif ENV['DATABASE_URL'].blank? == false
   # Delete DATABASE_URL from the environment, so it isn't accidently
   # passed to subprocesses.  DATABASE_URL may contain passwords.
   DB = Sequel.connect(ENV['RACK_ENV'] == 'production' ? ENV.delete('DATABASE_URL') : ENV['DATABASE_URL'])
 
   DB.sql_log_level = (ENV['SEQUEL_LOGGING_LEVEL'] || :debug).to_sym