active_record_shards 3.12.0.beta2 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4602ef8dd4f4da902671838cb3c81a9a894befc5ecf4f26679c637d934128e
-  data.tar.gz: be495688e0eb5887a65bf0679c49b2befe0de4c1505bc6d9c7d91c02595b5c87
+  metadata.gz: 6473c94317dd18711d1434d23c44e283f90f572893e08e3f3a0e83737e8e6bd2
+  data.tar.gz: cea248a4cef9bc06c36b85f0ecf9dc25ba8fd2b5584d1b751c9d49c2977d74be
 SHA512:
-  metadata.gz: e6a568a5e3f7894a9e64319acc93991bdcd01adae5852bbe19b4e599fe66d1648fd7e13b76530b45625d78c51ed9a95ad31c37b2f4f51f11c8221132626378bc
-  data.tar.gz: 27a84cabdef6e4b5acaadd20a8c500e979548c103cd996d1e68198ecde2d5c021c2a66bef4f95b8acf74c1f4386295b058d15fd8d4e6bd81d55b2574ba795a47
+  metadata.gz: 18d9045c0a5e4f3c12339aec2815746e278a96fcd1c3f22ff406efc3a9f2d42282126861ad3e30885a90fab450603d1d69cd4d9e86f63b534057fa369460576f
+  data.tar.gz: aa397c8156aaf9bc71835c053ffe4dee7b1f2ceb9d5ad7e2d59b1f3354bf3d30b617c3df60815f82bdf67f728d1e88256853abe0fb57e3da3fca991bae047ab9

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/zendesk/active_record_shards.png)](http://travis-ci.org/zendesk/active_record_shards)
+[![CircleCI build status](https://circleci.com/gh/zendesk/active_record_shards/tree/master.svg?style=svg)](https://circleci.com/gh/zendesk/active_record_shards/tree/master)
 
 # ActiveRecord Shards
 

data/lib/active_record_shards/connection_switcher-4-0.rb

@@ -48,6 +48,11 @@ module ActiveRecordShards
       @@specification_cache ||= {}
     end
 
+    # Helper method to clear global state when testing.
+    def clear_specification_cache
+      @@specification_cache = {}
+    end
+
     def connection_pool_key
       specification_cache[connection_pool_name]
     end

data/lib/active_record_shards/migration.rb

@@ -9,6 +9,25 @@ module ActiveRecord
       end
     end
 
+    def initialize_with_sharding(*args)
+      initialize_without_sharding(*args)
+
+      # Rails creates the internal tables on the unsharded DB. We make them
+      # manually on the sharded DBs.
+      ActiveRecord::Base.on_all_shards do
+        if ActiveRecord::VERSION::MAJOR >= 4
+          ActiveRecord::SchemaMigration.create_table
+        else
+          ActiveRecord::Base.connection.initialize_schema_migrations_table
+        end
+        if ActiveRecord::VERSION::MAJOR >= 5
+          ActiveRecord::InternalMetadata.create_table
+        end
+      end
+    end
+    alias_method :initialize_without_sharding, :initialize
+    alias_method :initialize, :initialize_with_sharding
+
     def run_with_sharding
       ActiveRecord::Base.on_shard(nil) { run_without_sharding }
       ActiveRecord::Base.on_all_shards { run_without_sharding }

data/lib/active_record_shards/tasks.rb

@@ -30,23 +30,19 @@ namespace :db do
   task create: :load_config do
     ActiveRecord::Base.configurations.each do |key, conf|
       next if !key.starts_with?(ActiveRecordShards.rails_env) || key.ends_with?("_slave")
-      if ActiveRecord::VERSION::MAJOR >= 4
-        begin
-          # MysqlAdapter takes charset instead of encoding in Rails 4
-          # https://github.com/rails/rails/commit/78b30fed9336336694fb2cb5d2825f95800b541c
-          symbolized_configuration = conf.symbolize_keys
-          symbolized_configuration[:charset] = symbolized_configuration[:encoding]
+      begin
+        # MysqlAdapter takes charset instead of encoding in Rails 3.2 or greater
+        # https://github.com/rails/rails/blob/3-2-stable/activerecord/lib/active_record/railties/databases.rake#L68-L82
+        symbolized_configuration = conf.symbolize_keys
+        symbolized_configuration[:charset] = symbolized_configuration[:encoding]
 
-          ActiveRecordShards::Tasks.root_connection(conf).create_database(conf['database'], symbolized_configuration)
-        rescue ActiveRecord::StatementInvalid => ex
-          if ex.message.include?('database exists')
-            puts "#{conf['database']} already exists"
-          else
-            raise ex
-          end
+        ActiveRecordShards::Tasks.root_connection(conf).create_database(conf['database'], symbolized_configuration)
+      rescue ActiveRecord::StatementInvalid => ex
+        if ex.message.include?('database exists')
+          puts "#{conf['database']} already exists"
+        else
+          raise ex
         end
-      else
-        create_database(conf)
       end
     end
     ActiveRecord::Base.establish_connection(ActiveRecordShards.rails_env.to_sym)
@@ -56,16 +52,19 @@ namespace :db do
   task abort_if_pending_migrations: :environment do
     if defined? ActiveRecord
       pending_migrations =
-        if Rails::VERSION::MAJOR >= 4
+        if ActiveRecord::VERSION::STRING >= "5.2.0"
+          migrations = ActiveRecord::MigrationContext.new(ActiveRecord::Migrator.migrations_paths).migrations
+          ActiveRecord::Migrator.new(:up, migrations).pending_migrations
+        elsif ActiveRecord::VERSION::MAJOR >= 4
           ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
         else
           ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations }
         end
 
       if pending_migrations.any?
-        puts "You have #{pending_migrations.size} pending migrations:"
+        $stderr.puts "You have #{pending_migrations.size} pending migrations:"
         pending_migrations.each do |pending_migration|
-          puts '  %4d %s' % [pending_migration.version, pending_migration.name]
+          $stderr.puts '  %4d %s' % [pending_migration.version, pending_migration.name]
         end
         abort %(Run "rake db:migrate" to update your database then try again.)
       end
@@ -89,17 +88,24 @@ end
 
 module ActiveRecordShards
   module Tasks
-    if ActiveRecord::VERSION::MAJOR < 5
-      def self.root_connection(conf)
-        ActiveRecord::Base.send("#{conf['adapter']}_connection", conf.merge('database' => nil))
-      end
-    else
-      def self.root_connection(conf)
-        # this will trigger rails to load the adapter
+    class << self
+      def root_connection(conf)
         conf = conf.merge('database' => nil)
-        resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations)
-        resolver.spec(conf)
-        ActiveRecord::Base.send("#{conf['adapter']}_connection", conf)
+        spec = spec_for(conf)
+
+        ActiveRecord::Base.send("#{conf['adapter']}_connection", spec.config)
+      end
+
+      private
+
+      def spec_for(conf)
+        if ActiveRecord::VERSION::MAJOR >= 4
+          resolver = ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(ActiveRecord::Base.configurations)
+          resolver.spec(conf)
+        else
+          resolver = ActiveRecordShards::ConnectionSpecification::Resolver.new conf, ActiveRecord::Base.configurations
+          resolver.spec
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.12.0.beta2
+  version: 3.13.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -55,20 +55,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -159,14 +145,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: phenix
   requirement: !ruby/object:Gem::Requirement
@@ -228,12 +214,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.