activerecord-turntable 2.5.0 → 3.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bae4fd19e4b7b55c12f1793b954e711e0c9693b
-  data.tar.gz: b5da25ad60b9b02b3d6483f59d940a87a832d65f
+  metadata.gz: af3117e04f949c697cf878879a85c2205f7e19b6
+  data.tar.gz: 5437cc1aec6b98bb507639d81e9687eac526d8d1
 SHA512:
-  metadata.gz: 7bef5cc2a9020bfb5f7158cef8c6935359c3bc77d8e9f7b28dfc88375eccdb9dfde5f7ae2becbf48fc07af6fd793b492f3c13735c982cfab9f1e501939c6550a
-  data.tar.gz: 3fda72ec78a460652cd460426f04a35bdb473f96f3bcd1241e594fc5ba401e5c619789dbe28d16652dd649eb78b98bb60ebd98919a691bee43eab4c25c8814c8
+  metadata.gz: 039ffd448816f9792c8fb29fb7844e08ab0c1ea7227367158810dc718d580ee047922d1e23117875611e3d606d6a1b3a3494d732e962dc84e774a0755240a8bd
+  data.tar.gz: 939620c1056efc1b1f843dc348c5420ea811c87987a5149565b8049ed488689f4b224c28c962316b201c58cd33ebdba0cdf85ee42fb7623225561091ce1275a9

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_gem:
+  onkcop:
+    - "config/rubocop.yml"
+    - "config/rspec.yml"
+
+AllCops:
+  TargetRubyVersion: 2.2

data/.travis.yml

@@ -1,14 +1,10 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.3
+  - 2.2.5
+  - 2.3.1
   - ruby-head
 gemfile:
-  - gemfiles/rails4_0.gemfile
-  - gemfiles/rails4_1.gemfile
-  - gemfiles/rails4_2.gemfile
+  - gemfiles/rails5_0.gemfile
 before_script:
   - bundle exec rake turntable:db:reset
 script: bundle exec rake spec

data/CHANGELOG.md

@@ -1,19 +1,9 @@
-## activerecord-turntable 2.5.0 ##
+## activerecord-turntable 3.0.0.alpha (unreleased) ##
 
-### Improvement
-
-* Fix to propagate shard conditions to `AssociationRelation` too
-
-## activerecord-turntable 2.4.0 ##
-
-### Incompatible Change
-
-* Drop support for ruby 1.9.3
-
-### Bugfix
+* Rails5 compatibility
+  * Minimum ruby requirement version is `2.2.2`
+  * Rails 4.x support has been dropped.
 
-* Update activerecord 4.2 patches
-  * Fixes optimistic locking with a serialized column causes JSON::Error.
 
 ## activerecord-turntable 2.3.3 ##
 

data/Gemfile

@@ -1,3 +1,6 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "activerecord", "5.0.0.1"
+gem "activesupport", "5.0.0.1"

data/Guardfile

@@ -1,11 +1,16 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec',
-  cmd: "bundle exec rspec",
-  all_after_pass: true,
-  all_on_start: true do
-    watch(%r{^spec/.+_spec\.rb$})
-    watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-    watch('spec/spec_helper.rb')  { "spec" }
+guard "rspec",
+      cmd: "bundle exec rspec",
+      all_after_pass: true,
+      all_on_start: true do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch("spec/spec_helper.rb")  { "spec" }
+end
+
+guard :rubocop do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

data/README.md

@@ -9,9 +9,12 @@ ActiveRecord::Turntable is a database sharding extension for ActiveRecord.
 
 ## Dependencies
 
-activerecord(>=4.0.0)
+activerecord(>=5.0.0, <6.0)
 
-if you are using activerecord 3.x, please use activerecord-turntable version 1.x.
+If you are using with older activerecord versions, use following versions.
+
+* activerecord 3.x - use activerecord-turntable version 1.x.
+* activerecord 4.x - use activerecord-turntable version 2.x.
 
 ## Supported Database
 
