dm-core 0.10.1 → 0.10.2

data/spec/public/associations/one_to_one_spec.rb

@@ -12,7 +12,10 @@ describe 'One to One Associations' do
         property :description, Text
         property :admin,       Boolean, :accessor => :private
 
-        belongs_to :referrer, self, :nullable => true
+        belongs_to :parent, self, :required => false
+        has n, :children, self, :inverse => :parent
+
+        belongs_to :referrer, self, :required => false
         belongs_to :comment
 
         # TODO: remove this after Relationship#inverse can dynamically
@@ -50,6 +53,12 @@ describe 'One to One Associations' do
       end
     end
 
+    class ::Default
+      include DataMapper::Resource
+
+      property :name, String, :key => true, :default => 'a default value'
+    end
+
     @user_model      = Blog::User
     @author_model    = Blog::Author
     @comment_model   = Blog::Comment
@@ -93,6 +102,9 @@ describe 'One to One Through Associations' do
         property :description, Text
         property :admin,       Boolean, :accessor => :private
 
+        belongs_to :parent, self, :required => false
+        has n, :children, self, :inverse => :parent
+
         has 1, :referral_from, Referral, :child_key => [ :referree_name ]
         has 1, :referral_to,   Referral, :child_key => [ :referrer_name ]
 
@@ -131,6 +143,12 @@ describe 'One to One Through Associations' do
       end
     end
 
+    class ::Default
+      include DataMapper::Resource
+
+      property :name, String, :key => true, :default => 'a default value'
+    end
+
     @referral_model  = Blog::Referral
     @user_model      = Blog::User
     @author_model    = Blog::Author

data/spec/public/associations/one_to_one_with_boolean_cpk_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
+
+# TODO: combine this into one_to_one_spec.rb
+
+describe 'One to One Associations when foreign key is part of a composite key and contains a boolean, with an integer and a boolean making up the composite key' do
+  before :all do
+    class ::ParentModel
+      include DataMapper::Resource
+
+      property :integer_key, Integer, :key => true
+      property :boolean_key, Boolean, :key => true
+
+      has 1, :child_model, :child_key => [ :integer_key, :boolean_key ]
+    end
+
+    class ::ChildModel
+      include DataMapper::Resource
+
+      property :integer_key,       Integer, :key => true
+      property :other_integer_key, Integer, :key => true
+      property :boolean_key,       Boolean, :key => true
+
+      belongs_to :parent_model, :child_key => [ :integer_key, :boolean_key ]
+    end
+  end
+
+  supported_by :all do
+    before :all do
+      @parent = ParentModel.create(:integer_key => 1, :boolean_key => false)
+      @child  = ChildModel.create(:integer_key => 1, :other_integer_key => 1, :boolean_key => false)
+    end
+
+    it 'should be able to access the child' do
+      @parent.child_model.should == @child
+    end
+
+    it 'should be able to access the parent' do
+      @child.parent_model.should == @parent
+    end
+
+    it 'should be able to access the parent_key' do
+      @child.parent_model.key.should_not be_nil
+    end
+  end
+end

data/spec/public/collection_spec.rb

@@ -13,12 +13,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
           include DataMapper::Resource
 
           property :id,       Serial
-          property :title,    String, :nullable => false
+          property :title,    String, :required => true
           property :content,  Text
           property :subtitle, String
-          property :author,   String, :nullable => false
+          property :author,   String, :required => true
 
-          belongs_to :original, self, :nullable => true
+          belongs_to :original, self, :required => false
           has n, :revisions, self, :child_key => [ :original_id ]
           has 1, :previous,  self, :child_key => [ :original_id ], :order => [ :id.desc ]
           has n, :publications, :through => Resource
@@ -60,6 +60,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
       it_should_behave_like 'A public Collection'
       it_should_behave_like 'A Collection supporting Strategic Eager Loading'
       it_should_behave_like 'Finder Interface'
+      it_should_behave_like 'Collection Finder Interface'
     end
   end
 end

data/spec/public/migrations_spec.rb

@@ -243,6 +243,38 @@ describe DataMapper::Migrations do
           end
         end
       end
