Changeset 3043

Timestamp:

11/15/05 10:48:32 (3 years ago)

Author:

bitsweat

Message:

Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array. Closes #1345.

Files:

• trunk/activerecord/CHANGELOG (modified) (1 diff)
• trunk/activerecord/lib/active_record/associations/association_proxy.rb (modified) (1 diff)
• trunk/activerecord/test/associations_test.rb (modified) (4 diffs)

trunk/activerecord/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Associations handle case-equality more consistently: item.parts.is_a?(Array) and item.parts === Array.  #1345 [MarkusQ@reality.com]
-
-* SQLServer: insert uses given primary key value if not nil rather than SELECT @@IDENTITY.  #2866 [kajism@yahoo.com, Tom Ward <tom@popdog.net>]

trunk/activerecord/lib/active_record/associations/association_proxy.rb

@@ -18 +18 @@
-      end
-      
+      def respond_to?(symbol, include_priv = false)
+        proxy_respond_to?(symbol, include_priv) || (load_target && @target.respond_to?(symbol, include_priv))
+      end
+
+      # Explicitly proxy === because the instance method removal above
+      # doesn't catch it.
+      def ===(other)
+        load_target
+        other === @target
+      end
+
-      def reload
-        reset
-        load_target
-      end
-
-      def respond_to?(symbol, include_priv = false)
-        proxy_respond_to?(symbol, include_priv) || (load_target && @target.respond_to?(symbol, include_priv))
-      end
-

trunk/activerecord/test/associations_test.rb

@@ -80 +80 @@
-  def test_triple_equality
-    assert Account === companies(:first_firm).account
+    assert companies(:first_firm).account === Account
-  end
-
@@ -279 +280 @@
-  def test_finding
-    assert_equal 2, Firm.find(:first).clients.length
+  end
+
+  def test_triple_equality
+    assert !(Array === Firm.find(:first).clients)
+    assert Firm.find(:first).clients === Array
-  end
-
@@ -748 +754 @@
-  end
-
+  def test_triple_equality
+    assert Client.find(3).firm === Firm
+    assert Firm === Client.find(3).firm
+  end
+
-  def test_type_mismatch
-    assert_raise(ActiveRecord::AssociationTypeMismatch) { Account.find(1).firm = 1 }
@@ -1025 +1036 @@
-    assert_equal 2, active_record.developers.size
-    assert active_record.developers.include?(david)
+  end
+
+  def test_triple_equality
+    assert !(Array === Developer.find(1).projects)
+    assert Developer.find(1).projects === Array
-  end
-