ibm_db 3.0.4 → 5.0.4

data/test/cases/timestamp_test.rb

@@ -73,9 +73,20 @@ class TimestampTest < ActiveRecord::TestCase
     assert_equal @previously_updated_at, @developer.updated_at
   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) 
+
+    assert_not_equal previously_updated_at, @developer.updated_at 
+    assert_equal new_time, @developer.updated_at 
+  end
+
   def test_touching_an_attribute_updates_timestamp
     previously_created_at = @developer.created_at
-    @developer.touch(:created_at)
+    travel(1.second) do
+      @developer.touch(:created_at)
+    end
 
     assert !@developer.created_at_changed? , 'created_at should not be changed'
     assert !@developer.changed?, 'record should not be changed'
@@ -87,8 +98,23 @@ class TimestampTest < ActiveRecord::TestCase
     task = Task.first
     previous_value = task.ending
     task.touch(:ending)
+
+    now = Time.now.change(usec: 0)
+
     assert_not_equal previous_value, task.ending
-    assert_in_delta Time.now, task.ending, 1
+    assert_in_delta now, task.ending, 1
+  end
+
+  def test_touching_an_attribute_updates_timestamp_with_given_time
+    previously_updated_at = @developer.updated_at 
+    previously_created_at = @developer.created_at
+    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
+    assert_not_equal previously_updated_at, @developer.updated_at
+    assert_equal new_time, @developer.created_at
+    assert_equal new_time, @developer.updated_at
   end
 
   def test_touching_many_attributes_updates_them
@@ -97,10 +123,12 @@ class TimestampTest < ActiveRecord::TestCase
     previous_ending = task.ending
     task.touch(:starting, :ending)
 
+    now = Time.now.change(usec: 0)
+
     assert_not_equal previous_starting, task.starting
     assert_not_equal previous_ending, task.ending
-    assert_in_delta Time.now, task.starting, 1
-    assert_in_delta Time.now, task.ending, 1
+    assert_in_delta now, task.starting, 1
+    assert_in_delta now, task.ending, 1
   end
 
   def test_touching_a_record_without_timestamps_is_unexceptional
@@ -178,8 +206,10 @@ class TimestampTest < ActiveRecord::TestCase
     owner = pet.owner
     previously_owner_updated_at = owner.updated_at
 
-    pet.name = "Fluffy the Third"
-    pet.save
+    travel(1.second) do
+      pet.name = "Fluffy the Third"
+      pet.save
+    end
 
     assert_not_equal previously_owner_updated_at, pet.owner.updated_at
   end
@@ -189,7 +219,9 @@ class TimestampTest < ActiveRecord::TestCase
     owner = pet.owner
     previously_owner_updated_at = owner.updated_at
 
-    pet.destroy
+    travel(1.second) do
+      pet.destroy
+    end
 
     assert_not_equal previously_owner_updated_at, pet.owner.updated_at
   end
@@ -233,8 +265,10 @@ class TimestampTest < ActiveRecord::TestCase
     owner.update_columns(happy_at: 3.days.ago)
     previously_owner_updated_at = owner.updated_at
 
-    pet.name = "I'm a parrot"
-    pet.save
+    travel(1.second) do
+      pet.name = "I'm a parrot"
+      pet.save
+    end
 
     assert_not_equal previously_owner_updated_at, pet.owner.updated_at
   end
@@ -433,21 +467,20 @@ class TimestampTest < ActiveRecord::TestCase
 
     indexes = ActiveRecord::Base.connection.indexes('foos')
     assert_equal ['created_at', 'updated_at'], indexes.flat_map(&:columns).sort
-  #ensure
-  #  ActiveRecord::Base.connection.drop_table(:foos)
+  ensure
+    ActiveRecord::Base.connection.drop_table(:foos)
   end
 end
 
-
 class TimestampsWithoutTransactionTest < ActiveRecord::TestCase
   include DdlHelper
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   class TimestampAttributePost < ActiveRecord::Base
     attr_accessor :created_at, :updated_at
   end
 
-  def test_do_not_write_timestamps_on_save_if_they_are_not_attributes    
+  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

data/test/cases/touch_later_test.rb

