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

data/test/cases/timestamp_test.rb

@@ -1,12 +1,14 @@
-require 'cases/helper'
-require 'support/ddl_helper'
-require 'models/developer'
-require 'models/computer'
-require 'models/owner'
-require 'models/pet'
-require 'models/toy'
-require 'models/car'
-require 'models/task'
+# frozen_string_literal: true
+
+require "cases/helper"
+require "support/ddl_helper"
+require "models/developer"
+require "models/computer"
+require "models/owner"
+require "models/pet"
+require "models/toy"
+require "models/car"
+require "models/task"
 
 class TimestampTest < ActiveRecord::TestCase
   fixtures :developers, :owners, :pets, :toys, :cars, :tasks
@@ -38,17 +40,25 @@ class TimestampTest < ActiveRecord::TestCase
 
     assert_not_equal @previously_updated_at, @developer.updated_at
     assert_equal previous_salary + 10000, @developer.salary
-    assert @developer.salary_changed?, 'developer salary should have changed'
-    assert @developer.changed?, 'developer should be marked as changed'
+    assert_predicate @developer, :salary_changed?, "developer salary should have changed"
+    assert_predicate @developer, :changed?, "developer should be marked as changed"
+    assert_equal ["salary"], @developer.changed
+    assert_predicate @developer, :saved_changes?
+    assert_equal ["legacy_updated_at", "legacy_updated_on"], @developer.saved_changes.keys.sort
+
     @developer.reload
     assert_equal previous_salary, @developer.salary
   end
 
   def test_touching_a_record_with_default_scope_that_excludes_it_updates_its_timestamp
     developer = @developer.becomes(DeveloperCalledJamis)
-
     developer.touch
+
     assert_not_equal @previously_updated_at, developer.updated_at
+    assert_not_predicate developer, :changed?
+    assert_predicate developer, :saved_changes?
+    assert_equal ["legacy_updated_at", "legacy_updated_on"], developer.saved_changes.keys.sort
+
     developer.reload
     assert_not_equal @previously_updated_at, developer.updated_at
   end
@@ -74,12 +84,12 @@ class TimestampTest < ActiveRecord::TestCase
   end
 
   def test_touching_updates_timestamp_with_given_time
-    previously_updated_at = @developer.updated_at 
-    new_time = Time.utc(2015, 2, 16, 0, 0, 0) 
-    @developer.touch(time: new_time) 
+    previously_updated_at = @developer.updated_at
+    new_time = Time.utc(2015, 2, 16, 0, 0, 0)
+    @developer.touch(time: new_time)
 
-    assert_not_equal previously_updated_at, @developer.updated_at 
-    assert_equal new_time, @developer.updated_at 
+    assert_not_equal previously_updated_at, @developer.updated_at
+    assert_equal new_time, @developer.updated_at
   end
 
   def test_touching_an_attribute_updates_timestamp
@@ -88,12 +98,22 @@ class TimestampTest < ActiveRecord::TestCase
       @developer.touch(:created_at)
     end
 
-    assert !@developer.created_at_changed? , 'created_at should not be changed'
-    assert !@developer.changed?, 'record should not be changed'
+    assert_not @developer.created_at_changed?, "created_at should not be changed"
+    assert_not @developer.changed?, "record should not be changed"
     assert_not_equal previously_created_at, @developer.created_at
     assert_not_equal @previously_updated_at, @developer.updated_at
   end
 
+  def test_touching_update_at_attribute_as_symbol_updates_timestamp
+    travel(1.second) do
+      @developer.touch(:updated_at)
+    end
+
+    assert_not @developer.updated_at_changed?
+    assert_not @developer.changed?
+    assert_not_equal @previously_updated_at, @developer.updated_at
+  end
+
   def test_touching_an_attribute_updates_it
     task = Task.first
     previous_value = task.ending
@@ -106,9 +126,9 @@ class TimestampTest < ActiveRecord::TestCase
   end
 
   def test_touching_an_attribute_updates_timestamp_with_given_time
