activerecord 3.2.22.5 → 4.2.11.3

data/lib/rails/generators/active_record/migration/templates/migration.rb

@@ -2,32 +2,37 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <%- if migration_action == 'add' -%>
   def change
 <% attributes.each do |attribute| -%>
+  <%- if attribute.reference? -%>
+    add_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
     add_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
     <%- if attribute.has_index? -%>
     add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
     <%- end -%>
+  <%- end -%>
 <%- end -%>
   end
+<%- elsif migration_action == 'join' -%>
+  def change
+    create_join_table :<%= join_tables.first %>, :<%= join_tables.second %> do |t|
+    <%- attributes.each do |attribute| -%>
+      <%= '# ' unless attribute.has_index? -%>t.index <%= attribute.index_name %><%= attribute.inject_index_options %>
+    <%- end -%>
+    end
+  end
 <%- else -%>
-  def up
+  def change
 <% attributes.each do |attribute| -%>
-  <%- if migration_action -%>
-    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><%= attribute.inject_options %><% end %>
-    <%- if attribute.has_index? && migration_action == 'add' -%>
-    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+<%- if migration_action -%>
+  <%- if attribute.reference? -%>
+    remove_reference :<%= table_name %>, :<%= attribute.name %><%= attribute.inject_options %>
+  <%- else -%>
+    <%- if attribute.has_index? -%>
+    remove_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
     <%- end -%>
+    remove_column :<%= table_name %>, :<%= attribute.name %>, :<%= attribute.type %><%= attribute.inject_options %>
   <%- end -%>
 <%- end -%>
-  end
-
-  def down
-<% attributes.reverse.each do |attribute| -%>
-  <%- if migration_action -%>
-    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><%= attribute.inject_options %><% end %>
-    <%- if attribute.has_index? && migration_action == 'remove' -%>
-    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
-    <%- end -%>
-  <%- end -%>
 <%- end -%>
   end
 <%- end -%>

data/lib/rails/generators/active_record/migration.rb

@@ -1,13 +1,16 @@
+require 'rails/generators/migration'
+
 module ActiveRecord
-  module Generators
+  module Generators # :nodoc:
     module Migration
-      # Implement the required interface for Rails::Generators::Migration.
-      def next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        if ActiveRecord::Base.timestamped_migrations
-          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
-        else
-          "%.3d" % next_migration_number
+      extend ActiveSupport::Concern
+      include Rails::Generators::Migration
+
+      module ClassMethods
+        # Implement the required interface for Rails::Generators::Migration.
+        def next_migration_number(dirname)
+          next_migration_number = current_migration_number(dirname) + 1
+          ActiveRecord::Migration.next_migration_number(next_migration_number)
         end
       end
     end

data/lib/rails/generators/active_record/model/model_generator.rb

@@ -1,8 +1,8 @@
 require 'rails/generators/active_record'
 
 module ActiveRecord
-  module Generators
-    class ModelGenerator < Base
+  module Generators # :nodoc:
+    class ModelGenerator < Base # :nodoc:
       argument :attributes, :type => :array, :default => [], :banner => "field[:type][:index] field[:type][:index]"
 
       check_class_collision
@@ -12,9 +12,13 @@ module ActiveRecord
       class_option :parent,     :type => :string, :desc => "The parent class for the generated model"
       class_option :indexes,    :type => :boolean, :default => true, :desc => "Add indexes for references and belongs_to columns"
 
+      
+      # creates the migration file for the model.
+
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
-        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
+        attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
+        migration_template "../../migration/templates/create_table_migration.rb", "db/migrate/create_#{table_name}.rb"
       end
 
       def create_model_file
@@ -27,7 +31,7 @@ module ActiveRecord
       end
 
       def attributes_with_index
-        attributes.select { |a| a.has_index? || (a.reference? && options[:indexes]) }
+        attributes.select { |a| !a.reference? && a.has_index? }
       end
 
       def accessible_attributes
@@ -38,6 +42,7 @@ module ActiveRecord
 
       protected
 
+        # Used by the migration template to determine the parent name of the model
         def parent_class_name
           options[:parent] || "ActiveRecord::Base"
         end

data/lib/rails/generators/active_record/model/templates/model.rb

@@ -1,12 +1,10 @@
 <% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
-  belongs_to :<%= attribute.name %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
 <% end -%>
-<% if !accessible_attributes.empty? -%>
-  attr_accessible <%= accessible_attributes.map {|a| ":#{a.name}" }.sort.join(', ') %>
-<% else -%>
-  # attr_accessible :title, :body
+<% if attributes.any?(&:password_digest?) -%>
+  has_secure_password
 <% end -%>
 end
 <% end -%>

data/lib/rails/generators/active_record/model/templates/module.rb

@@ -1,7 +1,7 @@
 <% module_namespacing do -%>
 module <%= class_path.map(&:camelize).join('::') %>
   def self.table_name_prefix
-    '<%= class_path.join('_') %>_'
+    '<%= namespaced? ? namespaced_class_path.join('_') : class_path.join('_') %>_'
   end
 end
 <% end -%>

data/lib/rails/generators/active_record.rb

@@ -1,25 +1,17 @@
 require 'rails/generators/named_base'
-require 'rails/generators/migration'
 require 'rails/generators/active_model'
 require 'rails/generators/active_record/migration'
 require 'active_record'
 
 module ActiveRecord
-  module Generators
-    class Base < Rails::Generators::NamedBase #:nodoc:
-      include Rails::Generators::Migration
-      extend ActiveRecord::Generators::Migration
+  module Generators # :nodoc:
+    class Base < Rails::Generators::NamedBase # :nodoc:
+      include ActiveRecord::Generators::Migration
 
       # Set the current directory as base for the inherited generators.
       def self.base_root
         File.dirname(__FILE__)
       end
-
-      # Implement the required interface for Rails::Generators::Migration.
-      def self.next_migration_number(dirname) #:nodoc:
-        next_migration_number = current_migration_number(dirname) + 1
-        ActiveRecord::Migration.next_migration_number(next_migration_number)
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 3.2.22.5
+  version: 4.2.11.3
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 4.2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 4.2.11.3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 4.2.11.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.22.5
+        version: 4.2.11.3
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.29
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.29
+        version: '6.0'
 description: Databases on Rails. Build a persistent domain model by mapping database
   tables to Ruby classes. Strong conventions for associations, validations, aggregations,
   migrations, and testing come baked-in.
@@ -78,11 +64,11 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
-- examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
 - lib/active_record.rb
 - lib/active_record/aggregations.rb
+- lib/active_record/association_relation.rb
 - lib/active_record/associations.rb
 - lib/active_record/associations/alias_tracker.rb
 - lib/active_record/associations/association.rb
@@ -98,7 +84,7 @@ files:
 - lib/active_record/associations/builder/singular_association.rb
 - lib/active_record/associations/collection_association.rb
 - lib/active_record/associations/collection_proxy.rb
-- lib/active_record/associations/has_and_belongs_to_many_association.rb
+- lib/active_record/associations/foreign_association.rb
 - lib/active_record/associations/has_many_association.rb
 - lib/active_record/associations/has_many_through_association.rb
 - lib/active_record/associations/has_one_association.rb
@@ -107,12 +93,10 @@ files:
 - lib/active_record/associations/join_dependency/join_association.rb
 - lib/active_record/associations/join_dependency/join_base.rb
 - lib/active_record/associations/join_dependency/join_part.rb
-- lib/active_record/associations/join_helper.rb
 - lib/active_record/associations/preloader.rb
 - lib/active_record/associations/preloader/association.rb
 - lib/active_record/associations/preloader/belongs_to.rb
 - lib/active_record/associations/preloader/collection_association.rb
-- lib/active_record/associations/preloader/has_and_belongs_to_many.rb
 - lib/active_record/associations/preloader/has_many.rb
 - lib/active_record/associations/preloader/has_many_through.rb
 - lib/active_record/associations/preloader/has_one.rb
@@ -121,10 +105,11 @@ files:
 - lib/active_record/associations/preloader/through_association.rb
 - lib/active_record/associations/singular_association.rb
 - lib/active_record/associations/through_association.rb
+- lib/active_record/attribute.rb
 - lib/active_record/attribute_assignment.rb
+- lib/active_record/attribute_decorators.rb
 - lib/active_record/attribute_methods.rb
 - lib/active_record/attribute_methods/before_type_cast.rb
-- lib/active_record/attribute_methods/deprecated_underscore_read.rb
 - lib/active_record/attribute_methods/dirty.rb
 - lib/active_record/attribute_methods/primary_key.rb
 - lib/active_record/attribute_methods/query.rb
@@ -132,49 +117,95 @@ files:
 - lib/active_record/attribute_methods/serialization.rb
 - lib/active_record/attribute_methods/time_zone_conversion.rb
 - lib/active_record/attribute_methods/write.rb
+- lib/active_record/attribute_set.rb
+- lib/active_record/attribute_set/builder.rb
+- lib/active_record/attributes.rb
 - lib/active_record/autosave_association.rb
 - lib/active_record/base.rb
 - lib/active_record/callbacks.rb
+- lib/active_record/coders/json.rb
 - lib/active_record/coders/yaml_column.rb
 - lib/active_record/connection_adapters/abstract/connection_pool.rb
-- lib/active_record/connection_adapters/abstract/connection_specification.rb
 - lib/active_record/connection_adapters/abstract/database_limits.rb
 - lib/active_record/connection_adapters/abstract/database_statements.rb
 - lib/active_record/connection_adapters/abstract/query_cache.rb
 - lib/active_record/connection_adapters/abstract/quoting.rb
+- lib/active_record/connection_adapters/abstract/savepoints.rb
+- lib/active_record/connection_adapters/abstract/schema_creation.rb
 - lib/active_record/connection_adapters/abstract/schema_definitions.rb
+- lib/active_record/connection_adapters/abstract/schema_dumper.rb
 - lib/active_record/connection_adapters/abstract/schema_statements.rb
+- lib/active_record/connection_adapters/abstract/transaction.rb
 - lib/active_record/connection_adapters/abstract_adapter.rb
 - lib/active_record/connection_adapters/abstract_mysql_adapter.rb
 - lib/active_record/connection_adapters/column.rb
+- lib/active_record/connection_adapters/connection_specification.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql_adapter.rb
+- lib/active_record/connection_adapters/postgresql/array_parser.rb
+- lib/active_record/connection_adapters/postgresql/column.rb
+- lib/active_record/connection_adapters/postgresql/database_statements.rb
+- lib/active_record/connection_adapters/postgresql/oid.rb
+- lib/active_record/connection_adapters/postgresql/oid/array.rb
+- lib/active_record/connection_adapters/postgresql/oid/bit.rb
+- lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb
+- lib/active_record/connection_adapters/postgresql/oid/bytea.rb
+- lib/active_record/connection_adapters/postgresql/oid/cidr.rb
+- lib/active_record/connection_adapters/postgresql/oid/date.rb
+- lib/active_record/connection_adapters/postgresql/oid/date_time.rb
+- lib/active_record/connection_adapters/postgresql/oid/decimal.rb
+- lib/active_record/connection_adapters/postgresql/oid/enum.rb
+- lib/active_record/connection_adapters/postgresql/oid/float.rb
+- lib/active_record/connection_adapters/postgresql/oid/hstore.rb
+- lib/active_record/connection_adapters/postgresql/oid/inet.rb
+- lib/active_record/connection_adapters/postgresql/oid/infinity.rb
+- lib/active_record/connection_adapters/postgresql/oid/integer.rb
+- lib/active_record/connection_adapters/postgresql/oid/json.rb
+- lib/active_record/connection_adapters/postgresql/oid/jsonb.rb
+- lib/active_record/connection_adapters/postgresql/oid/money.rb
+- lib/active_record/connection_adapters/postgresql/oid/point.rb
+- lib/active_record/connection_adapters/postgresql/oid/range.rb
+- lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb
+- lib/active_record/connection_adapters/postgresql/oid/time.rb
+- lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb
+- lib/active_record/connection_adapters/postgresql/oid/uuid.rb
+- lib/active_record/connection_adapters/postgresql/oid/vector.rb
+- lib/active_record/connection_adapters/postgresql/oid/xml.rb
+- lib/active_record/connection_adapters/postgresql/quoting.rb
+- lib/active_record/connection_adapters/postgresql/referential_integrity.rb
+- lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+- lib/active_record/connection_adapters/postgresql/schema_statements.rb
+- lib/active_record/connection_adapters/postgresql/utils.rb
 - lib/active_record/connection_adapters/postgresql_adapter.rb
 - lib/active_record/connection_adapters/schema_cache.rb
 - lib/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/active_record/connection_adapters/sqlite_adapter.rb
 - lib/active_record/connection_adapters/statement_pool.rb
+- lib/active_record/connection_handling.rb
+- lib/active_record/core.rb
 - lib/active_record/counter_cache.rb
-- lib/active_record/dynamic_finder_match.rb
 - lib/active_record/dynamic_matchers.rb
-- lib/active_record/dynamic_scope_match.rb
+- lib/active_record/enum.rb
 - lib/active_record/errors.rb
 - lib/active_record/explain.rb
+- lib/active_record/explain_registry.rb
 - lib/active_record/explain_subscriber.rb
+- lib/active_record/fixture_set/file.rb
 - lib/active_record/fixtures.rb
-- lib/active_record/fixtures/file.rb
-- lib/active_record/identity_map.rb
+- lib/active_record/gem_version.rb
 - lib/active_record/inheritance.rb
 - lib/active_record/integration.rb
+- lib/active_record/legacy_yaml_adapter.rb
 - lib/active_record/locale/en.yml
 - lib/active_record/locking/optimistic.rb
 - lib/active_record/locking/pessimistic.rb
 - lib/active_record/log_subscriber.rb
 - lib/active_record/migration.rb
 - lib/active_record/migration/command_recorder.rb
+- lib/active_record/migration/join_table.rb
 - lib/active_record/model_schema.rb
 - lib/active_record/nested_attributes.rb
-- lib/active_record/observer.rb
+- lib/active_record/no_touching.rb
+- lib/active_record/null_relation.rb
 - lib/active_record/persistence.rb
 - lib/active_record/query_cache.rb
 - lib/active_record/querying.rb
@@ -190,40 +221,67 @@ files:
 - lib/active_record/relation/calculations.rb
 - lib/active_record/relation/delegation.rb
 - lib/active_record/relation/finder_methods.rb
+- lib/active_record/relation/merger.rb
 - lib/active_record/relation/predicate_builder.rb
+- lib/active_record/relation/predicate_builder/array_handler.rb
+- lib/active_record/relation/predicate_builder/relation_handler.rb
 - lib/active_record/relation/query_methods.rb
 - lib/active_record/relation/spawn_methods.rb
 - lib/active_record/result.rb
+- lib/active_record/runtime_registry.rb
 - lib/active_record/sanitization.rb
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
+- lib/active_record/schema_migration.rb
 - lib/active_record/scoping.rb
 - lib/active_record/scoping/default.rb
 - lib/active_record/scoping/named.rb
 - lib/active_record/serialization.rb
 - lib/active_record/serializers/xml_serializer.rb
-- lib/active_record/session_store.rb
+- lib/active_record/statement_cache.rb
 - lib/active_record/store.rb
-- lib/active_record/test_case.rb
+- lib/active_record/tasks/database_tasks.rb
+- lib/active_record/tasks/mysql_database_tasks.rb
+- lib/active_record/tasks/postgresql_database_tasks.rb
+- lib/active_record/tasks/sqlite_database_tasks.rb
 - lib/active_record/timestamp.rb
 - lib/active_record/transactions.rb
 - lib/active_record/translation.rb
+- lib/active_record/type.rb
+- lib/active_record/type/big_integer.rb
+- lib/active_record/type/binary.rb
+- lib/active_record/type/boolean.rb
+- lib/active_record/type/date.rb
+- lib/active_record/type/date_time.rb
+- lib/active_record/type/decimal.rb
+- lib/active_record/type/decimal_without_scale.rb
+- lib/active_record/type/decorator.rb
+- lib/active_record/type/float.rb
+- lib/active_record/type/hash_lookup_type_map.rb
+- lib/active_record/type/integer.rb
+- lib/active_record/type/mutable.rb
+- lib/active_record/type/numeric.rb
+- lib/active_record/type/serialized.rb
+- lib/active_record/type/string.rb
+- lib/active_record/type/text.rb
+- lib/active_record/type/time.rb
+- lib/active_record/type/time_value.rb
+- lib/active_record/type/type_map.rb
+- lib/active_record/type/unsigned_integer.rb
+- lib/active_record/type/value.rb
 - lib/active_record/validations.rb
 - lib/active_record/validations/associated.rb
+- lib/active_record/validations/presence.rb
 - lib/active_record/validations/uniqueness.rb
 - lib/active_record/version.rb
 - lib/rails/generators/active_record.rb
 - lib/rails/generators/active_record/migration.rb
 - lib/rails/generators/active_record/migration/migration_generator.rb
+- lib/rails/generators/active_record/migration/templates/create_table_migration.rb
 - lib/rails/generators/active_record/migration/templates/migration.rb
 - lib/rails/generators/active_record/model/model_generator.rb
-- lib/rails/generators/active_record/model/templates/migration.rb
 - lib/rails/generators/active_record/model/templates/model.rb
 - lib/rails/generators/active_record/model/templates/module.rb
-- lib/rails/generators/active_record/observer/observer_generator.rb
-- lib/rails/generators/active_record/observer/templates/observer.rb
-- lib/rails/generators/active_record/session_migration/session_migration_generator.rb
-- lib/rails/generators/active_record/session_migration/templates/migration.rb
 homepage: http://www.rubyonrails.org
 licenses:
 - MIT
@@ -238,17 +296,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Object-relational mapper framework (part of Rails).
 test_files: []
-has_rdoc: 

data/lib/active_record/associations/has_and_belongs_to_many_association.rb

@@ -1,63 +0,0 @@
-module ActiveRecord
-  # = Active Record Has And Belongs To Many Association
-  module Associations
-    class HasAndBelongsToManyAssociation < CollectionAssociation #:nodoc:
-      attr_reader :join_table
-
-      def initialize(owner, reflection)
-        @join_table = Arel::Table.new(reflection.options[:join_table])
-        super
-      end
-
-      def insert_record(record, validate = true, raise = false)
-        if record.new_record?
-          if raise
-            record.save!(:validate => validate)
-          else
-            return unless record.save(:validate => validate)
-          end
-        end
-
-        if options[:insert_sql]
-          owner.connection.insert(interpolate(options[:insert_sql], record))
-        else
-          stmt = join_table.compile_insert(
-            join_table[reflection.foreign_key]             => owner.id,
-            join_table[reflection.association_foreign_key] => record.id
-          )
-
-          owner.connection.insert stmt
-        end
-
-        record
-      end
-
-      # ActiveRecord::Relation#delete_all needs to support joins before we can use a
-      # SQL-only implementation.
-      alias delete_all_on_destroy delete_all
-
-      private
-
-        def count_records
-          load_target.size
-        end
-
-        def delete_records(records, method)
-          if sql = options[:delete_sql]
-            records = load_target if records == :all
-            records.each { |record| owner.connection.delete(interpolate(sql, record)) }
-          else
-            relation = join_table
-            stmt = relation.where(relation[reflection.foreign_key].eq(owner.id).
-              and(relation[reflection.association_foreign_key].in(records.map { |x| x.id }.compact))
-            ).compile_delete
-            owner.connection.delete stmt
-          end
-        end
-
-        def invertible_for?(record)
-          false
-        end
-    end
-  end
-end

data/lib/active_record/associations/join_helper.rb

@@ -1,55 +0,0 @@
-module ActiveRecord
-  module Associations
-    # Helper class module which gets mixed into JoinDependency::JoinAssociation and AssociationScope
-    module JoinHelper #:nodoc:
-
-      def join_type
-        Arel::InnerJoin
-      end
-
-      private
-
-      def construct_tables
-        tables = []
-        chain.each do |reflection|
-          tables << alias_tracker.aliased_table_for(
-            table_name_for(reflection),
-            table_alias_for(reflection, reflection != self.reflection)
-          )
-
-          if reflection.source_macro == :has_and_belongs_to_many
-            tables << alias_tracker.aliased_table_for(
-              (reflection.source_reflection || reflection).options[:join_table],
-              table_alias_for(reflection, true)
-            )
-          end
-        end
-        tables
-      end
-
-      def table_name_for(reflection)
-        reflection.table_name
-      end
-
-      def table_alias_for(reflection, join = false)
-        name = "#{reflection.plural_name}_#{alias_suffix}"
-        name << "_join" if join
-        name
-      end
-
-      def join(table, constraint)
-        table.create_join(table, table.create_on(constraint), join_type)
-      end
-
-      def sanitize(conditions, table)
-        conditions = conditions.map do |condition|
-          condition = active_record.send(:sanitize_sql, interpolate(condition), table.table_alias || table.name)
-          condition = Arel.sql(condition) unless condition.is_a?(Arel::Node)
-          condition
-        end
-
-        conditions.length == 1 ? conditions.first : Arel::Nodes::And.new(conditions)
-      end
-    end
-  end
-end