Skip to content

Replace calls to #table_exists? with #data_source_exists? #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bagedevimo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace calls to #table_exists? with #data_source_exists? #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/initializers/mailer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/secret_token.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/initializers/sentry.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down