@@ -0,0 +1,121 @@
+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
+    invoice = Invoice.new
+    Invoice.transaction do
+      assert_not invoice.persisted?
+      assert_raises(ActiveRecord::ActiveRecordError) do
+        invoice.touch_later
+      end
+    end
+  end
+
+  def test_touch_later_dont_set_dirty_attributes
+    invoice = Invoice.create!
+    invoice.touch_later
+    assert_not invoice.changed?
+  end
+
+  def test_touch_later_respects_no_touching_policy
+    time = Time.now.utc - 25.days
+    topic = Topic.create!(updated_at: time, created_at: time)
+    Topic.no_touching do
+      topic.touch_later
+    end
+    assert_equal time.to_i, topic.updated_at.to_i
+  end
+
+  def test_touch_later_update_the_attributes
+    time = Time.now.utc - 25.days
+    topic = Topic.create!(updated_at: time, created_at: time)
+    assert_equal time.to_i, topic.updated_at.to_i
+    assert_equal time.to_i, topic.created_at.to_i
+
+    Topic.transaction do
+      topic.touch_later(:created_at)
+      assert_not_equal time.to_i, topic.updated_at.to_i
+      assert_not_equal time.to_i, topic.created_at.to_i
+
+      assert_equal time.to_i, topic.reload.updated_at.to_i
+      assert_equal time.to_i, topic.reload.created_at.to_i
+    end
+    assert_not_equal time.to_i, topic.reload.updated_at.to_i
+    assert_not_equal time.to_i, topic.reload.created_at.to_i
+  end
+
+  def test_touch_touches_immediately
+    time = Time.now.utc - 25.days
+    topic = Topic.create!(updated_at: time, created_at: time)
+    assert_equal time.to_i, topic.updated_at.to_i
+    assert_equal time.to_i, topic.created_at.to_i
+
+    Topic.transaction do
+      topic.touch_later(:created_at)
+      topic.touch
+
+      assert_not_equal time, topic.reload.updated_at
+      assert_not_equal time, topic.reload.created_at
+    end
+  end
+
+  def test_touch_later_an_association_dont_autosave_parent
+    time = Time.now.utc - 25.days
+    line_item = LineItem.create!(amount: 1)
+    invoice = Invoice.create!(line_items: [line_item])
+    invoice.touch(time: time)
+
+    Invoice.transaction do
+      line_item.update(amount: 2)
+      assert_equal time.to_i, invoice.reload.updated_at.to_i
+    end
+
+    assert_not_equal time.to_i, invoice.updated_at.to_i
+  end
+
+  def test_touch_touches_immediately_with_a_custom_time
+    time = (Time.now.utc - 25.days).change(nsec: 0)
+    topic = Topic.create!(updated_at: time, created_at: time)
+    assert_equal time, topic.updated_at
+    assert_equal time, topic.created_at
+
+    Topic.transaction do
+      topic.touch_later(:created_at)
+      time = Time.now.utc - 2.days
+      topic.touch(time: time)
+
+      assert_equal time.to_i, topic.reload.updated_at.to_i
+      assert_equal time.to_i, topic.reload.created_at.to_i
+    end
+  end
+
+  def test_touch_later_dont_hit_the_db
+    invoice = Invoice.create!
+    assert_queries(0) do
+      invoice.touch_later
+    end
+  end
+
+  def test_touching_three_deep
+    previous_tree_updated_at        = trees(:root).updated_at
+    previous_grandparent_updated_at = nodes(:grandparent).updated_at
+    previous_parent_updated_at      = nodes(:parent_a).updated_at
+    previous_child_updated_at       = nodes(:child_one_of_a).updated_at
+
+    travel 5.seconds do
+      Node.create! parent: nodes(:child_one_of_a), tree: trees(:root)
+    end
+
+    assert_not_equal nodes(:child_one_of_a).reload.updated_at, previous_child_updated_at
+    assert_not_equal nodes(:parent_a).reload.updated_at, previous_parent_updated_at
+    assert_not_equal nodes(:grandparent).reload.updated_at, previous_grandparent_updated_at
+    assert_not_equal trees(:root).reload.updated_at, previous_tree_updated_at
+  end
+end

data/test/cases/transaction_callbacks_test.rb

@@ -4,7 +4,6 @@ require 'models/pet'
 require 'models/topic'
 
 class TransactionCallbacksTest < ActiveRecord::TestCase
-  self.use_transactional_fixtures = false
   fixtures :topics, :owners, :pets
 
   class ReplyWithCallbacks < ActiveRecord::Base
@@ -35,10 +34,11 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
 
     has_many :replies, class_name: "ReplyWithCallbacks", foreign_key: "parent_id"
 
+    before_commit { |record| record.do_before_commit(nil) }
     after_commit { |record| record.do_after_commit(nil) }
-    after_commit(on: :create) { |record| record.do_after_commit(:create) }
-    after_commit(on: :update) { |record| record.do_after_commit(:update) }
-    after_commit(on: :destroy) { |record| record.do_after_commit(:destroy) }
+    after_create_commit { |record| record.do_after_commit(:create) }
+    after_update_commit { |record| record.do_after_commit(:update) }
+    after_destroy_commit { |record| record.do_after_commit(:destroy) }
     after_rollback { |record| record.do_after_rollback(nil) }
     after_rollback(on: :create) { |record| record.do_after_rollback(:create) }
     after_rollback(on: :update) { |record| record.do_after_rollback(:update) }