+
+      describe 'String property' do
+        before :all do
+          @model.property(:id, DataMapper::Types::Serial)
+        end
+
+        [
+          [ 1,          'VARCHAR(1)'   ],
+          [ 50,         'VARCHAR(50)'  ],
+          [ 255,        'VARCHAR(255)' ],
+          [ nil,        'VARCHAR(50)'  ],
+        ].each do |length, statement|
+          options = {}
+          options[:length] = length if length
+
+          describe "with a length of #{length}" do
+            before :all do
+              @property = @model.property(:title, String, options)
+
+              @response = capture_log(DataObjects::Mysql) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output.last.should =~ %r{\ACREATE TABLE `blog_articles` \(`id` INT\(10\) UNSIGNED NOT NULL AUTO_INCREMENT, `title` #{Regexp.escape(statement)}, PRIMARY KEY\(`id`\)\) ENGINE = InnoDB CHARACTER SET [a-z\d]+ COLLATE (?:[a-z\d](?:_?[a-z\d]+)*)\z}
+            end
+          end
+        end
+      end
     end
   end
 
@@ -354,6 +386,118 @@ describe DataMapper::Migrations do
           end
         end
       end
+
+      describe 'String property' do
+        before :all do
+          @model.property(:id, DataMapper::Types::Serial)
+        end
+
+        [
+          [ 1,          'VARCHAR(1)'   ],
+          [ 50,         'VARCHAR(50)'  ],
+          [ 255,        'VARCHAR(255)' ],
+          [ nil,        'VARCHAR(50)'  ],
+        ].each do |length, statement|
+          options = {}
+          options[:length] = length if length
+
+          describe "with a length of #{length}" do
+            before :all do
+              @property = @model.property(:title, String, options)
+
+              @response = capture_log(DataObjects::Postgres) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output[-2].should == "CREATE TABLE \"blog_articles\" (\"id\" SERIAL NOT NULL, \"title\" #{statement}, PRIMARY KEY(\"id\"))"
+            end
+          end
+        end
+      end
+    end
+  end
+
+  supported_by :sqlserver do
+    before :all do
+      module ::Blog
+        class Article
+          include DataMapper::Resource
+        end
+      end
+
+      @model = ::Blog::Article
+    end
+
+    describe '#auto_migrate' do
+      describe 'Integer property' do
+        [
+          [                    0,                   1, 'TINYINT'  ],
+          [                    0,                 255, 'TINYINT'  ],
+          [                    0,                 256, 'SMALLINT' ],
+          [                    0,               32767, 'SMALLINT' ],
+          [                    0,               32768, 'INT'      ],
+          [                    0,          2147483647, 'INT'      ],
+          [                    0,          2147483648, 'BIGINT'   ],
+          [                    0, 9223372036854775807, 'BIGINT'   ],
+
+          [                   -1,                   1, 'SMALLINT' ],
+          [                   -1,                 255, 'SMALLINT' ],
+          [                   -1,                 256, 'SMALLINT' ],
+          [                   -1,               32767, 'SMALLINT' ],
+          [                   -1,               32768, 'INT'      ],
+          [                   -1,          2147483647, 'INT'      ],
+          [                   -1,          2147483648, 'BIGINT'   ],
+          [                   -1, 9223372036854775807, 'BIGINT'   ],
+
+          [                   -1,                   0, 'SMALLINT' ],
+          [               -32768,                   0, 'SMALLINT' ],
+          [               -32769,                   0, 'INT'      ],
+          [          -2147483648,                   0, 'INT'      ],
+          [          -2147483649,                   0, 'BIGINT'   ],
+          [ -9223372036854775808,                   0, 'BIGINT'   ],
+
+          [                  nil,          2147483647, 'INT'      ],
+          [                    0,                 nil, 'INT'      ],
+          [                  nil,                 nil, 'INTEGER'  ],
+        ].each do |min, max, statement|
+          options = { :key => true }
+          options[:min] = min if min
+          options[:max] = max if max
+
+          describe "with a min of #{min} and a max of #{max}" do
+            before :all do
+              @property = @model.property(:id, Integer, options)
+
+              @response = capture_log(DataObjects::Sqlserver) { @model.auto_migrate! }
+            end
+
+            it 'should return true' do
+              @response.should be_true
+            end
+
+            it "should create a #{statement} column" do
+              @output.last.should == "CREATE TABLE \"blog_articles\" (\"id\" #{statement} NOT NULL, PRIMARY KEY(\"id\"))"
+            end
+
+            options.only(:min, :max).each do |key, value|
+              it "should allow the #{key} value #{value} to be stored" do
+                lambda {
+                  resource = @model.create(@property => value)
+                  @model.first(@property => value).should eql(resource)
+                }.should_not raise_error
+              end
+            end
+          end
+        end
+      end
+
+      describe 'String property' do
+        it 'needs specs'
+      end
     end
   end
 end

data/spec/public/model/relationship_spec.rb

@@ -5,7 +5,7 @@ share_examples_for 'it creates a one accessor' do
     describe 'when there is no associated resource' do
       describe 'without a query' do
         before :all do
-          @return = @car.send(@name)
+          @return = @car.__send__(@name)
         end
 
         it 'should return nil' do
@@ -15,7 +15,7 @@ share_examples_for 'it creates a one accessor' do
 
       describe 'with a query' do
         before :all do
-          @return = @car.send(@name, :id => 99)
+          @return = @car.__send__(@name, :id => 99)
         end
 
         it 'should return nil' do
@@ -27,12 +27,12 @@ share_examples_for 'it creates a one accessor' do
     describe 'when there is an associated resource' do
       before :all do
         @expected = @model.new
-        @car.send("#{@name}=", @expected)
+        @car.__send__("#{@name}=", @expected)
       end
 
       describe 'without a query' do
         before :all do
-          @return = @car.send(@name)
+          @return = @car.__send__(@name)
         end
 
         it 'should return a Resource' do
@@ -50,7 +50,7 @@ share_examples_for 'it creates a one accessor' do
 
           @expected.id.should_not be_nil
 
-          @return = @car.send(@name, :id => @expected.id)
+          @return = @car.__send__(@name, :id => @expected.id)
         end
 
         it 'should return a Resource' do
@@ -66,13 +66,13 @@ share_examples_for 'it creates a one accessor' do
     describe 'when the target model is scoped' do
       before :all do
         @resource = @model.new
-        @car.send("#{@name}=", @resource)
+        @car.__send__("#{@name}=", @resource)
         @car.save
 
         # set the model scope to not match the expected resource
         @model.default_scope.update(:id.not => @resource.id)
 
-        @return = @car.model.get(*@car.key).send(@name)
+        @return = @car.model.get(*@car.key).__send__(@name)
       end
 
       it 'should return nil' do
@@ -88,7 +88,7 @@ share_examples_for 'it creates a one mutator' do
       before :all do
         @expected = @model.new
 
-        @return = @car.send("#{@name}=", @expected)
+        @return = @car.__send__("#{@name}=", @expected)
       end
 
       it 'should return the expected Resource' do
@@ -96,7 +96,7 @@ share_examples_for 'it creates a one mutator' do
       end
 
       it 'should set the Resource' do
-        @car.send(@name).should equal(@expected)
+        @car.__send__(@name).should equal(@expected)
       end
 
       it 'should relate associated Resource' do
@@ -104,14 +104,14 @@ share_examples_for 'it creates a one mutator' do
         many_to_one        = relationship.kind_of?(DataMapper::Associations::ManyToOne::Relationship)
         one_to_one_through = relationship.kind_of?(DataMapper::Associations::OneToOne::Relationship) && relationship.respond_to?(:through)
 
-        pending_if 'TODO', many_to_one || one_to_one_through do
+        pending_if many_to_one || one_to_one_through do
           @expected.car.should == @car
         end
       end
 
       it 'should persist the Resource' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should == @expected
+        @car.model.get(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
@@ -123,12 +123,12 @@ share_examples_for 'it creates a one mutator' do
 
     describe 'when setting a Hash' do
       before :all do
-        @car.send("#{@name}=", @model.new)
+        @car.__send__("#{@name}=", @model.new)
 
         attributes = { :id => 10 }
         @expected  = @model.new(attributes)
 
-        @return = @car.send("#{@name}=", attributes)
+        @return = @car.__send__("#{@name}=", attributes)
       end
 
       it 'should return the expected Resource' do
@@ -136,7 +136,7 @@ share_examples_for 'it creates a one mutator' do
       end
 
       it 'should set the Resource' do
-        @car.send(@name).should equal(@return)
+        @car.__send__(@name).should equal(@return)
       end
 
       it 'should relate associated Resource' do
@@ -144,14 +144,14 @@ share_examples_for 'it creates a one mutator' do
         many_to_one        = relationship.kind_of?(DataMapper::Associations::ManyToOne::Relationship)
         one_to_one_through = relationship.kind_of?(DataMapper::Associations::OneToOne::Relationship) && relationship.respond_to?(:through)
 
-        pending_if 'TODO', many_to_one || one_to_one_through do
+        pending_if many_to_one || one_to_one_through do
           @return.car.should == @car
         end
       end
 
       it 'should persist the Resource' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should == @return
+        @car.model.get(*@car.key).__send__(@name).should == @return
       end
 
       it 'should persist the associated Resource' do
@@ -163,9 +163,9 @@ share_examples_for 'it creates a one mutator' do
 
     describe 'when setting nil' do
       before :all do
-        @car.send("#{@name}=", @model.new)
+        @car.__send__("#{@name}=", @model.new)
 
-        @return = @car.send("#{@name}=", nil)
+        @return = @car.__send__("#{@name}=", nil)
       end
 
       it 'should return nil' do
@@ -173,21 +173,21 @@ share_examples_for 'it creates a one mutator' do
       end
 
       it 'should set nil' do
-        @car.send(@name).should be_nil
+        @car.__send__(@name).should be_nil
       end
 
       it 'should persist as nil' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should be_nil
+        @car.model.get(*@car.key).__send__(@name).should be_nil
       end
     end
 
     describe 'when changing the Resource' do
       before :all do
-        @car.send("#{@name}=", @model.new)
+        @car.__send__("#{@name}=", @model.new)
         @expected = @model.new
 
-        @return = @car.send("#{@name}=", @expected)
+        @return = @car.__send__("#{@name}=", @expected)
       end
 
       it 'should return the expected Resource' do
@@ -195,7 +195,7 @@ share_examples_for 'it creates a one mutator' do
       end
 
       it 'should set the Resource' do
-        @car.send(@name).should equal(@expected)
+        @car.__send__(@name).should equal(@expected)
       end
 
       it 'should relate associated Resource' do
@@ -210,7 +210,7 @@ share_examples_for 'it creates a one mutator' do
 
       it 'should persist the Resource' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should == @expected
+        @car.model.get(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
@@ -227,7 +227,7 @@ share_examples_for 'it creates a many accessor' do
     describe 'when there is no child resource and the source is saved' do
       before :all do
         @car.save.should be_true
-        @return = @car.send(@name)
+        @return = @car.__send__(@name)
       end
 
       it 'should return a Collection' do
@@ -241,7 +241,7 @@ share_examples_for 'it creates a many accessor' do
 
     describe 'when there is no child resource and the source is not saved' do
       before :all do
-        @return = @car.send(@name)
+        @return = @car.__send__(@name)
       end
 
       it 'should return a Collection' do
@@ -258,9 +258,9 @@ share_examples_for 'it creates a many accessor' do
         @return = nil
 
         @expected = @model.new
-        @car.send("#{@name}=", [ @expected ])
+        @car.__send__("#{@name}=", [ @expected ])
 
-        @return = @car.send(@name)
+        @return = @car.__send__(@name)
       end
 
       it 'should return a Collection' do
@@ -274,15 +274,15 @@ share_examples_for 'it creates a many accessor' do
 
     describe 'when the target model is scoped' do
       before :all do
-        2.times { @car.send(@name).new }
+        2.times { @car.__send__(@name).new }
         @car.save
 
-        @expected = @car.send(@name).first
+        @expected = @car.__send__(@name).first
 
         # set the model scope to only return the first record
         @model.default_scope.update(@model.key(@repository.name).zip(@expected.key).to_hash)
 
-        @return = @car.model.get(*@car.key).send(@name)
+        @return = @car.model.get(*@car.key).__send__(@name)
       end
 
       it 'should return a Collection' do
@@ -302,7 +302,7 @@ share_examples_for 'it creates a many mutator' do
       before :all do
         @expected = [ @model.new ]
 
-        @return = @car.send("#{@name}=", @expected)
+        @return = @car.__send__("#{@name}=", @expected)
       end
 
       it 'should return the expected Collection' do
@@ -310,19 +310,19 @@ share_examples_for 'it creates a many mutator' do
       end
 
       it 'should set the Collection' do
-        @car.send(@name).should == @expected
-        @car.send(@name).zip(@expected) { |value, expected| value.should equal(expected) }
+        @car.__send__(@name).should == @expected
+        @car.__send__(@name).zip(@expected) { |value, expected| value.should equal(expected) }
       end
 
       it 'should relate the associated Collection' do
-        pending_if 'TODO', Car.relationships[@name].kind_of?(DataMapper::Associations::ManyToMany::Relationship) do
+        pending_if Car.relationships[@name].kind_of?(DataMapper::Associations::ManyToMany::Relationship) do
           @expected.each { |resource| resource.car.should == @car }
         end
       end
 
       it 'should persist the Collection' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should == @expected
+        @car.model.get(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
@@ -338,7 +338,7 @@ share_examples_for 'it creates a many mutator' do
         @hashes    = [ attributes             ]
         @expected  = [ @model.new(attributes) ]
 
-        @return = @car.send("#{@name}=", @hashes)
+        @return = @car.__send__("#{@name}=", @hashes)
       end
 
       it 'should return the expected Collection' do
@@ -346,18 +346,18 @@ share_examples_for 'it creates a many mutator' do
       end
 
       it 'should set the Collection' do
-        @car.send(@name).should == @return
+        @car.__send__(@name).should == @return
       end
 
       it 'should relate the associated Collection' do
-        pending_if 'TODO', Car.relationships[@name].kind_of?(DataMapper::Associations::ManyToMany::Relationship) do
+        pending_if Car.relationships[@name].kind_of?(DataMapper::Associations::ManyToMany::Relationship) do
           @return.each { |resource| resource.car.should == @car }
         end
       end
 
       it 'should persist the Collection' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should == @return
+        @car.model.get(*@car.key).__send__(@name).should == @return
       end
 
       it 'should persist the associated Resource' do
@@ -369,9 +369,9 @@ share_examples_for 'it creates a many mutator' do
 
     describe 'when setting an empty collection' do
       before :all do
-        @car.send("#{@name}=", [ @model.new ])
+        @car.__send__("#{@name}=", [ @model.new ])
 
-        @return = @car.send("#{@name}=", [])
+        @return = @car.__send__("#{@name}=", [])
       end
 
       it 'should return a Collection' do
@@ -379,22 +379,22 @@ share_examples_for 'it creates a many mutator' do
       end
 
       it 'should set an empty Collection' do
-        @car.send(@name).should be_empty
+        @car.__send__(@name).should be_empty
       end
 
       it 'should persist as an empty Collection' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should be_empty
+        @car.model.get(*@car.key).__send__(@name).should be_empty
       end
     end
 
     describe 'when changing an associated collection' do
       before :all do
-        @car.send("#{@name}=", [ @model.new ])
+        @car.__send__("#{@name}=", [ @model.new ])
 
         @expected = [ @model.new ]
 
-        @return = @car.send("#{@name}=", @expected)
+        @return = @car.__send__("#{@name}=", @expected)
       end
 
       it 'should return the expected Resource' do
@@ -402,19 +402,19 @@ share_examples_for 'it creates a many mutator' do
       end
 
       it 'should set the Resource' do
-        @car.send(@name).should == @expected
-        @car.send(@name).zip(@expected) { |value, expected| value.should equal(expected) }
+        @car.__send__(@name).should == @expected
+        @car.__send__(@name).zip(@expected) { |value, expected| value.should equal(expected) }
       end
 
       it 'should relate associated Resource' do
-        pending_if 'TODO', Car.relationships[@name].kind_of?(DataMapper::Associations::ManyToMany::Relationship) do
+        pending_if Car.relationships[@name].kind_of?(DataMapper::Associations::ManyToMany::Relationship) do
           @expected.each { |resource| resource.car.should == @car }
         end
       end
 
       it 'should persist the Resource' do
         @car.save.should be_true
-        @car.model.get(*@car.key).send(@name).should == @expected
+        @car.model.get(*@car.key).__send__(@name).should == @expected
       end
 
       it 'should persist the associated Resource' do
@@ -432,6 +432,7 @@ describe DataMapper::Associations do
       include DataMapper::Resource
 
       property :id, Serial
+      property :name, String
     end
 
     class ::Engine
@@ -464,7 +465,7 @@ describe DataMapper::Associations do
       @model = Engine
       @name  = :engine
 
-      Car.belongs_to(@name, :nullable => true)
+      Car.belongs_to(@name, :required => false)
       Engine.has(1, :car)
     end
 
@@ -561,8 +562,7 @@ describe DataMapper::Associations do
           before :all do
             @car = Car.create
 
-            @engine = Engine.new
-            @engine.car_id = @car.id
+            @engine = Engine.new(:car_id => @car.id)
           end
 
           it 'should set the associated resource' do
@@ -611,6 +611,66 @@ describe DataMapper::Associations do
         end
       end
     end
+
+    describe 'with a model' do
+      before :all do
+        Engine.belongs_to(:vehicle, Car)
+      end
+
+      it 'should set the relationship target model' do
+        Engine.relationships[:vehicle].target_model.should == Car
+      end
+    end
+
+    describe 'with a :model option' do
+      before :all do
+        Engine.belongs_to(:vehicle, :model => Car)
+      end
+
+      it 'should set the relationship target model' do
+        Engine.relationships[:vehicle].target_model.should == Car
+      end
+    end
+
+    describe 'with a single element as :child_key option' do
+      before :all do
+        Engine.belongs_to(:vehicle, :model => Car, :child_key => :bike_id)
+      end
+
+      it 'should set the relationship child key' do
+        Engine.relationships[:vehicle].child_key.map { |property| property.name }.should == [:bike_id]
+      end
+    end
+
+    describe 'with an array as :child_key option' do
+      before :all do
+        Engine.belongs_to(:vehicle, :model => Car, :child_key => [:bike_id])
+      end
+
+      it 'should set the relationship child key' do
+        Engine.relationships[:vehicle].child_key.map { |property| property.name }.should == [:bike_id]
+      end
+    end
+
+    describe 'with a single element as :parent_key option' do
+      before :all do
+        Engine.belongs_to(:vehicle, :model => Car, :parent_key => :name)
+      end
+
+      it 'should set the relationship parent key' do
+        Engine.relationships[:vehicle].parent_key.map { |property| property.name }.should == [:name]
+      end
+    end
+
+    describe 'with an array as :parent_key option' do
+      before :all do
+        Engine.belongs_to(:vehicle, :model => Car, :parent_key => [:name])
+      end
+
+      it 'should set the relationship parent key' do
+        Engine.relationships[:vehicle].parent_key.map { |property| property.name }.should == [:name]
+      end
+    end
   end
 
   it { Car.should respond_to(:has) }
@@ -679,7 +739,7 @@ describe DataMapper::Associations do
         @name  = :doors
 
         Car.has(1..4, @name)
-        Door.belongs_to(:car, :nullable => true)
+        Door.belongs_to(:car, :required => false)
       end
 
       supported_by :all do
@@ -902,7 +962,7 @@ describe DataMapper::Associations do
         property :id,   Serial
         property :name, String
 
-        belongs_to :owner, Employee, :nullable => true
+        belongs_to :owner, Employee, :required => false
         has n, :employees
       end
     end