activerecord-turntable 2.1.0.beta2 → 2.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2673c7fcde5190f1b2da9ac7d398ebf0e3faf1a
-  data.tar.gz: 40fa47723f339d79d3846aaa90aabccdc0232337
+  metadata.gz: a6223a14dc7586f9425a7450535d1d90075e7337
+  data.tar.gz: 6c02e240d36b6abe0c8f56a0174e2054ced1d4c1
 SHA512:
-  metadata.gz: b79b1ecdbea938ab801be102982441244841af16ff2c83fd4bc1a003f10ec000adc95480a40ac2e743ddd10a9d8ad9d7a84ae12aecb70abe1d4be68ee3783f6c
-  data.tar.gz: 1b35bfd21a4a4bfa04506375785f3e1496eb03f1ab209776d03295deab494ea9983e6bc523341d83df8577da82272190e11c8de0d8511aa3b998142ae98800bc
+  metadata.gz: 858730a5f8d9359177599e38652f91813016d5c5901d125ef544419b3f1e4f18f1c1b59630b09e8401acb1867a531f7aa14d4f034461511e665e3ad69107afc2
+  data.tar.gz: 4fbea3f83b7415584c322c81234dfdf6e13316f4643b7ee7dd197701aa638046dbefb9a9f54cc6548a751f14defc26b3930230b205904515f2320e61c68344fb

data/CHANGELOG.md

@@ -5,6 +5,7 @@ Support activerecord 4.2.0
 ### Bugfixes
 
 * Fix cluster helper methods(i.e xxxx_cluster_transaction helper) on lazy load environments(development, test)
+* Move migration tasks as Migrator extension to fix rake actions(added by other gems) ordering problem
 
 ## activerecord-turntable 2.0.6 ##
 

data/lib/active_record/turntable/migration.rb

@@ -8,6 +8,7 @@ module ActiveRecord::Turntable::Migration
     alias_method_chain :exec_migration, :turntable
     ::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:include, SchemaStatementsExt)
     ::ActiveRecord::Migration::CommandRecorder.send(:include, CommandRecorder)
+    ::ActiveRecord::Migrator.send(:include, Migrator)
   end
 
   module ShardDefinition
@@ -93,4 +94,58 @@ module ActiveRecord::Turntable::Migration
     end
   end
 
+  module Migrator
+    extend ActiveSupport::Concern
+
+    included do
+      klass = self
+      (class << klass; self; end).instance_eval {
+        [:up, :down, :run, :open].each do |method_name|
+          original_method_alias = "_original_#{method_name}"
+          unless klass.respond_to?(original_method_alias)
+            alias_method original_method_alias, method_name
+          end
+          alias_method_chain method_name, :turntable
+        end
+      }
+    end
+
+    module ClassMethods
+      def up_with_turntable(migrations_paths, target_version = nil)
+        up_without_turntable(migrations_paths, target_version)
+
+        ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
+          puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+          _original_up(migrations_paths, target_version)
+        end
+      end
+
+      def down_with_turntable(migrations_paths, target_version = nil, &block)
+        down_without_turntable(migrations_paths, target_version, &block)
+
+        ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
+          puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+          _original_down(migrations_paths, target_version, &block)
+        end
+      end
+
+      def run_with_turntable(*args)
+        run_without_turntable(*args)
+
+        ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
+          puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+          _original_run(*args)
+        end
+      end
+
+      def open_with_turntable(migrations_paths)
+        open_without_turntable(migrations_paths)
+
+        ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
+          puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+          _original_open(*args)
+        end
+      end
+    end
+  end
 end

data/lib/active_record/turntable/railties/databases.rake

@@ -1,164 +1,149 @@
 require 'active_record/turntable'
 ActiveRecord::SchemaDumper.send(:include, ActiveRecord::Turntable::ActiveRecordExt::SchemaDumper)
 
-# TODO: implement schema:cache:xxxx
+turntable_namespace = nil
 
 db_namespace = namespace :db do
-  namespace :create do
-    task :all => :load_config do
-      ActiveRecord::Tasks::DatabaseTasks.create_all_turntable_cluster
-    end
-  end
-
-  desc 'Create current turntable databases config/database.yml for the current Rails.env'
-  task :create => [:load_config] do
-    unless ENV['DATABASE_URL']
-      ActiveRecord::Tasks::DatabaseTasks.create_current_turntable_cluster
-    end
-  end
-
-  namespace :drop do
-    task :all => :load_config do
-      ActiveRecord::Tasks::DatabaseTasks.drop_all_turntable_cluster
-    end
-  end
-
-  desc 'Drops current turntable databases for the current Rails.env'
-  task :drop => [:load_config] do
-    unless ENV['DATABASE_URL']
-      ActiveRecord::Tasks::DatabaseTasks.drop_current_turntable_cluster
+  turntable_namespace = namespace :turntable do
+    namespace :create do
+      task :all do
+        ActiveRecord::Tasks::DatabaseTasks.create_all_turntable_cluster
+      end
     end
