ibm_db 3.0.5-x86-mingw32 → 5.0.5-x86-mingw32

data/test/cases/dirty_test.rb

@@ -37,8 +37,8 @@ class DirtyTest < ActiveRecord::TestCase
   def test_attribute_changes
     # New record - no changes.
     pirate = Pirate.new
-    assert !pirate.catchphrase_changed?
-    assert_nil pirate.catchphrase_change
+    assert_equal false, pirate.catchphrase_changed?
+    assert_equal false, pirate.non_validated_parrot_id_changed?
 
     # Change catchphrase.
     pirate.catchphrase = 'arrr'
@@ -89,7 +89,7 @@ class DirtyTest < ActiveRecord::TestCase
       target = Class.new(ActiveRecord::Base)
       target.table_name = 'pirates'
 
-      pirate = target.create
+      pirate = target.create!
       pirate.created_on = pirate.created_on
       assert !pirate.created_on_changed?
     end
@@ -165,18 +165,6 @@ class DirtyTest < ActiveRecord::TestCase
     assert_equal parrot.name_change, parrot.title_change
   end
 
-  def test_reset_attribute!
-    pirate = Pirate.create!(:catchphrase => 'Yar!')
-    pirate.catchphrase = 'Ahoy!'
-
-    assert_deprecated do
-      pirate.reset_catchphrase!
-    end
-    assert_equal "Yar!", pirate.catchphrase
-    assert_equal Hash.new, pirate.changes
-    assert !pirate.catchphrase_changed?
-  end
-
   def test_restore_attribute!
     pirate = Pirate.create!(:catchphrase => 'Yar!')
     pirate.catchphrase = 'Ahoy!'
@@ -479,8 +467,10 @@ class DirtyTest < ActiveRecord::TestCase
       topic.save!
 
       updated_at = topic.updated_at
-      topic.content[:hello] = 'world'
-      topic.save!
+      travel(1.second) do
+        topic.content[:hello] = 'world'
+        topic.save!
+      end
 
       assert_not_equal updated_at, topic.updated_at
       assert_equal 'world', topic.content[:hello]
@@ -533,6 +523,9 @@ class DirtyTest < ActiveRecord::TestCase
     assert_equal Hash.new, pirate.previous_changes
 
     pirate = Pirate.find_by_catchphrase("arrr")
+
+    travel(1.second)
+
     pirate.catchphrase = "Me Maties!"
     pirate.save!
 
@@ -544,6 +537,9 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.previous_changes.key?('created_on')
 
     pirate = Pirate.find_by_catchphrase("Me Maties!")
+
+    travel(1.second)
+
     pirate.catchphrase = "Thar She Blows!"
     pirate.save
 
@@ -554,6 +550,8 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.previous_changes.key?('parrot_id')
     assert !pirate.previous_changes.key?('created_on')
 
+    travel(1.second)
+
     pirate = Pirate.find_by_catchphrase("Thar She Blows!")
     pirate.update(catchphrase: "Ahoy!")
 
@@ -564,6 +562,8 @@ class DirtyTest < ActiveRecord::TestCase
     assert !pirate.previous_changes.key?('parrot_id')
     assert !pirate.previous_changes.key?('created_on')
 
+    travel(1.second)
+
     pirate = Pirate.find_by_catchphrase("Ahoy!")
     pirate.update_attribute(:catchphrase, "Ninjas suck!")
 
@@ -573,6 +573,8 @@ class DirtyTest < ActiveRecord::TestCase
     assert_not_nil pirate.previous_changes['updated_on'][1]
     assert !pirate.previous_changes.key?('parrot_id')
     assert !pirate.previous_changes.key?('created_on')
+  ensure
+    travel_back
   end
 
   if ActiveRecord::Base.connection.supports_migrations?
@@ -590,6 +592,7 @@ class DirtyTest < ActiveRecord::TestCase
   end
 
   def test_datetime_attribute_can_be_updated_with_fractional_seconds
+    skip "Fractional seconds are not supported" unless subsecond_precision_supported?
     in_time_zone 'Paris' do
       target = Class.new(ActiveRecord::Base)
       target.table_name = 'topics'
@@ -635,32 +638,6 @@ class DirtyTest < ActiveRecord::TestCase
     end
   end
 