@@ -48,6 +48,12 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
       @history ||= []
     end
 
+    def before_commit_block(on = nil, &block)
+      @before_commit ||= {}
+      @before_commit[on] ||= []
+      @before_commit[on] << block
+    end
+
     def after_commit_block(on = nil, &block)
       @after_commit ||= {}
       @after_commit[on] ||= []
@@ -60,6 +66,11 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
       @after_rollback[on] << block
     end
 
+    def do_before_commit(on)
+      blocks = @before_commit[on] if defined?(@before_commit)
+      blocks.each{|b| b.call(self)} if blocks
+    end
+
     def do_after_commit(on)
       blocks = @after_commit[on] if defined?(@after_commit)
       blocks.each{|b| b.call(self)} if blocks
@@ -75,6 +86,20 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
     @first = TopicWithCallbacks.find(1)
   end
 
+  # FIXME: Test behavior, not implementation.
+  def test_before_commit_exception_should_pop_transaction_stack
+    @first.before_commit_block { raise 'better pop this txn from the stack!' }
+
+    original_txn = @first.class.connection.current_transaction
+
+    begin
+      @first.save!
+      fail
+    rescue
+      assert_equal original_txn, @first.class.connection.current_transaction
+    end
+  end
+
   def test_call_after_commit_after_transaction_commits
     @first.after_commit_block{|r| r.history << :after_commit}
     @first.after_rollback_block{|r| r.history << :after_rollback}
@@ -99,9 +124,9 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
 
   def test_only_call_after_commit_on_create_after_transaction_commits_for_new_record
     unless current_adapter?(:IBM_DBAdapter)
-      @new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Date.today)
+      new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Date.today)
     else
-      @new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Time.now)
+      new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Time.now)
     end
     add_transaction_execution_blocks new_record
 
@@ -193,9 +218,9 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
 
   def test_only_call_after_rollback_on_create_after_transaction_rollsback_for_new_record
     unless current_adapter?(:IBM_DBAdapter)
-      @new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Date.today)
+      new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Date.today)
     else
-      @new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Time.now)
+      new_record = TopicWithCallbacks.new(:title => "New topic", :written_on => Time.now)
     end
     add_transaction_execution_blocks new_record
 
@@ -208,21 +233,21 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
   end
 
   def test_call_after_rollback_when_commit_fails
-    @first.class.connection.singleton_class.send(:alias_method, :real_method_commit_db_transaction, :commit_db_transaction)
-    begin
-      @first.class.connection.singleton_class.class_eval do
-        def commit_db_transaction; raise "boom!"; end
-      end
+    @first.after_commit_block { |r| r.history << :after_commit }
+    @first.after_rollback_block { |r| r.history << :after_rollback }
 
-      @first.after_commit_block{|r| r.history << :after_commit}
-      @first.after_rollback_block{|r| r.history << :after_rollback}
+    assert_raises RuntimeError do
+      @first.transaction do
+        tx = @first.class.connection.transaction_manager.current_transaction
+        def tx.commit
+          raise
+        end
 
-      assert !@first.save rescue nil
-      assert_equal [:after_rollback], @first.history
-    ensure
-      @first.class.connection.singleton_class.send(:remove_method, :commit_db_transaction)
-      @first.class.connection.singleton_class.send(:alias_method, :commit_db_transaction, :real_method_commit_db_transaction)
+        @first.save
+      end
     end
+
+    assert_equal [:after_rollback], @first.history
   end
 
   def test_only_call_after_rollback_on_records_rolled_back_to_a_savepoint
@@ -274,47 +299,6 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
     assert_equal 2, @first.rollbacks
   end
 