-    previously_updated_at = @developer.updated_at 
+    previously_updated_at = @developer.updated_at
     previously_created_at = @developer.created_at
-    new_time = Time.utc(2015, 2, 16, 4, 54, 0) 
+    new_time = Time.utc(2015, 2, 16, 4, 54, 0)
     @developer.touch(:created_at, time: new_time)
 
     assert_not_equal previously_created_at, @developer.created_at
@@ -137,13 +157,13 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_touching_a_no_touching_object
     Developer.no_touching do
-      assert @developer.no_touching?
-      assert !@owner.no_touching?
+      assert_predicate @developer, :no_touching?
+      assert_not_predicate @owner, :no_touching?
       @developer.touch
     end
 
-    assert !@developer.no_touching?
-    assert !@owner.no_touching?
+    assert_not_predicate @developer, :no_touching?
+    assert_not_predicate @owner, :no_touching?
     assert_equal @previously_updated_at, @developer.updated_at
   end
 
@@ -160,26 +180,26 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_global_no_touching
     ActiveRecord::Base.no_touching do
-      assert @developer.no_touching?
-      assert @owner.no_touching?
+      assert_predicate @developer, :no_touching?
+      assert_predicate @owner, :no_touching?
       @developer.touch
     end
 
-    assert !@developer.no_touching?
-    assert !@owner.no_touching?
+    assert_not_predicate @developer, :no_touching?
+    assert_not_predicate @owner, :no_touching?
     assert_equal @previously_updated_at, @developer.updated_at
   end
 
   def test_no_touching_threadsafe
     Thread.new do
       Developer.no_touching do
-        assert @developer.no_touching?
+        assert_predicate @developer, :no_touching?
 
         sleep(1)
       end
     end
 
-    assert !@developer.no_touching?
+    assert_not_predicate @developer, :no_touching?
   end
 
   def test_no_touching_with_callbacks
@@ -228,20 +248,20 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_saving_a_new_record_belonging_to_invalid_parent_with_touch_should_not_raise_exception
     klass = Class.new(Owner) do
-      def self.name; 'Owner'; end
+      def self.name; "Owner"; end
       validate { errors.add(:base, :invalid) }
     end
 
     pet = Pet.new(owner: klass.new)
     pet.save!
 
-    assert pet.owner.new_record?
+    assert_predicate pet.owner, :new_record?
   end
 
   def test_saving_a_record_with_a_belongs_to_that_specifies_touching_a_specific_attribute_the_parent_should_update_that_attribute
     klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Pet'; end
-      belongs_to :owner, :touch => :happy_at
+      def self.name; "Pet"; end
+      belongs_to :owner, touch: :happy_at
     end
 
     pet   = klass.first
@@ -256,8 +276,8 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_touching_a_record_with_a_belongs_to_that_uses_a_counter_cache_should_update_the_parent
     klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Pet'; end
-      belongs_to :owner, :counter_cache => :use_count, :touch => true
+      def self.name; "Pet"; end
+      belongs_to :owner, counter_cache: :use_count, touch: true
     end
 
     pet = klass.first
@@ -275,8 +295,8 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_touching_a_record_touches_parent_record_and_grandparent_record
     klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Toy'; end
-      belongs_to :pet, :touch => true
+      def self.name; "Toy"; end
+      belongs_to :pet, touch: true
     end
 
     toy = klass.first
@@ -293,12 +313,12 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_touching_a_record_touches_polymorphic_record
     klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Toy'; end
+      def self.name; "Toy"; end
     end
 
     wheel_klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Wheel'; end
-      belongs_to :wheelable, :polymorphic => true, :touch => true
+      def self.name; "Wheel"; end
+      belongs_to :wheelable, polymorphic: true, touch: true
     end
 
     toy = klass.first