-  test "defaults with type that implements `type_cast_for_database`" do
-    type = Class.new(ActiveRecord::Type::Value) do
-      def type_cast(value)
-        value.to_i
-      end
-
-      def type_cast_for_database(value)
-        value.to_s
-      end
-    end
-
-    model_class = Class.new(ActiveRecord::Base) do
-      self.table_name = 'numeric_data'
-      attribute :foo, type.new, default: 1
-    end
-
-    model = model_class.new
-    assert_not model.foo_changed?
-
-    model = model_class.new(foo: 1)
-    assert_not model.foo_changed?
-
-    model = model_class.new(foo: '1')
-    assert_not model.foo_changed?
-  end
-
   test "in place mutation detection" do
     pirate = Pirate.create!(catchphrase: "arrrr")
     pirate.catchphrase << " matey!"
@@ -723,7 +700,7 @@ class DirtyTest < ActiveRecord::TestCase
   test "attribute_will_change! doesn't try to save non-persistable attributes" do
     klass = Class.new(ActiveRecord::Base) do
       self.table_name = 'people'
-      attribute :non_persisted_attribute, ActiveRecord::Type::String.new
+      attribute :non_persisted_attribute, :string
     end
 
     record = klass.new(first_name: "Sean")
@@ -757,14 +734,15 @@ class DirtyTest < ActiveRecord::TestCase
     assert_equal "arr", pirate.catchphrase
   end
 
-  test "cloning and modifying an object in-place only registers changes on the new object" do
-    pirate = Pirate.create!(catchphrase: "arrrr")
-    assert_equal({}, pirate.changed_attributes)
-    pirate_clone = pirate.dup
-    assert_equal({"catchphrase" => nil}, pirate_clone.changed_attributes)
-    pirate_clone.catchphrase = "arrrr matey!"
-    assert_equal({}, pirate.changed_attributes)
-    assert_equal({"catchphrase" => nil}, pirate_clone.changed_attributes)
+  test "attributes assigned but not selected are dirty" do
+    person = Person.select(:id).first
+    refute person.changed?
+
+    person.first_name = "Sean"
+    assert person.changed?
+
+    person.first_name = nil
+    assert person.changed?
   end
 
   private

data/test/cases/disconnected_test.rb

@@ -4,7 +4,7 @@ class TestRecord < ActiveRecord::Base
 end
 
 class TestDisconnectedAdapter < ActiveRecord::TestCase
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   def setup
     @connection = ActiveRecord::Base.connection
@@ -21,7 +21,9 @@ class TestDisconnectedAdapter < ActiveRecord::TestCase
       @connection.execute "SELECT count(*) from products"
       @connection.disconnect!
       assert_raises(ActiveRecord::StatementInvalid) do
-        @connection.execute "SELECT count(*) from products"
+        silence_warnings do
+          @connection.execute "SELECT count(*) from products"
+        end
       end
     end
   end

data/test/cases/enum_test.rb

@@ -9,26 +9,83 @@ class EnumTest < ActiveRecord::TestCase
   end
 
   test "query state by predicate" do
-    assert @book.proposed?
+    assert @book.published?
     assert_not @book.written?
-    assert_not @book.published?
+    assert_not @book.proposed?
 
-    assert @book.unread?
+    assert @book.read?
+    assert @book.in_english?
+    assert @book.author_visibility_visible?
+    assert @book.illustrator_visibility_visible?
+    assert @book.with_medium_font_size?
   end
 
   test "query state with strings" do
-    assert_equal "proposed", @book.status
-    assert_equal "unread", @book.read_status
+    assert_equal "published", @book.status
+    assert_equal "read", @book.read_status
+    assert_equal "english", @book.language
+    assert_equal "visible", @book.author_visibility
+    assert_equal "visible", @book.illustrator_visibility
   end
 
   test "find via scope" do
