RAILS_CONFIG_BASE_PATH and db_config refactor CartoDB/cartodb-platform/issues/2355

config/environment.rb

@@ -9,7 +9,7 @@ module Rails
 
       def database_configuration
         require 'erb'
-        db_config_file
+        db_config
       end
     end
   end

config/initializers/sequel.rb

@@ -3,7 +3,7 @@ require_dependency 'carto/configuration'
 
 ::Sequel::DATABASES.each{|d| d.sql_log_level = :debug }
 
-@dbconfig = Carto::Conf.new.db_config_file
+@dbconfig = Carto::Conf.new.db_config
 
 # INFO: our current database.yml sets Sequel PostgreSQL adapter, which is called 'postgres'. Rails' is 'postgresql'
 @dbconfig[Rails.env]['adapter'] = 'postgresql'

lib/carto/configuration.rb

@@ -1,17 +1,25 @@
 module Carto::Configuration
-  def db_config_file
-    if ENV['RAILS_DATABASE_FILE']
-      db_config = YAML.load(File.read(File.join(config_files_root, 'config/' + ENV['RAILS_DATABASE_FILE'])))
-    else
-      db_config = YAML.load(File.read(File.join(config_files_root, 'config/database.yml')))
-    end
+  def db_config
+    YAML.load(File.read(db_config_file))
   end
 
   private
 
   def config_files_root
+    if ENV['RAILS_CONFIG_BASE_PATH']
+      Pathname.new(ENV['RAILS_CONFIG_BASE_PATH'])
+    else
       Rails.root
     end
+  end
+
+  def db_config_file
+    if ENV['RAILS_DATABASE_FILE']
+      File.join(config_files_root, 'config/' + ENV['RAILS_DATABASE_FILE'])
+    else
+      File.join(config_files_root, 'config/database.yml')
+    end
+  end
 end
 
 # TODO: singleton

script/compare_metadata.rb

@@ -18,7 +18,7 @@ if data.length > 0
 end
 
 config = YAML.load(File.read('../config/app_config.yml'))
-database = Carto::Conf.new.db_config_file
+database = Carto::Conf.new.db_config
 
 
 RAILS_ENV = ENV['RAILS_ENV'] || 'production'

services/user-mover/config.rb

@@ -7,7 +7,7 @@ module CartoDB
       def self.load_config
         root = File.expand_path(File.dirname(__FILE__))
         config = YAML.load(File.read(File.join(root, '../../config/app_config.yml')))
-        database = Carto::Conf.new.db_config_file
+        database = Carto::Conf.new.db_config
         rails_env = ENV['RAILS_ENV'] || Rails.env || 'production'
         @config = {
           rails_env: rails_env,