diff --git a/packages/data_taster/lib/data_taster/flavors.rb b/packages/data_taster/lib/data_taster/flavors.rb index 2830918a..e6686779 100644 --- a/packages/data_taster/lib/data_taster/flavors.rb +++ b/packages/data_taster/lib/data_taster/flavors.rb @@ -80,7 +80,7 @@ def recent_ids(table_name, col_name) end def source_db - @source_db ||= db_config["database"] + @source_db ||= db_config[:database] end end end diff --git a/packages/data_taster/lib/data_taster/helper.rb b/packages/data_taster/lib/data_taster/helper.rb index 1699c669..daea2fdd 100644 --- a/packages/data_taster/lib/data_taster/helper.rb +++ b/packages/data_taster/lib/data_taster/helper.rb @@ -13,12 +13,8 @@ def sanitize_command(command, params = nil) sanitized_command end - def db_yml - @db_yml ||= YAML.safe_load(ERB.new(Rails.root.join("config", "database.yml").read).result, aliases: true) - end - def db_config - @db_config ||= db_yml[Rails.env].key?("primary") ? db_yml[Rails.env]["primary"] : db_yml[Rails.env] + ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: "primary").configuration_hash end def logg(message)