sequel 2.0.1 → 2.1.0

data/spec/record_spec.rb

@@ -227,20 +227,20 @@ describe Sequel::Model, "with this" do
   before { @example = Class.new Sequel::Model(:examples); @example.columns :id, :a, :x, :y }
 
   it "should return a dataset identifying the record" do
-    instance = @example.new :id => 3
+    instance = @example.load :id => 3
     instance.this.sql.should be_eql("SELECT * FROM examples WHERE (id = 3) LIMIT 1")
   end
 
   it "should support arbitary primary keys" do
     @example.set_primary_key :a
 
-    instance = @example.new :a => 3
+    instance = @example.load :a => 3
     instance.this.sql.should be_eql("SELECT * FROM examples WHERE (a = 3) LIMIT 1")
   end
 
   it "should support composite primary keys" do
     @example.set_primary_key :x, :y
-    instance = @example.new :x => 4, :y => 5
+    instance = @example.load :x => 4, :y => 5
 
     parts = [
       'SELECT * FROM examples WHERE %s LIMIT 1',
@@ -261,19 +261,19 @@ describe "Model#pk" do
   end
   
   it "should be default return the value of the :id column" do
-    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk.should == 111
   end
 
   it "should be return the primary key value for custom primary key" do
     @m.set_primary_key :x
-    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk.should == 2
   end
 
   it "should be return the primary key value for composite primary key" do
     @m.set_primary_key [:y, :x]
-    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk.should == [3, 2]
   end
 
@@ -295,19 +295,19 @@ describe "Model#pk_hash" do
   end
   
   it "should be default return the value of the :id column" do
-    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_hash.should == {:id => 111}
   end
 
   it "should be return the primary key value for custom primary key" do
     @m.set_primary_key :x
-    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_hash.should == {:x => 2}
   end
 
   it "should be return the primary key value for composite primary key" do
     @m.set_primary_key [:y, :x]
-    m = @m.new(:id => 111, :x => 2, :y => 3)
+    m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_hash.should == {:y => 3, :x => 2}
   end
 
@@ -322,89 +322,180 @@ describe "Model#pk_hash" do
   end
 end
 
-describe Sequel::Model, "set_with_params" do
-
-  before(:each) do
+describe Sequel::Model, "#set" do
+  before do
     MODEL_DB.reset
     
     @c = Class.new(Sequel::Model(:items)) do
+      set_primary_key :id
       columns :x, :y, :id
     end
+    @c.strict_param_setting = false
     @c.instance_variable_set(:@columns, true)
     @o1 = @c.new
     @o2 = @c.load(:id => 5)
   end
-  
+
   it "should filter the given params using the model columns" do
-    @o1.set_with_params(:x => 1, :z => 2)
+    @o1.set(:x => 1, :z => 2)
     @o1.values.should == {:x => 1}
     MODEL_DB.sqls.should == []
 
-    @o2.set_with_params(:y => 1, :abc => 2)
+    @o2.set(:y => 1, :abc => 2)
     @o2.values.should == {:y => 1, :id=> 5}
     MODEL_DB.sqls.should == []
   end
   
   it "should work with both strings and symbols" do
-    @o1.set_with_params('x'=> 1, 'z'=> 2)
+    @o1.set('x'=> 1, 'z'=> 2)
     @o1.values.should == {:x => 1}
     MODEL_DB.sqls.should == []
 
-    @o2.set_with_params('y'=> 1, 'abc'=> 2)
+    @o2.set('y'=> 1, 'abc'=> 2)
     @o2.values.should == {:y => 1, :id=> 5}
     MODEL_DB.sqls.should == []
   end
   
   it "should support virtual attributes" do
     @c.class_def(:blah=) {|v| self.x = v}
-    @o1.set_with_params(:blah => 333)
+    @o1.set(:blah => 333)
     @o1.values.should == {:x => 333}
     MODEL_DB.sqls.should == []
-    @o1.set_with_params('blah'=> 334)
+    @o1.set('blah'=> 334)
     @o1.values.should == {:x => 334}
     MODEL_DB.sqls.should == []
   end
-end
+  
+  it "should not modify the primary key" do
+    @o1.set(:x => 1, :id => 2)
+    @o1.values.should == {:x => 1}
+    MODEL_DB.sqls.should == []
+    @o2.set('y'=> 1, 'id'=> 2)
+    @o2.values.should == {:y => 1, :id=> 5}
+    MODEL_DB.sqls.should == []
+  end
 
-describe Sequel::Model, "update_with_params" do
+  it "should be aliased as set_with_params" do
+    @o1.set_with_params(:x => 1, :z => 2)
+    @o1.values.should == {:x => 1}
+    MODEL_DB.sqls.should == []
+  end
+end
 
-  before(:each) do
+describe Sequel::Model, "#update" do
+  before do
     MODEL_DB.reset
     
     @c = Class.new(Sequel::Model(:items)) do
+      set_primary_key :id
       columns :x, :y, :id
     end
+    @c.strict_param_setting = false
     @c.instance_variable_set(:@columns, true)
     @o1 = @c.new
     @o2 = @c.load(:id => 5)
   end
   
   it "should filter the given params using the model columns" do
-    @o1.update_with_params(:x => 1, :z => 2)
+    @o1.update(:x => 1, :z => 2)
     MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
 
     MODEL_DB.reset
-    @o2.update_with_params(:y => 1, :abc => 2)
+    @o2.update(:y => 1, :abc => 2)
     MODEL_DB.sqls.first.should == "UPDATE items SET y = 1 WHERE (id = 5)"
   end
   
   it "should support virtual attributes" do
     @c.class_def(:blah=) {|v| self.x = v}
-    @o1.update_with_params(:blah => 333)
+    @o1.update(:blah => 333)
     MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (333)"
   end
+  
+  it "should not modify the primary key" do
+    @o1.update(:x => 1, :id => 2)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+    MODEL_DB.reset
+    @o2.update('y'=> 1, 'id'=> 2)
+    @o2.values.should == {:y => 1, :id=> 5}
+    MODEL_DB.sqls.first.should == "UPDATE items SET y = 1 WHERE (id = 5)"
+  end
+
+  it "should be aliased as update_with_params" do
+    @o1.update_with_params(:x => 1, :z => 2)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+  end
 end
 
-describe Sequel::Model, "#destroy" do
+describe Sequel::Model, "#(set|update)_(all|except|only)" do
+  before do
+    MODEL_DB.reset
+    
+    @c = Class.new(Sequel::Model(:items)) do
+      set_primary_key :id
+      columns :x, :y, :z, :id
+      set_allowed_columns :x
+      set_restricted_columns :y
+    end
+    @c.strict_param_setting = false
+    @c.instance_variable_set(:@columns, true)
+    @o1 = @c.new
+  end
 
-  before(:each) do
+  it "#set_all should set all attributes" do
+    @o1.set_all(:x => 1, :y => 2, :z=>3, :id=>4)
+    @o1.values.should == {:x => 1, :y => 2, :z=>3}
+  end
+
+  it "#set_only should only set given attributes" do
+    @o1.set_only({:x => 1, :y => 2, :z=>3, :id=>4}, [:x, :y])
+    @o1.values.should == {:x => 1, :y => 2}
+    @o1.set_only({:x => 4, :y => 5, :z=>6, :id=>7}, :x, :y)
+    @o1.values.should == {:x => 4, :y => 5}
+  end
+
+  it "#set_except should not set given attributes" do
+    @o1.set_except({:x => 1, :y => 2, :z=>3, :id=>4}, [:y, :z])
+    @o1.values.should == {:x => 1}
+    @o1.set_except({:x => 4, :y => 2, :z=>3, :id=>4}, :y, :z)
+    @o1.values.should == {:x => 4}
+  end
+
+  it "#update_all should update all attributes" do
+    @c.new.update_all(:x => 1, :id=>4)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+    MODEL_DB.reset
+    @c.new.update_all(:y => 1, :id=>4)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (y) VALUES (1)"
+    MODEL_DB.reset
+    @c.new.update_all(:z => 1, :id=>4)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (z) VALUES (1)"
+  end
+
+  it "#update_only should only update given attributes" do
+    @o1.update_only({:x => 1, :y => 2, :z=>3, :id=>4}, [:x])
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+    MODEL_DB.reset
+    @c.new.update_only({:x => 1, :y => 2, :z=>3, :id=>4}, :x)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+  end
+
+  it "#update_except should not update given attributes" do
+    @o1.update_except({:x => 1, :y => 2, :z=>3, :id=>4}, [:y, :z])
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+    MODEL_DB.reset
+    @c.new.update_except({:x => 1, :y => 2, :z=>3, :id=>4}, :y, :z)
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+  end
+end
+
+describe Sequel::Model, "#destroy" do
+  before do
     MODEL_DB.reset
     @model = Class.new(Sequel::Model(:items))
     @model.columns :id
     @model.dataset.meta_def(:delete) {MODEL_DB.execute delete_sql}
     
-    @instance = @model.new(:id => 1234)
-    #@model.stub!(:delete).and_return(:true)
+    @instance = @model.load(:id => 1234)
   end
 
   it "should return self" do
@@ -452,7 +543,7 @@ describe Sequel::Model, "#each" do
   setup do
     @model = Class.new(Sequel::Model(:items))
     @model.columns :a, :b, :id
-    @m = @model.new(:a => 1, :b => 2, :id => 4444)
+    @m = @model.load(:a => 1, :b => 2, :id => 4444)
   end
   
   specify "should iterate over the values" do
@@ -466,7 +557,7 @@ describe Sequel::Model, "#keys" do
   setup do
     @model = Class.new(Sequel::Model(:items))
     @model.columns :a, :b, :id
-    @m = @model.new(:a => 1, :b => 2, :id => 4444)
+    @m = @model.load(:a => 1, :b => 2, :id => 4444)
   end
   
   specify "should return the value keys" do
@@ -482,9 +573,9 @@ describe Sequel::Model, "#==" do
   specify "should compare instances by values" do
     z = Class.new(Sequel::Model)
     z.columns :id, :x
-    a = z.new(:id => 1, :x => 3)
-    b = z.new(:id => 1, :x => 4)
-    c = z.new(:id => 1, :x => 3)
+    a = z.load(:id => 1, :x => 3)
+    b = z.load(:id => 1, :x => 4)
+    c = z.load(:id => 1, :x => 3)
     
     a.should_not == b
     a.should == c
@@ -494,9 +585,9 @@ describe Sequel::Model, "#==" do
   specify "should be aliased to #eql?" do
     z = Class.new(Sequel::Model)
     z.columns :id, :x
-    a = z.new(:id => 1, :x => 3)
-    b = z.new(:id => 1, :x => 4)
-    c = z.new(:id => 1, :x => 3)
+    a = z.load(:id => 1, :x => 3)
+    b = z.load(:id => 1, :x => 4)
+    c = z.load(:id => 1, :x => 3)
     
     a.eql?(b).should == false
     a.eql?(c).should == true
@@ -510,10 +601,10 @@ describe Sequel::Model, "#===" do
     z.columns :id, :x
     y = Class.new(Sequel::Model)
     y.columns :id, :x
-    a = z.new(:id => 1, :x => 3)
-    b = z.new(:id => 1, :x => 4)
-    c = z.new(:id => 2, :x => 3)
-    d = y.new(:id => 1, :x => 3)
+    a = z.load(:id => 1, :x => 3)
+    b = z.load(:id => 1, :x => 4)
+    c = z.load(:id => 2, :x => 3)
+    d = y.load(:id => 1, :x => 3)
     
     a.should === b
     a.should_not === c
@@ -542,10 +633,10 @@ describe Sequel::Model, "#hash" do
     z.columns :id, :x
     y = Class.new(Sequel::Model)
     y.columns :id, :x
-    a = z.new(:id => 1, :x => 3)
-    b = z.new(:id => 1, :x => 4)
-    c = z.new(:id => 2, :x => 3)
-    d = y.new(:id => 1, :x => 3)
+    a = z.load(:id => 1, :x => 3)
+    b = z.load(:id => 1, :x => 4)
+    c = z.load(:id => 2, :x => 3)
+    d = y.load(:id => 1, :x => 3)
     
     a.hash.should == b.hash
     a.hash.should_not == c.hash
@@ -573,11 +664,17 @@ describe Sequel::Model, "#initialize" do
     @c = Class.new(Sequel::Model) do
       columns :id, :x
     end
+    @c.strict_param_setting = false
   end
   
   specify "should accept values" do
+    m = @c.new(:x => 2)
+    m.values.should == {:x => 2}
+  end
+  
+  specify "should not modify the primary key" do
     m = @c.new(:id => 1, :x => 2)
-    m.values.should == {:id => 1, :x => 2}
+    m.values.should == {:x => 2}
   end
   
   specify "should accept no values" do
@@ -599,14 +696,14 @@ describe Sequel::Model, "#initialize" do
     @c.class_def(:blah=) {|x| @blah = x}
     @c.class_def(:blah) {@blah}
     
-    m = @c.new(:id => 1, :x => 2, :blah => 3)
-    m.values.should == {:id => 1, :x => 2}
+    m = @c.new(:x => 2, :blah => 3)
+    m.values.should == {:x => 2}
     m.blah.should == 3
   end
   
   specify "should convert string keys into symbol keys" do
-    m = @c.new('id' => 1, 'x' => 2)
-    m.values.should == {:id => 1, :x => 2}
+    m = @c.new('x' => 2)
+    m.values.should == {:x => 2}
   end
 end
 
@@ -680,16 +777,10 @@ describe Sequel::Model, "#refresh" do
 
   specify "should remove cached associations" do
     @c.many_to_one :node, :class=>@c
-    @c.one_to_many :attributes, :class=>@c
-    @c.many_to_many :tags, :class=>@c
     @m = @c.new(:id => 555)
-    @m.instance_variable_set(:@node, 15)
-    @m.instance_variable_set(:@attributes, [15])
-    @m.instance_variable_set(:@tags, [15])
+    @m.associations[:node] = 15
     @m.reload
-    @m.instance_variable_get(:@node).should == nil
-    @m.instance_variable_get(:@attributes).should == nil
-    @m.instance_variable_get(:@tags).should == nil
+    @m.associations.should == {}
   end
 end
 
@@ -702,7 +793,7 @@ describe Sequel::Model, "typecasting" do
   end
 
   teardown do
-    Sequel.time_class = Time
+    Sequel.datetime_class = Time
   end
 
   specify "should not convert if typecasting is turned off" do
@@ -765,6 +856,25 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = 'a'}.should raise_error
   end
 
