diff --git a/config/initializers/mailer.rb b/config/initializers/mailer.rb index 86c99317..fd318910 100644 --- a/config/initializers/mailer.rb +++ b/config/initializers/mailer.rb @@ -8,7 +8,7 @@ def email_address_with_name(address, name) end.to_s end -if ActiveRecord::Base.connection.table_exists?(Setting.table_name) +if ActiveRecord::Base.connection.data_source_exists?(Setting.table_name) email_setting = Setting.find_by_key("system/mailer/email") ActionMailer::Base.smtp_settings[:user_name] = email_setting&.value ActionMailer::Base.smtp_settings[:password] = Setting.find_by_key("system/mailer/password")&.value diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb index f56e1ee0..f4c53645 100644 --- a/config/initializers/secret_token.rb +++ b/config/initializers/secret_token.rb @@ -8,7 +8,7 @@ # if a setting is stored in database, use that secret token instead (because that token is not checked in to the git repository) # only appears to affect cookie stored sessions (no apparent effect on database stored sessions) -if ActiveRecord::Base.connection.table_exists?(Setting.table_name) && Setting.exists?(key: "sessions/secret_token") +if ActiveRecord::Base.connection.data_source_exists?(Setting.table_name) && Setting.exists?(key: "sessions/secret_token") token = Setting.find_by_key("sessions/secret_token").value NZTrain::Application.config.secret_token = token if token && !token.empty? end diff --git a/config/initializers/sentry.rb b/config/initializers/sentry.rb index 06e0d90c..0ff0da0e 100644 --- a/config/initializers/sentry.rb +++ b/config/initializers/sentry.rb @@ -1,6 +1,6 @@ Sentry.init do |config| # TODO: Migrate to the env var SENTRY_DSN or to secrets once we have a good method for managing these - if ActiveRecord::Base.connection.table_exists?(Setting.table_name) && Setting.exists?(key: "sentry_dsn") + if ActiveRecord::Base.connection.data_source_exists?(Setting.table_name) && Setting.exists?(key: "sentry_dsn") dsn = Setting.find_by_key("sentry_dsn")&.value config.dsn = dsn if dsn.present? end