-  def test_after_transaction_callbacks_should_prevent_callbacks_from_being_called
-    old_transaction_config = ActiveRecord::Base.raise_in_transactional_callbacks
-    ActiveRecord::Base.raise_in_transactional_callbacks = false
-
-    def @first.last_after_transaction_error=(e); @last_transaction_error = e; end
-    def @first.last_after_transaction_error; @last_transaction_error; end
-    @first.after_commit_block{|r| r.last_after_transaction_error = :commit; raise "fail!";}
-    @first.after_rollback_block{|r| r.last_after_transaction_error = :rollback; raise "fail!";}
-
-    second = TopicWithCallbacks.find(3)
-    second.after_commit_block{|r| r.history << :after_commit}
-    second.after_rollback_block{|r| r.history << :after_rollback}
-
-    Topic.transaction do
-      @first.save!
-      second.save!
-    end
-    assert_equal :commit, @first.last_after_transaction_error
-    assert_equal [:after_commit], second.history
-
-    second.history.clear
-    Topic.transaction do
-      @first.save!
-      second.save!
-      raise ActiveRecord::Rollback
-    end
-    assert_equal :rollback, @first.last_after_transaction_error
-    assert_equal [:after_rollback], second.history
-  ensure
-    ActiveRecord::Base.raise_in_transactional_callbacks = old_transaction_config
-  end
-
-  def test_after_commit_should_not_raise_when_raise_in_transactional_callbacks_false
-    old_transaction_config = ActiveRecord::Base.raise_in_transactional_callbacks
-    ActiveRecord::Base.raise_in_transactional_callbacks = false
-    @first.after_commit_block{ fail "boom" }
-    Topic.transaction { @first.save! }
-  ensure
-    ActiveRecord::Base.raise_in_transactional_callbacks = old_transaction_config
-  end
-
   def test_after_commit_callback_should_not_swallow_errors
     @first.after_commit_block{ fail "boom" }
     assert_raises(RuntimeError) do
@@ -417,7 +401,7 @@ class TransactionCallbacksTest < ActiveRecord::TestCase
 end
 
 class CallbacksOnMultipleActionsTest < ActiveRecord::TestCase
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   class TopicWithCallbacksOnMultipleActions < ActiveRecord::Base
     self.table_name = :topics
@@ -426,6 +410,9 @@ class CallbacksOnMultipleActionsTest < ActiveRecord::TestCase
     after_commit(on: [:create, :update]) { |record| record.history << :create_and_update }
     after_commit(on: [:update, :destroy]) { |record| record.history << :update_and_destroy }
 
+    before_commit(if: :save_before_commit_history) { |record| record.history << :before_commit }
+    before_commit(if: :update_title) { |record| record.update(title: "before commit title") }
+
     def clear_history
       @history = []
     end
@@ -433,6 +420,8 @@ class CallbacksOnMultipleActionsTest < ActiveRecord::TestCase
     def history
       @history ||= []
     end
+
+    attr_accessor :save_before_commit_history, :update_title
   end
 
   def test_after_commit_on_multiple_actions
@@ -449,4 +438,81 @@ class CallbacksOnMultipleActionsTest < ActiveRecord::TestCase
     topic.destroy
     assert_equal [:update_and_destroy, :create_and_destroy], topic.history
   end
+
+  def test_before_commit_actions
+    topic = TopicWithCallbacksOnMultipleActions.new
+    topic.save_before_commit_history = true
+    topic.save
+
+    assert_equal [:before_commit, :create_and_update, :create_and_destroy], topic.history
+  end
+
+  def test_before_commit_update_in_same_transaction
+    topic = TopicWithCallbacksOnMultipleActions.new
+    topic.update_title = true
+    topic.save
+
+    assert_equal "before commit title", topic.title
+    assert_equal "before commit title", topic.reload.title
+  end
+end
+
+
+class TransactionEnrollmentCallbacksTest < ActiveRecord::TestCase
+
+  class TopicWithoutTransactionalEnrollmentCallbacks < ActiveRecord::Base
+    self.table_name = :topics
+
+    before_commit_without_transaction_enrollment { |r| r.history << :before_commit }
+    after_commit_without_transaction_enrollment { |r| r.history << :after_commit }
+    after_rollback_without_transaction_enrollment { |r| r.history << :rollback }
+
+    def history
+      @history ||= []
+    end
+  end
+
+  def setup
+    @topic = TopicWithoutTransactionalEnrollmentCallbacks.create!
+  end
+
+  def test_commit_does_not_run_transactions_callbacks_without_enrollment
+    @topic.transaction do
+      @topic.content = 'foo'
+      @topic.save!
+    end
+    assert @topic.history.empty?
+  end
+
+  def test_commit_run_transactions_callbacks_with_explicit_enrollment
+    @topic.transaction do
+      2.times do
+        @topic.content = 'foo'
+        @topic.save!
+      end
+      @topic.class.connection.add_transaction_record(@topic)
+    end
+    assert_equal [:before_commit, :after_commit], @topic.history
+  end
+
+  def test_rollback_does_not_run_transactions_callbacks_without_enrollment
+    @topic.transaction do
+      @topic.content = 'foo'
+      @topic.save!
+      raise ActiveRecord::Rollback
+    end
+    assert @topic.history.empty?
+  end
+
+  def test_rollback_run_transactions_callbacks_with_explicit_enrollment
+    @topic.transaction do
+      2.times do
+        @topic.content = 'foo'
+        @topic.save!
+      end
+      @topic.class.connection.add_transaction_record(@topic)
+      raise ActiveRecord::Rollback
+    end
+    assert_equal [:rollback], @topic.history
+  end
 end