diff --git a/Rakefile b/Rakefile index 3ce9d4aff9..d85d168741 100644 --- a/Rakefile +++ b/Rakefile @@ -15,7 +15,11 @@ end CartoDB::Application.load_tasks -Rake.application.instance_variable_get('@tasks').delete('default') +rake_tasks = Rake.application.instance_variable_get('@tasks') +rake_tasks.delete('default') + +# Remove ActiveRecord tasks and replace with Sequel versions +rake_tasks.select { |k, _| k.starts_with?('sequel') }.each { |k, v| rake_tasks[k.sub('sequel:', 'db:')] = v } if Rails.env.test? namespace :spec do diff --git a/config/application.rb b/config/application.rb index aacdc928ce..f289c309d2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -200,6 +200,9 @@ module CartoDB config.active_record.default_timezone = :local config.active_record.raise_in_transactional_callbacks = true + + # Put sequel db tasks into its own namespace + config.sequel.load_database_tasks = :sequel end end