@@ -146,6 +146,13 @@ module DataMapper # @api public def belongs_to(name, options={}) @_valid_relations = false + + if options.key?(:class_name) && !options.key?(:child_key) + warn "The inferred child_key will changing to be prefixed with the relationship name #{name}. " \ + "When using :class_name in belongs_to specify the :child_key explicitly to avoid problems." \ + "#{caller(0)[1]}" + end + relationship = ManyToOne.setup(name, self, options) # Please leave this in - I will release contextual serialization soon # which requires this -- guyvdb lib/dm-core/associations.rb @@ -67,7 +67,7 @@ module DataMapper EOS names.each do |n| - model.belongs_to(Extlib::Inflection.underscore(n).gsub("/", "_").to_sym, :class_name => n) + model.belongs_to(Extlib::Inflection.underscore(n).gsub('/', '_').to_sym) end Object.const_set(model_name, model) lib/dm-core/associations/many_to_many.rb @@ -231,11 +231,11 @@ describe "DataMapper::Associations" do it "should create a many-to-one association with options" do DataMapper::Associations::ManyToOne.should_receive(:setup). - with(:vehicle, Manufacturer, { :class_name => 'Car' }). + with(:vehicle, Manufacturer, :class_name => 'Car', :child_key => [ :car_id ]). and_return(@relationship) class ::Manufacturer - belongs_to(:vehicle, :class_name => 'Car').should == mock_relationship + belongs_to(:vehicle, :class_name => 'Car', :child_key => [ :car_id ]).should == mock_relationship end end end spec/unit/associations_spec.rb 8153992ffcc7243aad6a1ee6b5cdfefe5befa4c1 Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-core/commit/61e7fa5261a30b0579e444ec86213a3722f7cb9f 61e7fa5261a30b0579e444ec86213a3722f7cb9f 2009-01-23T01:59:56-08:00 2009-01-23T01:59:56-08:00 Added deprecation warning for inferred child_key naming convention change 91430f64ac203daf3119dc7803dd40ceabfa3c1f Dan Kubb dan.kubb@autopilotmarketing.com