-    assert_equal @book, Book.proposed.first
-    assert_equal @book, Book.unread.first
+    assert_equal @book, Book.published.first
+    assert_equal @book, Book.read.first
+    assert_equal @book, Book.in_english.first
+    assert_equal @book, Book.author_visibility_visible.first
+    assert_equal @book, Book.illustrator_visibility_visible.first
+  end
+
+  test "find via where with values" do
+    published, written = Book.statuses[:published], Book.statuses[:written]
+
+    assert_equal @book, Book.where(status: published).first
+    assert_not_equal @book, Book.where(status: written).first
+    assert_equal @book, Book.where(status: [published]).first
+    assert_not_equal @book, Book.where(status: [written]).first
+    assert_not_equal @book, Book.where("status <> ?", published).first
+    assert_equal @book, Book.where("status <> ?", written).first
+  end
+
+  test "find via where with symbols" do
+    assert_equal @book, Book.where(status: :published).first
+    assert_not_equal @book, Book.where(status: :written).first
+    assert_equal @book, Book.where(status: [:published]).first
+    assert_not_equal @book, Book.where(status: [:written]).first
+    assert_not_equal @book, Book.where.not(status: :published).first
+    assert_equal @book, Book.where.not(status: :written).first
+  end
+
+  test "find via where with strings" do
+    assert_equal @book, Book.where(status: "published").first
+    assert_not_equal @book, Book.where(status: "written").first
+    assert_equal @book, Book.where(status: ["published"]).first
+    assert_not_equal @book, Book.where(status: ["written"]).first
+    assert_not_equal @book, Book.where.not(status: "published").first
+    assert_equal @book, Book.where.not(status: "written").first
+  end
+
+  test "build from scope" do
+    assert Book.written.build.written?
+    assert_not Book.written.build.proposed?
+  end
+
+  test "build from where" do
+    assert Book.where(status: Book.statuses[:written]).build.written?
+    assert_not Book.where(status: Book.statuses[:written]).build.proposed?
+    assert Book.where(status: :written).build.written?
+    assert_not Book.where(status: :written).build.proposed?
+    assert Book.where(status: "written").build.written?
+    assert_not Book.where(status: "written").build.proposed?
   end
 
   test "update by declaration" do
     @book.written!
     assert @book.written?
+    @book.in_english!
+    assert @book.in_english?
+    @book.author_visibility_visible!
+    assert @book.author_visibility_visible?
   end
 
   test "update by setter" do
@@ -53,42 +110,61 @@ class EnumTest < ActiveRecord::TestCase
 
   test "enum changed attributes" do
     old_status = @book.status
-    @book.status = :published
+    old_language = @book.language
+    @book.status = :proposed
+    @book.language = :spanish
     assert_equal old_status, @book.changed_attributes[:status]
+    assert_equal old_language, @book.changed_attributes[:language]
   end
 
   test "enum changes" do
     old_status = @book.status
-    @book.status = :published
-    assert_equal [old_status, 'published'], @book.changes[:status]
+    old_language = @book.language
+    @book.status = :proposed
+    @book.language = :spanish
+    assert_equal [old_status, 'proposed'], @book.changes[:status]
+    assert_equal [old_language, 'spanish'], @book.changes[:language]
   end
 
   test "enum attribute was" do
     old_status = @book.status
+    old_language = @book.language
     @book.status = :published
+    @book.language = :spanish
     assert_equal old_status, @book.attribute_was(:status)
+    assert_equal old_language, @book.attribute_was(:language)
   end
 
   test "enum attribute changed" do
-    @book.status = :published
+    @book.status = :proposed
+    @book.language = :french
     assert @book.attribute_changed?(:status)
+    assert @book.attribute_changed?(:language)
   end
 
   test "enum attribute changed to" do
-    @book.status = :published
-    assert @book.attribute_changed?(:status, to: 'published')
+    @book.status = :proposed
+    @book.language = :french
+    assert @book.attribute_changed?(:status, to: 'proposed')
+    assert @book.attribute_changed?(:language, to: 'french')
   end
 
   test "enum attribute changed from" do
     old_status = @book.status
-    @book.status = :published
+    old_language = @book.language
+    @book.status = :proposed
+    @book.language = :french
     assert @book.attribute_changed?(:status, from: old_status)
+    assert @book.attribute_changed?(:language, from: old_language)
   end
 
   test "enum attribute changed from old status to new status" do
     old_status = @book.status
-    @book.status = :published
-    assert @book.attribute_changed?(:status, from: old_status, to: 'published')
+    old_language = @book.language
+    @book.status = :proposed
+    @book.language = :french
+    assert @book.attribute_changed?(:status, from: old_status, to: 'proposed')
+    assert @book.attribute_changed?(:language, from: old_language, to: 'french')
   end
 
   test "enum didn't change" do
@@ -98,7 +174,7 @@ class EnumTest < ActiveRecord::TestCase
   end
 
   test "persist changes that are dirty" do
-    @book.status = :published
+    @book.status = :proposed
     assert @book.attribute_changed?(:status)
     @book.status = :written
     assert @book.attribute_changed?(:status)
@@ -106,7 +182,7 @@ class EnumTest < ActiveRecord::TestCase
 
   test "reverted changes that are not dirty" do
     old_status = @book.status
-    @book.status = :published
+    @book.status = :proposed
     assert @book.attribute_changed?(:status)
     @book.status = old_status
     assert_not @book.attribute_changed?(:status)