@@ -315,7 +335,7 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_changing_parent_of_a_record_touches_both_new_and_old_parent_record
     klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Toy'; end
+      def self.name; "Toy"; end
       belongs_to :pet, touch: true
     end
 
@@ -341,12 +361,12 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_changing_parent_of_a_record_touches_both_new_and_old_polymorphic_parent_record_changes_within_same_class
     car_class = Class.new(ActiveRecord::Base) do
-      def self.name; 'Car'; end
+      def self.name; "Car"; end
     end
 
     wheel_class = Class.new(ActiveRecord::Base) do
-      def self.name; 'Wheel'; end
-      belongs_to :wheelable, :polymorphic => true, :touch => true
+      def self.name; "Wheel"; end
+      belongs_to :wheelable, polymorphic: true, touch: true
     end
 
     car1 = car_class.find(1)
@@ -368,16 +388,16 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_changing_parent_of_a_record_touches_both_new_and_old_polymorphic_parent_record_changes_with_other_class
     car_class = Class.new(ActiveRecord::Base) do
-      def self.name; 'Car'; end
+      def self.name; "Car"; end
     end
 
     toy_class = Class.new(ActiveRecord::Base) do
-      def self.name; 'Toy'; end
+      def self.name; "Toy"; end
     end
 
     wheel_class = Class.new(ActiveRecord::Base) do
-      def self.name; 'Wheel'; end
-      belongs_to :wheelable, :polymorphic => true, :touch => true
+      def self.name; "Wheel"; end
+      belongs_to :wheelable, polymorphic: true, touch: true
     end
 
     car = car_class.find(1)
@@ -399,7 +419,7 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_clearing_association_touches_the_old_record
     klass = Class.new(ActiveRecord::Base) do
-      def self.name; 'Toy'; end
+      def self.name; "Toy"; end
       belongs_to :pet, touch: true
     end
 
@@ -419,56 +439,30 @@ class TimestampTest < ActiveRecord::TestCase
 
   def test_timestamp_column_values_are_present_in_the_callbacks
     klass = Class.new(ActiveRecord::Base) do
-      self.table_name = 'people'
+      self.table_name = "people"
 
       before_create do
-        self.born_at = self.created_at
+        self.born_at = created_at
       end
     end
 
-    person = klass.create first_name: 'David'
+    person = klass.create first_name: "David"
     assert_not_equal person.born_at, nil
   end
 
-  def test_timestamp_attributes_for_create
-    toy = Toy.first
-    assert_equal [:created_at, :created_on], toy.send(:timestamp_attributes_for_create)
-  end
-
-  def test_timestamp_attributes_for_update
-    toy = Toy.first
-    assert_equal [:updated_at, :updated_on], toy.send(:timestamp_attributes_for_update)
-  end
-
-  def test_all_timestamp_attributes
-    toy = Toy.first
-    assert_equal [:created_at, :created_on, :updated_at, :updated_on], toy.send(:all_timestamp_attributes)
-  end
-
   def test_timestamp_attributes_for_create_in_model
     toy = Toy.first
-    assert_equal [:created_at], toy.send(:timestamp_attributes_for_create_in_model)
+    assert_equal ["created_at"], toy.send(:timestamp_attributes_for_create_in_model)
   end
 
   def test_timestamp_attributes_for_update_in_model
     toy = Toy.first
-    assert_equal [:updated_at], toy.send(:timestamp_attributes_for_update_in_model)
+    assert_equal ["updated_at"], toy.send(:timestamp_attributes_for_update_in_model)
   end
 
   def test_all_timestamp_attributes_in_model
     toy = Toy.first
-    assert_equal [:created_at, :updated_at], toy.send(:all_timestamp_attributes_in_model)
-  end
-
-  def test_index_is_created_for_both_timestamps
-    ActiveRecord::Base.connection.create_table(:foos, force: true) do |t|
-      t.timestamps(:foos, null: true, index: true)
-    end
-
-    indexes = ActiveRecord::Base.connection.indexes('foos')
-    assert_equal ['created_at', 'updated_at'], indexes.flat_map(&:columns).sort
-  ensure
-    ActiveRecord::Base.connection.drop_table(:foos)
+    assert_equal ["created_at", "updated_at"], toy.send(:all_timestamp_attributes_in_model)
   end
 end
 