@@ -22,7 +25,7 @@ Currently supports mysql only.
 Add to Gemfile:
 
 ```ruby
-gem 'activerecord-turntable', '~> 2.1.1'
+gem 'activerecord-turntable', '~> 3.0.0.alpha1'
 ```
 
 Run a bundle install:
@@ -136,7 +139,7 @@ Edit turntable.yml and database.yml. See below example config.
           database: sample_app_user3_development
 ```
 
-### Example Migration 
+### Example Migration
 
 Generate a model:
 
@@ -282,7 +285,7 @@ First, add configuration to turntable.yml and database.yml
           seq:
             user_seq: # <-- sequencer name
               seq_type: mysql # <-- sequencer type
-              connection: user_seq_1 # <-- sequencer database connection 
+              connection: user_seq_1 # <-- sequencer database connection
 ```
 
 Add below to the migration:
@@ -369,8 +372,8 @@ end
 transaction helper to execute transaction to all shards in the cluster:
 
 ```ruby
-User.user_cluster_transaction do 
-  # Transaction is opened all shards in "user_cluster" 
+User.user_cluster_transaction do
+  # Transaction is opened all shards in "user_cluster"
 end
 ```
 
@@ -432,23 +435,12 @@ Use with_all method:
   end
 ```
 
-### Connection Management
-
-Rails's ConnectionManagement middleware keeps ActiveRecord's connection during the process is alive, but Turntable keeps more connections.
-This may cause flooding max connections on your database. So, we made a middleware that disconnects on each request.
-
-if you use turntable's ConnectionManagement middleware, add below line to your initializer.
-
-```ruby
-app.middleware.swap ActiveRecord::ConnectionAdapters::ConnectionManagement, ActiveRecord::Turntable::Rack::ConnectionManagement
-```
-
 ### Performance Exception
 
 To notice queries causing performance problem, Turntable has follow options.
 
 * raise\_on\_not\_specified\_shard\_query - raises on queries execute on all shards
-* raise\_on\_not\_specified\_shard\_update - raises on updates executed on all shards 
+* raise\_on\_not\_specified\_shard\_update - raises on updates executed on all shards
 
 
 Add to turntable.yml:

data/Rakefile

@@ -1,25 +1,25 @@
 require "bundler/gem_tasks"
-require 'rubygems'
+require "rubygems"
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList["spec/**/*_spec.rb"]
 end
 
-require 'active_record'
+require "active_record"
 require "active_record/turntable/active_record_ext/database_tasks"
 
 namespace :turntable do
   namespace :db do
     task :rails_env do
       unless defined? RAILS_ENV
-        RAILS_ENV = ENV['RAILS_ENV'] ||= 'test'
+        RAILS_ENV = ENV["RAILS_ENV"] ||= "test"
       end
     end
 
     task :load_config => :rails_env do
-      yaml_file = File.join(File.dirname(__FILE__), 'spec/config/database.yml')
+      yaml_file = File.join(File.dirname(__FILE__), "spec/config/database.yml")
       ActiveRecord::Base.configurations = YAML.load ERB.new(IO.read(yaml_file)).result
     end
 
@@ -38,12 +38,12 @@ namespace :turntable do
     desc "migrate turntable test tables"
     task :migrate => :load_config do
       ActiveRecord::Base.establish_connection RAILS_ENV.to_sym
-      require 'active_record/turntable'
-      ActiveRecord::Base.send(:include, ActiveRecord::Turntable)
-      ActiveRecord::ConnectionAdapters::SchemaStatements.send(:include, ActiveRecord::Turntable::Migration::SchemaStatementsExt)
+      require "active_record/turntable"
+      ActiveRecord::Base.include(ActiveRecord::Turntable)
+      ActiveRecord::ConnectionAdapters::SchemaStatements.include(ActiveRecord::Turntable::Migration::SchemaStatementsExt)
 
       configurations = [ActiveRecord::Base.configurations[RAILS_ENV]]
-      configurations += ActiveRecord::Tasks::DatabaseTasks.current_turntable_cluster_configurations(RAILS_ENV).map {|v| v[1]}.flatten.uniq
+      configurations += ActiveRecord::Tasks::DatabaseTasks.current_turntable_cluster_configurations(RAILS_ENV).map { |v| v[1] }.flatten.uniq
 
       configurations.each do |configuration|
         ActiveRecord::Base.establish_connection configuration
@@ -62,7 +62,6 @@ namespace :turntable do
           t.belongs_to :user, :null => false
           t.integer    :hp,   :null => false, :default => 0
           t.integer    :mp,   :null => false, :default => 0
-          t.text       :data
           t.integer    :lock_version, :null => false, :default => 0
           t.datetime   :deleted_at, :default => nil
           t.timestamps
@@ -101,15 +100,15 @@ namespace :turntable do
 
         ActiveRecord::Base.connection.create_table :cards_users_histories do |t|
           t.belongs_to :cards_user,    :null => false
-          t.belongs_to :user,    :null => false
+          t.belongs_to :user, :null => false
           t.timestamps
         end
         ActiveRecord::Base.connection.create_sequence_for :cards_users_histories
 
         ActiveRecord::Base.connection.create_table :events_users_histories do |t|
-          t.belongs_to :events_user,    :null => false
+          t.belongs_to :events_user, :null => false
           t.belongs_to :cards_user,    :null => false
-          t.belongs_to :user,    :null => false
+          t.belongs_to :user, :null => false
           t.timestamps
         end
         ActiveRecord::Base.connection.create_sequence_for :events_users_histories

data/activerecord-turntable.gemspec

@@ -1,56 +1,53 @@
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path("../lib", __FILE__)
 require "active_record/turntable/version"
 
 Gem::Specification.new do |spec|
   spec.name = "activerecord-turntable"
   spec.version = ActiveRecord::Turntable::VERSION
-  spec.authors     = ["gussan", "sue445"]
+  spec.authors     = %w(gussan sue445)
   spec.homepage    = "https://github.com/drecom/activerecord-turntable"
-  spec.summary = %q{ActiveRecord sharding extension}
-  spec.description = %q{ActiveRecord sharding extension}
+  spec.summary = "ActiveRecord sharding extension"
+  spec.description = "ActiveRecord sharding extension"
   spec.license = "MIT"
 
   spec.rubyforge_project = "activerecord-turntable"
   spec.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
   ]
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.0.0'
+  spec.required_ruby_version = ">= 2.2.2"
 
-  spec.add_runtime_dependency "activerecord",  ">= 4.0.0", "< 5.0"
-  spec.add_runtime_dependency "activesupport", ">= 4.0.0", "< 5.0"
-  spec.add_runtime_dependency "sql_tree",      "= 0.2.0"
+  spec.add_runtime_dependency "activerecord",  ">= 5.0", "< 6.0"
+  spec.add_runtime_dependency "activesupport", ">= 5.0", "< 6.0"
   spec.add_runtime_dependency "bsearch",       "~> 1.5"
   spec.add_runtime_dependency "httpclient",    ">= 0"
+  spec.add_runtime_dependency "sql_tree",      "= 0.2.0"
 
   # optional dependencies
   spec.add_development_dependency "activerecord-import"
   spec.add_development_dependency "barrage"
+  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency "fabrication"
+  spec.add_development_dependency "faker"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "guard-rubocop"
   spec.add_development_dependency "mysql2"
-
+  spec.add_development_dependency "onkcop"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "rack"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rack", "< 2"
-  spec.add_development_dependency "rspec", "~> 3.5.0"
-  spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "rspec", "~> 3.1.0"
   spec.add_development_dependency "rspec-collection_matchers"
-  spec.add_development_dependency "fabrication"
-  spec.add_development_dependency "faker"
+  spec.add_development_dependency "rspec-its"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-rspec"
+  spec.add_development_dependency "timecop"
   spec.add_development_dependency "webmock"
-  spec.add_development_dependency "pry"
-  if RUBY_VERSION > "2.0"
-    spec.add_development_dependency "pry-byebug"
-  end
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "listen", "= 3.0.6"
-  spec.add_development_dependency "coveralls"
-
-  if RUBY_PLATFORM =~ /darwin/
-    spec.add_development_dependency "growl"
-  end
 end

data/gemfiles/rails5_0.gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.0.1"
+gem "activesupport", "5.0.0.1"
+
+gemspec :path => '../'

data/lib/active_record/turntable/active_record_ext/abstract_adapter.rb

@@ -1,30 +1,34 @@
 module ActiveRecord::Turntable
   module ActiveRecordExt
     module AbstractAdapter
-      extend ActiveSupport::Concern
-
-      included do
-        protected
-
-        # @note override for logging current shard name
-        def log(sql, name = "SQL", binds = [], statement_name = nil)
-          @instrumenter.instrument(
-                                   "sql.active_record",
-                                   :sql            => sql,
-                                   :name           => name,
-                                   :connection_id  => object_id,
-                                   :statement_name => statement_name,
-                                   :binds          => binds,
-                                   :turntable_shard_name => turntable_shard_name) { yield }
-        rescue Exception => e
+      def translate_exception_class(e, sql)
+        begin
           message = "#{e.class.name}: #{e.message}: #{sql} : #{turntable_shard_name}"
-          @logger.error message if @logger
-          exception = translate_exception(e, message)
-          exception.set_backtrace e.backtrace
-          raise exception
+        rescue Encoding::CompatibilityError
+          message = "#{e.class.name}: #{e.message.force_encoding sql.encoding}: #{sql} : #{turntable_shard_name}"
         end
+
+        exception = translate_exception(e, message)
+        exception.set_backtrace e.backtrace
+        exception
       end
 
+      # @note override for append current shard name
+      def log(sql, name = "SQL", binds = [], statement_name = nil)
+        @instrumenter.instrument(
+          "sql.active_record",
+          :sql                  => sql,
+          :name                 => name,
+          :connection_id        => object_id,
+          :statement_name       => statement_name,
+          :binds                => binds,
+          :turntable_shard_name => turntable_shard_name) { yield }
+      rescue => e
+        raise translate_exception_class(e, sql)
+      end
+
+      protected :translate_exception_class, :log
+
       def turntable_shard_name=(name)
         @turntable_shard_name = name.to_s
       end

data/lib/active_record/turntable/active_record_ext/activerecord_import_ext.rb

@@ -2,20 +2,12 @@ module ActiveRecord::Turntable
   module ActiveRecordExt
     # activerecord-import extension
     module ActiverecordImportExt
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :values_sql_for_columns_and_attributes, :turntable
-      end
-
-      private
-
       # @note override for sequencer injection
       # @see https://github.com/zdennis/activerecord-import/blob/ba909fed5a4785fe9c7cce89e48e1242bb6804ea/lib/activerecord-import/import.rb#L558-L581
-      def values_sql_for_columns_and_attributes_with_turntable(columns, array_of_attributes)
+      private def values_sql_for_columns_and_attributes(columns, array_of_attributes)
         connection_memo = connection
         array_of_attributes.map do |arr|
-          my_values = arr.each_with_index.map do |val,j|
+          my_values = arr.each_with_index.map do |val, j|
             column = columns[j]
 
             # be sure to query sequence_name *last*, only if cheaper tests fail, because it's costly
@@ -28,10 +20,8 @@ module ActiveRecord::Turntable
             elsif column
               if respond_to?(:type_caster) && type_caster.respond_to?(:type_cast_for_database) # Rails 5.0 and higher
                 connection_memo.quote(type_caster.type_cast_for_database(column.name, val))
-              elsif column.respond_to?(:type_cast_from_user)                      # Rails 4.2 and higher
+              else # Rails 4.2 and higher
                 connection_memo.quote(column.type_cast_from_user(val), column)
-              else                                                                # Rails 3.1, 3.2, and 4.1
-                connection_memo.quote(column.type_cast(val), column)
               end
             end
           end
@@ -41,9 +31,9 @@ module ActiveRecord::Turntable
     end
 
     begin
-      require 'activerecord-import'
-      require 'activerecord-import/base'
-      (class << ActiveRecord::Base; self; end).send(:include, ActiverecordImportExt)
+      require "activerecord-import"
+      require "activerecord-import/base"
+      (class << ActiveRecord::Base; self; end).prepend(ActiverecordImportExt)
     rescue LoadError
     end
   end

data/lib/active_record/turntable/active_record_ext/acts_as_archive_extension.rb

@@ -1,22 +1,31 @@
-begin
-  require 'acts_as_archive'
-  # acts_as_archive extension
-  class ActsAsArchive
-    class << self
-      # @note use the same shard which `from` shard using
-      def move_with_turntable(config, where, merge_options={})
-        if [config[:to], config[:from]].all? { |k| k.try(:turntable_enabled?) }
-          current_shard = config[:from].connection.current_shard.name.to_sym
-          config[:to].connection.with_shard(current_shard) {
-            move_without_turntable(config, where, merge_options)
-          }
-        else
-          move_without_turntable(config, where, merge_options)
+module ActiveRecord::Turntable
+  module ActiveRecordExt
+    module ActsAsArchiveExt
+      def self.prepended(base)
+        class << base
+          prepend ClassMethods
         end
       end
 
-      alias_method_chain :move, :turntable
+      module ClassMethods
+        # @note use the same shard which `from` shard using
+        def move(config, where, merge_options = {})
+          if [config[:to], config[:from]].all? { |k| k.try(:turntable_enabled?) }
+            current_shard = config[:from].connection.current_shard.name.to_sym
+            config[:to].connection.with_shard(current_shard) {
+              super
+            }
+          else
+            super
+          end
+        end
+      end
+    end
+
+    begin
+      require 'acts_as_archive'
+      ActsAsArchive.prepend ActsAsArchiveExt
+    rescue LoadError
     end
   end
-rescue LoadError
 end

data/lib/active_record/turntable/active_record_ext/association.rb

@@ -3,29 +3,48 @@ require "active_record/associations"
 module ActiveRecord::Turntable
   module ActiveRecordExt
     module Association
+      extend ActiveSupport::Concern
       include ShardingCondition
 
-      def self.prepended(mod)
-        ActiveRecord::Associations::Builder::Association.valid_options << :foreign_shard_key
+      included do
+        ActiveRecord::Associations::SingularAssociation.prepend(SingularAssociationExt)
+        ActiveRecord::Associations::CollectionAssociation.prepend(CollectionAssociationExt)
+        ActiveRecord::Associations::Builder::Association::VALID_OPTIONS << :foreign_shard_key
       end
 
-      protected
+      # @note Inject to add sharding condition for singular association
+      module SingularAssociationExt
+        private
+          def get_records
+            # OPTIMIZE: statement caching
+            if should_use_shard_key?
+              return turntable_scope(scope).limit(1).records
+            end
 
-        # @note Override to pass shard key conditions
-        def target_scope
-          return super unless should_use_shard_key?
+            super
+          end
+      end
 
-          scope = klass.where(
-                    klass.turntable_shard_key =>
-                      owner.send(foreign_shard_key)
-                  )
-          super.merge!(scope)
-        end
+      # @note Inject to add sharding condition for collection association
+      module CollectionAssociationExt
+        private
+          def get_records
+            # OPTIMIZE: statement caching
+            if should_use_shard_key?
+              return turntable_scope(scope).to_a
+            end
+
+            super
+          end
+      end
 
       private
 
-        def skip_statement_cache?
-          super || should_use_shard_key?
+        def turntable_scope(scope, bind = nil)
+          if should_use_shard_key?
+            scope = scope.where(klass.turntable_shard_key => owner.send(foreign_shard_key))
+          end
+          scope
         end
     end
   end

data/lib/active_record/turntable/active_record_ext/association_preloader.rb

@@ -1,38 +1,18 @@
-require 'active_record/associations/preloader/association'
+require "active_record/associations/preloader/association"
 
 module ActiveRecord::Turntable
   module ActiveRecordExt
     module AssociationPreloader
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :records_for, :turntable
-      end
+      include ShardingCondition
 
       # @note Override to add sharding condition on preload
-      def records_for_with_turntable(ids)
-        returning_scope = records_for_without_turntable(ids)
+      def records_for(ids)
+        returning_scope = super
         if should_use_shard_key?
           returning_scope = returning_scope.where(klass.turntable_shard_key => owners.map(&foreign_shard_key.to_sym).uniq)
         end
         returning_scope
       end
-
-      private
-
-      def foreign_shard_key
-        options[:foreign_shard_key] || model.turntable_shard_key
-      end
-
-      def should_use_shard_key?
-        sharded_by_same_key? || !!options[:foreign_shard_key]
-      end
-
-      def sharded_by_same_key?
-        model.turntable_enabled? &&
-          klass.turntable_enabled? &&
-          model.turntable_shard_key == klass.turntable_shard_key
-      end
     end
   end
 end

data/lib/active_record/turntable/active_record_ext/clever_load.rb

@@ -5,7 +5,7 @@ module ActiveRecord::Turntable
 
       included do
         class << ActiveRecord::Base
-          delegate :clever_load!, :to => :all
+          delegate :clever_load!, to: :all
         end
       end
 
@@ -13,7 +13,7 @@ module ActiveRecord::Turntable
         # load records
         records = self.to_a
         klass = records.first.class
-        association_key = Util.ar42_or_later? ? association_name.to_s : association_name
+        association_key = association_name.to_s
         reflection = klass.reflections[association_key]
 
         if reflection

data/lib/active_record/turntable/active_record_ext/connection_handler_extension.rb

@@ -1,31 +1,27 @@
 module ActiveRecord::Turntable
   module ActiveRecordExt
     module ConnectionHandlerExtension
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :pool_for, :turntable
-      end
-
-      private
-
       # @note Override not to establish_connection destroy existing connection pool proxy object
-      def pool_for_with_turntable(owner)
-        owner_to_pool.fetch(owner.name) {
-          if ancestor_pool = pool_from_any_process_for(owner)
+      def retrieve_connection_pool(spec_name)
+        owner_to_pool.fetch(spec_name) do
+          # Check if a connection was previously established in an ancestor process,
+          # which may have been forked.
+          if ancestor_pool = pool_from_any_process_for(spec_name)
             if ancestor_pool.is_a?(ActiveRecord::ConnectionAdapters::ConnectionPool)
               # A connection was established in an ancestor process that must have
               # subsequently forked. We can't reuse the connection, but we can copy
               # the specification and establish a new connection with it.
-              establish_connection owner, ancestor_pool.spec
+              establish_connection(ancestor_pool.spec).tap do |pool|
+                pool.schema_cache = ancestor_pool.schema_cache if ancestor_pool.schema_cache
+              end
             else
               # Use same PoolProxy object
-              owner_to_pool[owner.name] = ancestor_pool
+              owner_to_pool[spec_name] = ancestor_pool
             end
           else
-            owner_to_pool[owner.name] = nil
+            owner_to_pool[spec_name] = nil
           end
-        }
+        end
       end
     end
   end