Ticket #2917: habtm-singular-id-get-method-stable.patch

activerecord/test/associations_test.rb

@@ -1394 +1394 @@
-      AND developer_id = #{developer.id}
-    end_sql
-  end
+
+  def test_returns_collection_of_ids
+    francois = Developer.new("name" => "Francois")
+    francois.projects.concat([Project.find(1), Project.find(2)])
+    francois.save
+
+    assert_equal 2, francois.project_ids.size
+    assert francois.project_ids.include?(Project.find(1).id)
+    assert francois.project_ids.include?(Project.find(2).id)
+  end
+
+  def test_assign_through_collection_of_ids
+    francois = Developer.new("name" => "Francois")
+    francois.project_ids = [Project.find(1).id, Project.find(2).id]
+    francois.save
+    francois.reload
+
+    assert_equal 2, francois.projects.size
+    assert francois.projects.include?(Project.find(1))
+    assert francois.projects.include?(Project.find(2))
+  end
-end

activerecord/lib/active_record/associations.rb

@@ -271 +271 @@
-      # * <tt>collection.delete(object, ...)</tt> - removes one or more objects from the collection by setting their foreign keys to NULL.  
-      #   This will also destroy the objects if they're declared as belongs_to and dependent on this model.
-      # * <tt>collection=objects</tt> - replaces the collections content by deleting and adding objects as appropriate.
+      # * <tt>collection_singular_ids</tt> - returns the primary key ID of all associated objects.
-      # * <tt>collection_singular_ids=ids</tt> - replace the collection by the objects identified by the primary keys in +ids+
-      # * <tt>collection.clear</tt> - removes every object from the collection. This destroys the associated objects if they
-      #   are <tt>:dependent</tt>, deletes them directly from the database if they are <tt>:exclusively_dependent</tt>,
@@ -290 +291 @@
-      # * <tt>Firm#clients<<</tt>
-      # * <tt>Firm#clients.delete</tt>
-      # * <tt>Firm#clients=</tt>
+      # * <tt>Firm#client_ids</tt>
-      # * <tt>Firm#client_ids=</tt>
-      # * <tt>Firm#clients.clear</tt>
-      # * <tt>Firm#clients.empty?</tt> (similar to <tt>firm.clients.size == 0</tt>)
@@ -583 +585 @@
-      # * <tt>collection.delete(object, ...)</tt> - removes one or more objects from the collection by removing their associations from the join table.  
-      #   This does not destroy the objects.
-      # * <tt>collection=objects</tt> - replaces the collections content by deleting and adding objects as appropriate.
+      # * <tt>collection_singular_ids</tt> - returns an array of all primary ID of the associated objects.
-      # * <tt>collection_singular_ids=ids</tt> - replace the collection by the objects identified by the primary keys in +ids+
-      # * <tt>collection.clear</tt> - removes every object from the collection. This does not destroy the objects.
-      # * <tt>collection.empty?</tt> - returns true if there are no associated objects.
@@ -596 +599 @@
-      # * <tt>Developer#projects.push_with_attributes</tt>
-      # * <tt>Developer#projects.delete</tt>
-      # * <tt>Developer#projects=</tt>
+      # * <tt>Developer#project_ids</tt>
-      # * <tt>Developer#project_ids=</tt>
-      # * <tt>Developer#projects.clear</tt>
-      # * <tt>Developer#projects.empty?</tt>
@@ -771 +775 @@
-            association
-          end
-
+          define_method("#{Inflector.singularize(association_name)}_ids") do
+            send("#{association_name}").map {|entry| entry.id}
+          end
+
-          define_method("#{Inflector.singularize(association_name)}_ids=") do |new_value|
-            send("#{association_name}=", association_class_name.constantize.find(new_value))
-          end