active_record_shards 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dd69ed02637e49d444f17f46112f4353bd38274
-  data.tar.gz: 72b1d921a77e347f093d0591b46a4c0dd088cb4e
+  metadata.gz: f22328837e48da3dbf1b805e69a7f65ad8ae431b
+  data.tar.gz: 5f64e2de4f4d9b2ec578a7086ca1b343199692af
 SHA512:
-  metadata.gz: 25977dee6f8cd3188d6e7577c987a86c30e22b0ac2ee327dd9dccb07fb38bbe925c138497fc15caa1252fe6320cf849740d208abf09a04f8ee0deee2a654adf6
-  data.tar.gz: 000d3325d3934d6b3c4655860edfe512970a0eceac91236dc4064eb9fa5775652df3e283bba0fb232b18c08a40eaada26c1c66b93d3344e70193b971da7e3b59
+  metadata.gz: 1208459ce41631737cc65189ffe6fe94bad6e7441442cb61330647308a3422c8475fbf2d84a63549493c23eda176b6a70476a7a5dffc7f68f25608e0d2b3061e
+  data.tar.gz: 40f8b499653ef50efe49fb465c69b021f29069997df42a037788893673c03eb22d1651d1e17df281f1abba83a82b1bb9fa49bc9ada607138c5fa11243dc1dcc0

data/lib/active_record_shards/configuration_parser.rb

@@ -39,12 +39,12 @@ module ActiveRecordShards
       self.configurations_without_shard_explosion = explode(conf)
     end
 
-    def ConfigurationParser.extended(klass)
-      klass.singleton_class.send(:alias_method, :configurations_without_shard_explosion=, :configurations=)
-      klass.singleton_class.send(:alias_method, :configurations=, :configurations_with_shard_explosion=)
-      klass.singleton_class.send(:public, :configurations=)
+    def self.extended(base)
+      base.singleton_class.send(:alias_method, :configurations_without_shard_explosion=, :configurations=)
+      base.singleton_class.send(:alias_method, :configurations=, :configurations_with_shard_explosion=)
+      base.singleton_class.send(:public, :configurations=)
 
-      klass.configurations = klass.configurations if klass.configurations.present?
+      base.configurations = base.configurations if base.configurations.present?
     end
   end
 end

data/lib/active_record_shards/connection_switcher.rb

@@ -4,12 +4,12 @@ module ActiveRecordShards
   module ConnectionSwitcher
     SHARD_NAMES_CONFIG_KEY = 'shard_names'.freeze
 
-    def self.extended(klass)
-      klass.singleton_class.send(:alias_method, :columns_without_default_shard, :columns)
-      klass.singleton_class.send(:alias_method, :columns, :columns_with_default_shard)
+    def self.extended(base)
+      base.singleton_class.send(:alias_method, :columns_without_default_shard, :columns)
+      base.singleton_class.send(:alias_method, :columns, :columns_with_default_shard)
 
-      klass.singleton_class.send(:alias_method, :table_exists_without_default_shard?, :table_exists?)
-      klass.singleton_class.send(:alias_method, :table_exists?, :table_exists_with_default_shard?)
+      base.singleton_class.send(:alias_method, :table_exists_without_default_shard?, :table_exists?)
+      base.singleton_class.send(:alias_method, :table_exists?, :table_exists_with_default_shard?)
     end
 
     def default_shard=(new_default_shard)

data/lib/active_record_shards/migration.rb

@@ -101,16 +101,17 @@ module ActiveRecordShards
 
       migrate_without_forced_shard(direction)
     end
+
+    def migration_shard
+      self.class.migration_shard
+    end
   end
 end
 
 ActiveRecord::Migration.class_eval do
   extend ActiveRecordShards::MigrationClassExtension
-
   include ActiveRecordShards::ActualMigrationExtension
-  define_method :migration_shard do
-    self.class.migration_shard
-  end
+
   alias_method :migrate_without_forced_shard, :migrate
   alias_method :migrate, :migrate_with_forced_shard
 end

data/lib/active_record_shards/schema_cache_extension.rb

@@ -0,0 +1,34 @@
+unless (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR > 2) || ActiveRecord::VERSION::MAJOR > 4
+  ActiveRecord::ConnectionAdapters::ConnectionPool.class_eval do
+    attr_accessor :schema_cache
+
+    private
+
+    alias :original_new_connection :new_connection
+
+    def new_connection
+      original_new_connection.tap do |connection|
+        if schema_cache
+          connection.schema_cache = schema_cache.dup
+        end
+      end
+    end
+  end
+
+  ActiveRecord::ConnectionAdapters::SchemaCache.class_eval do
+    def initialize_dup(other)
+      super
+
+      @columns      = @columns.dup
+      @columns_hash = @columns_hash.dup
+      @primary_keys = @primary_keys.dup
+      @tables       = @tables.dup
+    end
+  end
+end
+
+unless ActiveRecord::VERSION::MAJOR > 4
+  ActiveRecord::ConnectionAdapters::AbstractAdapter.class_eval do
+    attr_writer :schema_cache
+  end
+end

data/lib/active_record_shards/shard_selection.rb

@@ -33,9 +33,10 @@ module ActiveRecordShards
       the_shard = shard(klass)
 
       @shard_names ||= {}
-      @shard_names[the_shard] ||= {}
-      @shard_names[the_shard][try_slave] ||= {}
-      @shard_names[the_shard][try_slave][@on_slave] ||= begin
+      @shard_names[ActiveRecordShards.rails_env] ||= {}
+      @shard_names[ActiveRecordShards.rails_env][the_shard] ||= {}
+      @shard_names[ActiveRecordShards.rails_env][the_shard][try_slave] ||= {}
+      @shard_names[ActiveRecordShards.rails_env][the_shard][try_slave][@on_slave] ||= begin
         s = ActiveRecordShards.rails_env.dup
         s << "_shard_#{the_shard}" if the_shard
         s << "_slave"              if @on_slave && try_slave

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,6 +170,7 @@ files:
 - lib/active_record_shards/default_slave_patches.rb
 - lib/active_record_shards/migration.rb
 - lib/active_record_shards/model.rb
+- lib/active_record_shards/schema_cache_extension.rb
 - lib/active_record_shards/schema_dumper_extension.rb
 - lib/active_record_shards/shard_selection.rb
 - lib/active_record_shards/shard_support.rb