-  end
-
-  desc "Migrate turntable databases (options: VERSION=x, VERBOSE=false, SCOPE=blog)."
-  task :migrate => [:environment, :load_config] do
-    ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
 
-    ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
-      puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
-      ActiveRecord::Migrator.migrate(ActiveRecord::Migrator.migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-      db_namespace['_dump'].invoke
+    desc 'Create current turntable databases config/database.yml for the current Rails.env'
+    task :create do
+      unless ENV['DATABASE_URL']
+        ActiveRecord::Tasks::DatabaseTasks.create_current_turntable_cluster
+      end
     end
-  end
 
-  desc 'Rolls the turntable cluster schema back to the previous version (specify steps w/ STEP=n).'
-  task :rollback => [:environment, :load_config] do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-
-    ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
-      puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
-      ActiveRecord::Migrator.rollback(ActiveRecord::Migrator.migrations_paths, step)
+    namespace :drop do
+      task :all do
+        ActiveRecord::Tasks::DatabaseTasks.drop_all_turntable_cluster
+      end
     end
-    db_namespace['_dump'].invoke
-  end
-
-  # desc 'Pushes the turntable cluster schema to the next version (specify steps w/ STEP=n).'
-  task :forward => [:environment, :load_config] do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
 
-    ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected do |name, configuration|
-      puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
-      ActiveRecord::Migrator.forward(ActiveRecord::Migrator.migrations_paths, step)
+    desc 'Drops current turntable databases for the current Rails.env'
+    task :drop do
+      unless ENV['DATABASE_URL']
+        ActiveRecord::Tasks::DatabaseTasks.drop_current_turntable_cluster
+      end
     end
-    db_namespace['_dump'].invoke
-  end
-
 
-  namespace :schema do
-    task :dump do
-      require 'active_record/schema_dumper'
-      config = ActiveRecord::Base.configurations[Rails.env]
-      shard_configs = config["shards"]
-      shard_configs.merge!(config["seq"]) if config["seq"]
-      if shard_configs
-        shard_configs.each do |name, config|
-          next unless config["database"]
-          filename = ENV['SCHEMA'] || "#{Rails.root}/db/schema-#{name}.rb"
-          File.open(filename, "w:utf-8") do |file|
-            ActiveRecord::Base.establish_connection(config)
-            ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+    namespace :schema do
+      # TODO: implement schema:cache:xxxx
+      task :dump do
+        require 'active_record/schema_dumper'
+        config = ActiveRecord::Base.configurations[Rails.env]
+        shard_configs = config["shards"]
+        shard_configs.merge!(config["seq"]) if config["seq"]
+        if shard_configs
+          shard_configs.each do |name, config|
+            next unless config["database"]
+            filename = ENV['SCHEMA'] || "#{Rails.root}/db/schema-#{name}.rb"
+            File.open(filename, "w:utf-8") do |file|
+              ActiveRecord::Base.establish_connection(config)
+              ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+            end
           end
         end
+        ActiveRecord::Base.establish_connection(config)
+        turntable_namespace['schema:dump'].reenable
       end
-      ActiveRecord::Base.establish_connection(config)
-      db_namespace['schema:dump'].reenable
-    end
 
-    desc 'Load a schema.rb file into the database'
-    task :load => :environment do
-      config = ActiveRecord::Base.configurations[Rails.env]
-      shard_configs = config["shards"]
-      shard_configs.merge!(config["seq"]) if config["seq"]
-      if shard_configs
-        shard_configs.each do |name, config|
-          next unless config["database"]
-          ActiveRecord::Base.establish_connection(config)
-          file = ENV['SCHEMA'] || "#{Rails.root}/db/schema-#{name}.rb"
-          if File.exists?(file)
-            load(file)
-          else
-            abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded'}
+      desc 'Load a schema.rb file into the database'
+      task :load do
+        config = ActiveRecord::Base.configurations[Rails.env]
+        shard_configs = config["shards"]
+        shard_configs.merge!(config["seq"]) if config["seq"]
+        if shard_configs
+          shard_configs.each do |name, config|
+            next unless config["database"]
+            ActiveRecord::Base.establish_connection(config)
+            file = ENV['SCHEMA'] || "#{Rails.root}/db/schema-#{name}.rb"
+            if File.exists?(file)
+              load(file)
+            else
+              abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded'}
+            end
           end
         end
+        ActiveRecord::Base.establish_connection(config)
       end
-      ActiveRecord::Base.establish_connection(config)
     end
-  end
 
-  namespace :structure do
-    desc 'Dump the database structure to an SQL file'
-    task :dump => :environment do
-      current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
-      shard_configs = current_config["shards"]
-      shard_configs.merge!(config["seq"]) if config["seq"]
-      if shard_configs
-        shard_configs.each do |name, config|
-          next unless config["database"]
-          ActiveRecord::Base.establish_connection(config)
-          filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure_#{name}.sql")
-          ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, filename)
+    namespace :structure do
+      desc 'Dump the database structure to an SQL file'
+      task :dump do
+        current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
+        shard_configs = current_config["shards"]
+        shard_configs.merge!(config["seq"]) if config["seq"]
+        if shard_configs
+          shard_configs.each do |name, config|
+            next unless config["database"]
+            ActiveRecord::Base.establish_connection(config)
+            filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure_#{name}.sql")
+            ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, filename)
 
