Updated OneToMany::Relationship#inverse to match using child_key too

lib/dm-core/associations/one_to_many.rb

@@ -166,6 +166,14 @@ def inverse_class
         def inverse_name
           super || Extlib::Inflection.underscore(Extlib::Inflection.demodulize(source_model.name)).to_sym
         end
+
+        # TODO: document
+        # @api private
+        def child_properties
+          super || parent_key.map do |parent_property|
+            "#{inverse_name}_#{parent_property.name}".to_sym
+          end
+        end
       end # class Relationship
 
       class Collection < DataMapper::Collection

lib/dm-core/associations/relationship.rb

@@ -507,7 +507,11 @@ def inverse?(other)
       # TODO: document
       # @api private
       def inverse_name
-        options[:inverse]
+        if options[:inverse].kind_of?(Relationship)
+          options[:inverse].name
+        else
+          options[:inverse]
+        end
       end
 
       # TODO: document
@@ -567,12 +571,10 @@ def cmp_model?(other, operator, type)
       # TODO: document
       # @api private
       def cmp_key?(other, operator, type)
-        method = "#{type}_properties"
-
-        self_key  = send(method)
-        other_key = other.send(method)
+        property_method = "#{type}_properties"
 
-        return true if self_key.nil? || other_key.nil?
+        self_key  = send(property_method)
+        other_key = other.send(property_method)
 
         self_key.send(operator, other_key)
       end

spec/semipublic/associations/relationship_spec.rb

@@ -88,6 +88,10 @@ def n
 
     describe 'with no matching relationship', 'from the parent side' do
       before :all do
+        # added to force OneToMany::Relationship#inverse to consider the
+        # child_key differences
+        @comment_model.belongs_to(:other_article, @article_model, :child_key => [ :other_article_id ])
+
         @relationship = @article_model.has(n, :comments)
 
         @inverse = @relationship.inverse