@@ -481,21 +475,30 @@ class TimestampsWithoutTransactionTest < ActiveRecord::TestCase
   end
 
   def test_do_not_write_timestamps_on_save_if_they_are_not_attributes
-	  if current_adapter?(:IBM_DBAdapter)
-		  ActiveRecord::Base.connection.create_table :timestamp_attribute_posts, force: true, id: false do |t|
-			  t.primary_key :id
-		  end		
-		  post = TimestampAttributePost.new(id: 1)
-		  post.save! # should not try to assign and persist created_at, updated_at
-		  assert_nil post.created_at
-		  assert_nil post.updated_at
-	  else	  
-		  with_example_table ActiveRecord::Base.connection, "timestamp_attribute_posts", "id integer primary key" do
-			  post = TimestampAttributePost.new(id: 1)
-			  post.save! # should not try to assign and persist created_at, updated_at
-			  assert_nil post.created_at
-			  assert_nil post.updated_at
-		  end
-	  end		
+    with_example_table ActiveRecord::Base.connection, "timestamp_attribute_posts", "id integer primary key" do
+      post = TimestampAttributePost.new(id: 1)
+      post.save! # should not try to assign and persist created_at, updated_at
+      assert_nil post.created_at
+      assert_nil post.updated_at
+    end
   end
+
+  def test_index_is_created_for_both_timestamps
+    ActiveRecord::Base.connection.create_table(:foos, force: true) do |t|
+      t.timestamps null: true, index: true
+    end
+
+    indexes = ActiveRecord::Base.connection.indexes("foos")
+    assert_equal ["created_at", "updated_at"], indexes.flat_map(&:columns).sort
+  ensure
+    ActiveRecord::Base.connection.drop_table(:foos)
+  end
+
+  private
+    def with_example_table(connection, table_name, definition = nil)
+      definitions ||= <<~SQL
+        id INTEGER GENERATED BY DEFAULT AS IDENTITY (START WITH 1000) PRIMARY KEY NOT NULL
+      SQL
+      super(connection, table_name, definitions)
+    end
 end

data/test/cases/touch_later_test.rb

@@ -1,17 +1,19 @@
-require 'cases/helper'
-require 'models/invoice'
-require 'models/line_item'
-require 'models/topic'
-require 'models/node'
-require 'models/tree'
+# frozen_string_literal: true
+
+require "cases/helper"
+require "models/invoice"
+require "models/line_item"
+require "models/topic"
+require "models/node"
+require "models/tree"
 
 class TouchLaterTest < ActiveRecord::TestCase
   fixtures :nodes, :trees
 
-  def test_touch_laster_raise_if_non_persisted
+  def test_touch_later_raise_if_non_persisted
     invoice = Invoice.new
     Invoice.transaction do
-      assert_not invoice.persisted?
+      assert_not_predicate invoice, :persisted?
       assert_raises(ActiveRecord::ActiveRecordError) do
         invoice.touch_later
       end
@@ -21,7 +23,7 @@ class TouchLaterTest < ActiveRecord::TestCase
   def test_touch_later_dont_set_dirty_attributes
     invoice = Invoice.create!
     invoice.touch_later
-    assert_not invoice.changed?
+    assert_not_predicate invoice, :changed?
   end
 
   def test_touch_later_respects_no_touching_policy
@@ -98,7 +100,7 @@ class TouchLaterTest < ActiveRecord::TestCase
 
   def test_touch_later_dont_hit_the_db
     invoice = Invoice.create!
-    assert_queries(0) do
+    assert_no_queries do
       invoice.touch_later
     end
   end