+  specify "should convert to BigDecimal for a decimal field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:decimal}})
+    m = @c.new
+    bd = '1.0'.to_d
+    m.x = '1.0'
+    m.x.should == bd
+    m.x = 1.0
+    m.x.should == bd
+    m.x = 1
+    m.x.should == bd
+    m.x = bd
+    m.x.should == bd
+  end
+
+  specify "should raise an error if invalid data is used in an decimal field" do
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:decimal}})
+    proc{@c.new.x = Date.today}.should raise_error
+  end
+
   specify "should convert to string for a string field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:string}})
     m = @c.new
@@ -851,7 +961,7 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = '2008-10-21'.to_datetime}.should raise_error
   end
 
-  specify "should convert to the Sequel.time_class for a datetime field" do
+  specify "should convert to the Sequel.datetime_class for a datetime field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
     m = @c.new
     x = '2007-10-21T10:20:30-07:00'
@@ -864,7 +974,7 @@ describe Sequel::Model, "typecasting" do
     m.x.should == y
     m.x = '2007-10-21'.to_date
     m.x.should == '2007-10-21'.to_time
-    Sequel.time_class = DateTime
+    Sequel.datetime_class = DateTime
     y = x.to_datetime
     m.x = x
     m.x.should == y
@@ -880,7 +990,7 @@ describe Sequel::Model, "typecasting" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
     proc{@c.new.x = '0000'}.should raise_error
     proc{@c.new.x = ''}.should_not raise_error # Valid Time
-    Sequel.time_class = DateTime
+    Sequel.datetime_class = DateTime
     proc{@c.new.x = '0000'}.should raise_error
     proc{@c.new.x = ''}.should raise_error
   end