Merge branch 'master' into domains-nested-refactor

Conflicts:
	config/locales/en.yml

lib/tasks/db.rake

@@ -1,16 +1,14 @@
 namespace :db do
-  def databases
-    @db ||= ["api_log_#{Rails.env}", "whois_#{Rails.env}", "#{Rails.env}"]
+  def other_databases
+    @db ||= ["api_log_#{Rails.env}", "whois_#{Rails.env}"]
   end
 
   def schema_file(db)
     case db
-    when databases.first
+    when "api_log_#{Rails.env}"
       'api_log_schema.rb'
-    when databases.second
+    when "whois_#{Rails.env}"
       'whois_schema.rb'
-    when databases.third
-      'schema.rb'
     end
   end
 
@@ -19,16 +17,51 @@ namespace :db do
     task setup: [:environment] do
       Rake::Task['db:all:create'].invoke
       Rake::Task['db:all:schema:load'].invoke
-      Rake::Task['db:seed'].invoke
+
+      ActiveRecord::Base.clear_all_connections!
+      ActiveRecord::Base.establish_connection(Rails.env.to_sym)
+      # puts "\n---------------------------- Import seed ----------------------------------------\n"
+      # Rake::Task['db:seed'].invoke
+      puts "\n  All done!\n\n"
     end
 
     desc 'Create all databases: registry, api_log and whois'
     task create: [:environment] do
-      databases.each do |name|
+      puts "\n---------------------------- Create main database ----------------------------------------\n"
+      Rake::Task['db:create'].invoke
+
+      other_databases.each do |name|
         begin
-          conf = ActiveRecord::Base.configurations
+          puts "\n---------------------------- Create #{name} ----------------------------------------\n"
           ActiveRecord::Base.clear_all_connections!
-          ActiveRecord::Base.connection.create_database(conf[name]['database'], conf[name])
+          conf = ActiveRecord::Base.configurations
+          ActiveRecord::Base.connection.create_database(conf[name]['database'].to_sym, conf[name])
+        rescue => e
+          puts "\n#{e}"
+        end
+      end
+    end
+
+    desc 'Drop all databaseses: registry, api_log and whois'
+    task drop: [:environment] do
+      # just in case we allow only drop test, comment it out please for temp
+      return unless Rails.env.test?
+
+      Rake::Task['db:drop'].invoke
+      conf = ActiveRecord::Base.configurations
+      puts "#{conf[Rails.env]['database']} dropped"
+
+      other_databases.each do |name|
+        begin
+          ActiveRecord::Base.clear_all_connections!
+          ActiveRecord::Base.establish_connection(name.to_sym)
+
+          conf = ActiveRecord::Base.configurations
+          if ActiveRecord::Tasks::DatabaseTasks.drop(conf[name])
+            puts "#{conf[name]['database']} dropped"
+          else
+            puts "Didn't find database #{name}, no drop"
+          end
         rescue => e
           puts "\n#{e}"
         end
@@ -38,10 +71,14 @@ namespace :db do
     namespace :schema do
       desc 'Schema load for all databases: registry, api_log and whois'
       task load: [:environment] do
-        databases.each do |name|
+        puts "\n---------------------------- Main schema load ----------------------------------------\n"
+        Rake::Task['db:schema:load'].invoke
+
+        other_databases.each do |name|
           begin
-            puts "\n---------------------------- #{name} ----------------------------------------\n"
-            ActiveRecord::Base.establish_connection(name)
+            puts "\n---------------------------- #{name} schema loaded ----------------------------------------\n"
+            ActiveRecord::Base.clear_all_connections!
+            ActiveRecord::Base.establish_connection(name.to_sym)
             if ActiveRecord::Base.connection.table_exists?('schema_migrations')
               puts 'Found tables, skip schema load!'
             else
@@ -55,7 +92,10 @@ namespace :db do
 
       desc 'Schema load for all databases: registry, api_log and whois'
       task dump: [:environment] do
-        databases.each do |name|
+        puts "\n---------------------------- Main schema load ----------------------------------------\n"
+        Rake::Task['db:schema:dump'].invoke
+
+        other_databases.each do |name|
           begin
             puts "\n---------------------------- #{name} ----------------------------------------\n"
             filename = "#{Rails.root}/db/#{schema_file(name)}"

lib/tasks/test.rake

@@ -30,7 +30,7 @@ begin
     end
 
     Rake::Task[:default].prerequisites.clear
-    task default: :test
+    task default: 'test:other'
 
     def test_against_server
       _stdin, _stdout, _stderr, wait_thr = Open3.popen3('unicorn -E test -p 8989')