-          if ActiveRecord::Base.connection.supports_migrations?
-            File.open(filename, "a") do |f|
-              f.puts ActiveRecord::Base.connection.dump_schema_information
+            if ActiveRecord::Base.connection.supports_migrations?
+              File.open(filename, "a") do |f|
+                f.puts ActiveRecord::Base.connection.dump_schema_information
+              end
             end
           end
+          ActiveRecord::Base.establish_connection(current_config)
         end
-        ActiveRecord::Base.establish_connection(current_config)
+        turntable_namespace['structure:dump'].reenable
       end
-      db_namespace['structure:dump'].reenable
-    end
 
-    # desc "Recreate the databases from the structure.sql file"
-    task :load => [:environment, :load_config] do
-      current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
-      shard_configs = current_config["shards"]
-      shard_configs.merge!(config["seq"]) if config["seq"]
-      if shard_configs
-        shard_configs.each do |name, config|
-          next unless config["database"]
-          ActiveRecord::Base.establish_connection(config)
-          filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure_#{name}.sql")
-          ActiveRecord::Tasks::DatabaseTasks.structure_load(config, filename)
+      # desc "Recreate the databases from the structure.sql file"
+      task :load do
+        current_config = ActiveRecord::Tasks::DatabaseTasks.current_config
+        shard_configs = current_config["shards"]
+        shard_configs.merge!(config["seq"]) if config["seq"]
+        if shard_configs
+          shard_configs.each do |name, config|
+            next unless config["database"]
+            ActiveRecord::Base.establish_connection(config)
+            filename = File.join(ActiveRecord::Tasks::DatabaseTasks.db_dir, "structure_#{name}.sql")
+            ActiveRecord::Tasks::DatabaseTasks.structure_load(config, filename)
+          end
+          ActiveRecord::Base.establish_connection(current_config)
         end
-        ActiveRecord::Base.establish_connection(current_config)
       end
     end
-  end
 
-  namespace :test do
-    # desc "Empty the test database"
-    task :purge => :environment do
-      config = ActiveRecord::Base.configurations[Rails.env]
-      shard_configs = config["shards"]
-      shard_configs.merge!(config["seq"]) if config["seq"]
-      if shard_configs
-        shard_configs.each do |name, config|
-          next unless config["database"]
-          ActiveRecord::Tasks::DatabaseTasks.purge config
+    namespace :test do
+      # desc "Empty the test database"
+      task :purge do
+        config = ActiveRecord::Base.configurations[Rails.env]
+        shard_configs = config["shards"]
+        shard_configs.merge!(config["seq"]) if config["seq"]
+        if shard_configs
+          shard_configs.each do |name, config|
+            next unless config["database"]
+            ActiveRecord::Tasks::DatabaseTasks.purge config
+          end
         end
+        ActiveRecord::Base.establish_connection(config)
       end
-      ActiveRecord::Base.establish_connection(config)
     end
   end
 end
+
+%w(
+  create:all
+  create
+  drop:all
+  drop
+  schema:dump
+  schema:load
+  structure:dump
+  structure:load
+  test:purge
+).each do |task_name|
+  db_namespace[task_name].enhance do
+    turntable_namespace[task_name].invoke
+  end
+end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.1.0.beta2"
+    VERSION = "2.1.0.rc1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta2
+  version: 2.1.0.rc1
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -513,3 +513,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_saved_to.rb
 - spec/support/turntable_helper.rb
+has_rdoc: