ibm_db 5.2.0-x86-mingw32 → 5.3.2-x86-mingw32

data/test/models/person.rb

@@ -1,73 +1,79 @@
+# frozen_string_literal: true
+
 class Person < ActiveRecord::Base
   has_many :readers
   has_many :secure_readers
   has_one  :reader
 
-  has_many :posts, :through => :readers
-  has_many :secure_posts, :through => :secure_readers
-  has_many :posts_with_no_comments, -> { includes(:comments).where('comments.id is null').references(:comments) },
-                                    :through => :readers, :source => :post
+  has_many :posts, through: :readers
+  has_many :secure_posts, through: :secure_readers
+  has_many :posts_with_no_comments, -> { includes(:comments).where("comments.id is null").references(:comments) },
+                                    through: :readers, source: :post
 
-  has_many :friendships, foreign_key: 'friend_id'
+  has_many :friendships, foreign_key: "friend_id"
   # friends_too exists to test a bug, and probably shouldn't be used elsewhere
-  has_many :friends_too, foreign_key: 'friend_id', class_name: 'Friendship'
+  has_many :friends_too, foreign_key: "friend_id", class_name: "Friendship"
   has_many :followers, through: :friendships
 
   has_many :references
   has_many :bad_references
-  has_many :fixed_bad_references, -> { where :favourite => true }, :class_name => 'BadReference'
-  has_one  :favourite_reference, -> { where 'favourite=?', true }, :class_name => 'Reference'
-  has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order('comments.id') }, :through => :readers, :source => :post
+  has_many :fixed_bad_references, -> { where favourite: true }, class_name: "BadReference"
+  has_one  :favourite_reference, -> { where "favourite=?", true }, class_name: "Reference"
+  has_many :posts_with_comments_sorted_by_comment_id, -> { includes(:comments).order("comments.id") }, through: :readers, source: :post
   has_many :first_posts, -> { where(id: [1, 2]) }, through: :readers
 
-  has_many :jobs, :through => :references
-  has_many :jobs_with_dependent_destroy,    :source => :job, :through => :references, :dependent => :destroy
-  has_many :jobs_with_dependent_delete_all, :source => :job, :through => :references, :dependent => :delete_all
-  has_many :jobs_with_dependent_nullify,    :source => :job, :through => :references, :dependent => :nullify
+  has_many :jobs, through: :references
+  has_many :jobs_with_dependent_destroy,    source: :job, through: :references, dependent: :destroy
+  has_many :jobs_with_dependent_delete_all, source: :job, through: :references, dependent: :delete_all
+  has_many :jobs_with_dependent_nullify,    source: :job, through: :references, dependent: :nullify
 
-  belongs_to :primary_contact, :class_name => 'Person'
-  has_many :agents, :class_name => 'Person', :foreign_key => 'primary_contact_id'
-  has_many :agents_of_agents, :through => :agents, :source => :agents
-  belongs_to :number1_fan, :class_name => 'Person'
+  belongs_to :primary_contact, class_name: "Person"
+  has_many :agents, class_name: "Person", foreign_key: "primary_contact_id"
+  has_many :agents_of_agents, through: :agents, source: :agents
+  belongs_to :number1_fan, class_name: "Person"
 
-  has_many :personal_legacy_things, :dependent => :destroy
+  has_many :personal_legacy_things, dependent: :destroy
 
-  has_many :agents_posts,         :through => :agents,       :source => :posts
-  has_many :agents_posts_authors, :through => :agents_posts, :source => :author
+  has_many :agents_posts,         through: :agents,       source: :posts
+  has_many :agents_posts_authors, through: :agents_posts, source: :author
   has_many :essays, primary_key: "first_name", foreign_key: "writer_id"
 
-  scope :males,   -> { where(:gender => 'M') }
+  scope :males,   -> { where(gender: "M") }
 end
 
 class PersonWithDependentDestroyJobs < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
-  has_many :references, :foreign_key => :person_id
-  has_many :jobs, :source => :job, :through => :references, :dependent => :destroy
+  has_many :references, foreign_key: :person_id
+  has_many :jobs, source: :job, through: :references, dependent: :destroy
 end
 
 class PersonWithDependentDeleteAllJobs < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
-  has_many :references, :foreign_key => :person_id
-  has_many :jobs, :source => :job, :through => :references, :dependent => :delete_all
+  has_many :references, foreign_key: :person_id
+  has_many :jobs, source: :job, through: :references, dependent: :delete_all
 end
 
 class PersonWithDependentNullifyJobs < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
-  has_many :references, :foreign_key => :person_id
-  has_many :jobs, :source => :job, :through => :references, :dependent => :nullify
+  has_many :references, foreign_key: :person_id
+  has_many :jobs, source: :job, through: :references, dependent: :nullify
 end
 
+class PersonWithPolymorphicDependentNullifyComments < ActiveRecord::Base
+  self.table_name = "people"
+  has_many :comments, as: :author, dependent: :nullify
+end
 
 class LoosePerson < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
   self.abstract_class = true
 
-  has_one    :best_friend,    :class_name => 'LoosePerson', :foreign_key => :best_friend_id
-  belongs_to :best_friend_of, :class_name => 'LoosePerson', :foreign_key => :best_friend_of_id
-  has_many   :best_friends,   :class_name => 'LoosePerson', :foreign_key => :best_friend_id
+  has_one    :best_friend,    class_name: "LoosePerson", foreign_key: :best_friend_id
+  belongs_to :best_friend_of, class_name: "LoosePerson", foreign_key: :best_friend_of_id
+  has_many   :best_friends,   class_name: "LoosePerson", foreign_key: :best_friend_id
 
   accepts_nested_attributes_for :best_friend, :best_friend_of, :best_friends
 end
@@ -75,11 +81,11 @@ end
 class LooseDescendant < LoosePerson; end
 
 class TightPerson < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
-  has_one    :best_friend,    :class_name => 'TightPerson', :foreign_key => :best_friend_id
-  belongs_to :best_friend_of, :class_name => 'TightPerson', :foreign_key => :best_friend_of_id
-  has_many   :best_friends,   :class_name => 'TightPerson', :foreign_key => :best_friend_id
+  has_one    :best_friend,    class_name: "TightPerson", foreign_key: :best_friend_id
+  belongs_to :best_friend_of, class_name: "TightPerson", foreign_key: :best_friend_of_id
+  has_many   :best_friends,   class_name: "TightPerson", foreign_key: :best_friend_id
 
   accepts_nested_attributes_for :best_friend, :best_friend_of, :best_friends
 end
@@ -87,56 +93,55 @@ end
 class TightDescendant < TightPerson; end
 
 class RichPerson < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
-  has_and_belongs_to_many :treasures, :join_table => 'peoples_treasures'
+  has_and_belongs_to_many :treasures, join_table: "peoples_treasures"
 
   before_validation :run_before_create, on: :create
   before_validation :run_before_validation
 
   private
+    def run_before_create
+      self.first_name = first_name.to_s + "run_before_create"
+    end
 
-  def run_before_create
-    self.first_name = first_name.to_s + 'run_before_create'
-  end
-
-  def run_before_validation
-    self.first_name = first_name.to_s + 'run_before_validation'
-  end
+    def run_before_validation
+      self.first_name = first_name.to_s + "run_before_validation"
+    end
 end
 
 class NestedPerson < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
-  has_one :best_friend, :class_name => 'NestedPerson', :foreign_key => :best_friend_id
-  accepts_nested_attributes_for :best_friend, :update_only => true
+  has_one :best_friend, class_name: "NestedPerson", foreign_key: :best_friend_id
+  accepts_nested_attributes_for :best_friend, update_only: true
 
   def comments=(new_comments)
     raise RuntimeError
   end
 
   def best_friend_first_name=(new_name)
-    assign_attributes({ :best_friend_attributes => { :first_name => new_name } })
+    assign_attributes(best_friend_attributes: { first_name: new_name })
   end
 end
 
 class Insure
   INSURES = %W{life annuality}
 
-  def self.load mask
+  def self.load(mask)
     INSURES.select do |insure|
       (1 << INSURES.index(insure)) & mask.to_i > 0
     end
   end
 
-  def self.dump insures
+  def self.dump(insures)
     numbers = insures.map { |insure| INSURES.index(insure) }
     numbers.inject(0) { |sum, n| sum + (1 << n) }
   end
 end
 
 class SerializedPerson < ActiveRecord::Base
-  self.table_name = 'people'
+  self.table_name = "people"
 
   serialize :insures, Insure
 end

data/test/models/personal_legacy_thing.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 class PersonalLegacyThing < ActiveRecord::Base
   self.locking_column = :version
-  belongs_to :person, :counter_cache => true
+  belongs_to :person, counter_cache: true
 end

data/test/models/pet.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class Pet < ActiveRecord::Base
   attr_accessor :current_user
 
   self.primary_key = :pet_id
-  belongs_to :owner, :touch => true
+  belongs_to :owner, touch: true
   has_many :toys
   has_many :pet_treasures
   has_many :treasures, through: :pet_treasures
-  has_many :persons, through: :treasures, source: :looter, source_type: 'Person'
+  has_many :persons, through: :treasures, source: :looter, source_type: "Person"
 
   class << self
     attr_accessor :after_destroy_output

data/test/models/pet_treasure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PetTreasure < ActiveRecord::Base
   self.table_name = "pets_treasures"
 

data/test/models/pirate.rb

@@ -1,47 +1,55 @@
+# frozen_string_literal: true
+
 class Pirate < ActiveRecord::Base
-  belongs_to :parrot, :validate => true
-  belongs_to :non_validated_parrot, :class_name => 'Parrot'
-  has_and_belongs_to_many :parrots, -> { order('parrots.id ASC') }, :validate => true
-  has_and_belongs_to_many :non_validated_parrots, :class_name => 'Parrot'
-  has_and_belongs_to_many :parrots_with_method_callbacks, :class_name => "Parrot",
-    :before_add    => :log_before_add,
-    :after_add     => :log_after_add,
-    :before_remove => :log_before_remove,
-    :after_remove  => :log_after_remove
-  has_and_belongs_to_many :parrots_with_proc_callbacks, :class_name => "Parrot",
-    :before_add    => proc {|p,pa| p.ship_log << "before_adding_proc_parrot_#{pa.id || '<new>'}"},
-    :after_add     => proc {|p,pa| p.ship_log << "after_adding_proc_parrot_#{pa.id || '<new>'}"},
-    :before_remove => proc {|p,pa| p.ship_log << "before_removing_proc_parrot_#{pa.id}"},
-    :after_remove  => proc {|p,pa| p.ship_log << "after_removing_proc_parrot_#{pa.id}"}
+  belongs_to :parrot, validate: true
+  belongs_to :non_validated_parrot, class_name: "Parrot"
+  has_and_belongs_to_many :parrots, -> { order("parrots.id ASC") }, validate: true
+  has_and_belongs_to_many :non_validated_parrots, class_name: "Parrot"
+  has_and_belongs_to_many :parrots_with_method_callbacks, class_name: "Parrot",
+    before_add: :log_before_add,
+    after_add: :log_after_add,
+    before_remove: :log_before_remove,
+    after_remove: :log_after_remove
+  has_and_belongs_to_many :parrots_with_proc_callbacks, class_name: "Parrot",
+    before_add: proc { |p, pa| p.ship_log << "before_adding_proc_parrot_#{pa.id || '<new>'}" },
+    after_add: proc { |p, pa| p.ship_log << "after_adding_proc_parrot_#{pa.id || '<new>'}" },
+    before_remove: proc { |p, pa| p.ship_log << "before_removing_proc_parrot_#{pa.id}" },
+    after_remove: proc { |p, pa| p.ship_log << "after_removing_proc_parrot_#{pa.id}" }
   has_and_belongs_to_many :autosaved_parrots, class_name: "Parrot", autosave: true
 
-  has_many :treasures, :as => :looter
-  has_many :treasure_estimates, :through => :treasures, :source => :price_estimates
+  module PostTreasuresExtension
+    def build(attributes = {})
+      super({ name: "from extension" }.merge(attributes))
+    end
+  end
+
+  has_many :treasures, as: :looter, extend: PostTreasuresExtension
+  has_many :treasure_estimates, through: :treasures, source: :price_estimates
 
   has_one :ship
-  has_one :update_only_ship, :class_name => 'Ship'
-  has_one :non_validated_ship, :class_name => 'Ship'
-  has_many :birds, -> { order('birds.id ASC') }
-  has_many :birds_with_method_callbacks, :class_name => "Bird",
-    :before_add    => :log_before_add,
-    :after_add     => :log_after_add,
-    :before_remove => :log_before_remove,
-    :after_remove  => :log_after_remove
-  has_many :birds_with_proc_callbacks, :class_name => "Bird",
-    :before_add     => proc {|p,b| p.ship_log << "before_adding_proc_bird_#{b.id || '<new>'}"},
-    :after_add      => proc {|p,b| p.ship_log << "after_adding_proc_bird_#{b.id || '<new>'}"},
-    :before_remove  => proc {|p,b| p.ship_log << "before_removing_proc_bird_#{b.id}"},
-    :after_remove   => proc {|p,b| p.ship_log << "after_removing_proc_bird_#{b.id}"}
-  has_many :birds_with_reject_all_blank, :class_name => "Bird"
-
-  has_one :foo_bulb, -> { where :name => 'foo' }, :foreign_key => :car_id, :class_name => "Bulb"
-
-  accepts_nested_attributes_for :parrots, :birds, :allow_destroy => true, :reject_if => proc(&:empty?)
-  accepts_nested_attributes_for :ship, :allow_destroy => true, :reject_if => proc(&:empty?)
-  accepts_nested_attributes_for :update_only_ship, :update_only => true
+  has_one :update_only_ship, class_name: "Ship"
+  has_one :non_validated_ship, class_name: "Ship"
+  has_many :birds, -> { order("birds.id ASC") }
+  has_many :birds_with_method_callbacks, class_name: "Bird",
+    before_add: :log_before_add,
+    after_add: :log_after_add,
+    before_remove: :log_before_remove,
+    after_remove: :log_after_remove
+  has_many :birds_with_proc_callbacks, class_name: "Bird",
+    before_add: proc { |p, b| p.ship_log << "before_adding_proc_bird_#{b.id || '<new>'}" },
+    after_add: proc { |p, b| p.ship_log << "after_adding_proc_bird_#{b.id || '<new>'}" },
+    before_remove: proc { |p, b| p.ship_log << "before_removing_proc_bird_#{b.id}" },
+    after_remove: proc { |p, b| p.ship_log << "after_removing_proc_bird_#{b.id}" }
+  has_many :birds_with_reject_all_blank, class_name: "Bird"
+
+  has_one :foo_bulb, -> { where name: "foo" }, foreign_key: :car_id, class_name: "Bulb"
+
+  accepts_nested_attributes_for :parrots, :birds, allow_destroy: true, reject_if: proc(&:empty?)
+  accepts_nested_attributes_for :ship, allow_destroy: true, reject_if: proc(&:empty?)
+  accepts_nested_attributes_for :update_only_ship, update_only: true
   accepts_nested_attributes_for :parrots_with_method_callbacks, :parrots_with_proc_callbacks,
-    :birds_with_method_callbacks, :birds_with_proc_callbacks, :allow_destroy => true
-  accepts_nested_attributes_for :birds_with_reject_all_blank, :reject_if => :all_blank
+    :birds_with_method_callbacks, :birds_with_proc_callbacks, allow_destroy: true
+  accepts_nested_attributes_for :birds_with_reject_all_blank, reject_if: :all_blank
 
   validates_presence_of :catchphrase
 
@@ -50,11 +58,11 @@ class Pirate < ActiveRecord::Base
   end
 
   def reject_empty_ships_on_create(attributes)
-    attributes.delete('_reject_me_if_new').present? && !persisted?
+    attributes.delete("_reject_me_if_new").present? && !persisted?
   end
 
   attr_accessor :cancel_save_from_callback, :parrots_limit
-  before_save :cancel_save_callback_method, :if => :cancel_save_from_callback
+  before_save :cancel_save_callback_method, if: :cancel_save_from_callback
   def cancel_save_callback_method
     throw(:abort)
   end
@@ -82,11 +90,27 @@ class Pirate < ActiveRecord::Base
 end
 
 class DestructivePirate < Pirate
-  has_one :dependent_ship, :class_name => 'Ship', :foreign_key => :pirate_id, :dependent => :destroy
+  has_one :dependent_ship, class_name: "Ship", foreign_key: :pirate_id, dependent: :destroy
 end
 
 class FamousPirate < ActiveRecord::Base
-  self.table_name = 'pirates'
-  has_many :famous_ships
+  self.table_name = "pirates"
+  has_many :famous_ships, inverse_of: :famous_pirate, foreign_key: :pirate_id
   validates_presence_of :catchphrase, on: :conference
 end
+
+class SpacePirate < ActiveRecord::Base
+  self.table_name = "pirates"
+
+  belongs_to :parrot
+  belongs_to :parrot_with_annotation, -> { annotate("that tells jokes") }, class_name: :Parrot, foreign_key: :parrot_id
+  has_and_belongs_to_many :parrots, foreign_key: :pirate_id
+  has_and_belongs_to_many :parrots_with_annotation, -> { annotate("that are very colorful") }, class_name: :Parrot, foreign_key: :pirate_id
+  has_one :ship, foreign_key: :pirate_id
+  has_one :ship_with_annotation, -> { annotate("that is a rocket") }, class_name: :Ship, foreign_key: :pirate_id
+  has_many :birds, foreign_key: :pirate_id
+  has_many :birds_with_annotation, -> { annotate("that are also parrots") }, class_name: :Bird, foreign_key: :pirate_id
+  has_many :treasures, as: :looter
+  has_many :treasure_estimates, through: :treasures, source: :price_estimates
+  has_many :treasure_estimates_with_annotation, -> { annotate("yarrr") }, through: :treasures, source: :price_estimates
+end

data/test/models/possession.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Possession < ActiveRecord::Base
-  self.table_name = 'having'
+  self.table_name = "having"
 end