@@ -129,19 +205,24 @@ class EnumTest < ActiveRecord::TestCase
     assert_equal "'unknown' is not a valid status", e.message
   end
 
+  test "NULL values from database should be casted to nil" do
+    Book.where(id: @book.id).update_all("status = NULL")
+    assert_nil @book.reload.status
+  end
+
   test "assign nil value" do
     @book.status = nil
-    assert @book.status.nil?
+    assert_nil @book.status
   end
 
   test "assign empty string value" do
     @book.status = ''
-    assert @book.status.nil?
+    assert_nil @book.status
   end
 
   test "assign long empty string value" do
     @book.status = '   '
-    assert @book.status.nil?
+    assert_nil @book.status
   end
 
   test "constant to access the mapping" do
@@ -153,15 +234,23 @@ class EnumTest < ActiveRecord::TestCase
   test "building new objects with enum scopes" do
     assert Book.written.build.written?
     assert Book.read.build.read?
+    assert Book.in_spanish.build.in_spanish?
+    assert Book.illustrator_visibility_invisible.build.illustrator_visibility_invisible?
   end
 
   test "creating new objects with enum scopes" do
     assert Book.written.create.written?
     assert Book.read.create.read?
+    assert Book.in_spanish.create.in_spanish?
+    assert Book.illustrator_visibility_invisible.create.illustrator_visibility_invisible?
   end
 
   test "_before_type_cast returns the enum label (required for form fields)" do
-    assert_equal "proposed", @book.status_before_type_cast
+    if @book.status_came_from_user?
+      assert_equal "published", @book.status_before_type_cast
+    else
+      assert_equal "published", @book.status
+    end
   end
 
   test "reserved enum names" do
@@ -177,9 +266,10 @@ class EnumTest < ActiveRecord::TestCase
     ]
 
     conflicts.each_with_index do |name, i|
-      assert_raises(ArgumentError, "enum name `#{name}` should not be allowed") do
+      e = assert_raises(ArgumentError) do
         klass.class_eval { enum name => ["value_#{i}"] }
       end
+      assert_match(/You tried to define an enum named \"#{name}\" on the model/, e.message)
     end
   end
 
@@ -199,9 +289,10 @@ class EnumTest < ActiveRecord::TestCase
     ]
 
     conflicts.each_with_index do |value, i|
-      assert_raises(ArgumentError, "enum value `#{value}` should not be allowed") do
+      e = assert_raises(ArgumentError, "enum value `#{value}` should not be allowed") do
         klass.class_eval { enum "status_#{i}" => [value] }
       end
+      assert_match(/You tried to define an enum named .* on the model/, e.message)
     end
   end
 
@@ -287,4 +378,67 @@ class EnumTest < ActiveRecord::TestCase
     book2.status = :uploaded
     assert_equal ['drafted', 'uploaded'], book2.status_change
   end
+
+  test "declare multiple enums at a time" do
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = "books"
+      enum status: [:proposed, :written, :published],
+           nullable_status: [:single, :married]
+    end
+
+    book1 = klass.proposed.create!
+    assert book1.proposed?
+
+    book2 = klass.single.create!
+    assert book2.single?
+  end
+
+  test "enum with alias_attribute" do
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = "books"
+      alias_attribute :aliased_status, :status
+      enum aliased_status: [:proposed, :written, :published]
+    end
+
+    book = klass.proposed.create!
+    assert book.proposed?
+    assert_equal 'proposed', book.aliased_status
+
+    book = klass.find(book.id)
+    assert book.proposed?
+    assert_equal 'proposed', book.aliased_status
+  end
+
+  test "query state by predicate with prefix" do
+    assert @book.author_visibility_visible?
+    assert_not @book.author_visibility_invisible?
+    assert @book.illustrator_visibility_visible?
+    assert_not @book.illustrator_visibility_invisible?
+  end
+
+  test "query state by predicate with custom prefix" do
+    assert @book.in_english?
+    assert_not @book.in_spanish?
+    assert_not @book.in_french?
+  end
+
+  test "uses default status when no status is provided in fixtures" do
+    book = books(:tlg)
+    assert book.proposed?, "expected fixture to default to proposed status"
+    assert book.in_english?, "expected fixture to default to english language"
+  end
+
+  test "uses default value from database on initialization" do
+    book = Book.new
+    assert book.proposed?
+  end
+
+  test "uses default value from database on initialization when using custom mapping" do
+    book = Book.new
+    assert book.hard?
+  end
+
+  test "data type of Enum type" do
+    assert_equal :integer, Book.type_for_attribute('status').type
+  end
 end