sequel 2.5.0 → 2.6.0

data/spec/sequel_model/record_spec.rb

@@ -227,6 +227,7 @@ describe "Model#new?" do
 
     @c = Class.new(Sequel::Model(:items)) do
       unrestrict_primary_key
+      columns :x
     end
   end
   
@@ -441,6 +442,12 @@ describe Sequel::Model, "#set" do
     returned_value.should == @o1
     MODEL_DB.sqls.should == []
   end
+
+  it "should assume it is a column if no column information is present and the key is a symbol" do
+    @c.instance_variable_set(:@columns, nil)
+    o = @c.new.set(:x123=>1)
+    o[:x123].should == 1
+  end
 end
 
 describe Sequel::Model, "#update" do
@@ -923,11 +930,30 @@ describe Sequel::Model, "typecasting" do
     m.x.should == nil
   end
 
+  specify "should not raise when typecasting nil to NOT NULL column but raise_on_typecast_failure is off" do
+    @c.raise_on_typecast_failure = false
+    @c.typecast_on_assignment = true
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer,:allow_null=>false}})
+    m = @c.new
+    m.x = ''
+    m.x.should == nil
+    m.x = nil
+    m.x.should == nil
+  end
+
   specify "should raise an error if invalid data is used in an integer field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer}})
     proc{@c.new.x = 'a'}.should raise_error
   end
 
+  specify "should assign value if raise_on_typecast_failure is off and assigning invalid integer" do
+    @c.raise_on_typecast_failure = false
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:integer}})
+    model = @c.new
+    model.x = '1d'
+    model.x.should == '1d'
+  end
+
   specify "should convert to float for a float field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:float}})
     m = @c.new
@@ -944,6 +970,14 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = 'a'}.should raise_error
   end
 
+  specify "should assign value if raise_on_typecast_failure is off and assigning invalid float" do
+    @c.raise_on_typecast_failure = false
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:float}})
+    model = @c.new
+    model.x = '1d'
+    model.x.should == '1d'
+  end
+
   specify "should convert to BigDecimal for a decimal field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:decimal}})
     m = @c.new
@@ -963,6 +997,15 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = Date.today}.should raise_error
   end
 
+  specify "should assign value if raise_on_typecast_failure is off and assigning invalid decimal" do
+    @c.raise_on_typecast_failure = false
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:decimal}})
+    model = @c.new
+    time = Time.now
+    model.x = time
+    model.x.should == time
+  end
+
   specify "should convert to string for a string field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:string}})
     m = @c.new
@@ -1031,6 +1074,14 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = 100}.should raise_error
   end
 
+  specify "should assign value if raise_on_typecast_failure is off and assigning invalid date" do
+    @c.raise_on_typecast_failure = false
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:date}})
+    model = @c.new
+    model.x = 4
+    model.x.should == 4
+  end
+
   specify "should convert to time for a time field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
     m = @c.new
@@ -1050,6 +1101,14 @@ describe Sequel::Model, "typecasting" do
     proc{@c.new.x = '2008-10-21'.to_datetime}.should raise_error
   end
 
+  specify "should assign value if raise_on_typecast_failure is off and assigning invalid time" do
+    @c.raise_on_typecast_failure = false
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:time}})
+    model = @c.new
+    model.x = '0000'
+    model.x.should == '0000'
+  end
+
   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
@@ -1077,10 +1136,24 @@ describe Sequel::Model, "typecasting" do
 
   specify "should raise an error if invalid data is used in a datetime field" do
     @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
-    proc{@c.new.x = '0000'}.should raise_error
+    proc{@c.new.x = '0000'}.should raise_error(Sequel::Error::InvalidValue)
     proc{@c.new.x = 'a'}.should_not raise_error # Valid Time
     Sequel.datetime_class = DateTime
     proc{@c.new.x = '0000'}.should raise_error
     proc{@c.new.x = 'a'}.should raise_error
   end
+
+  specify "should assign value if raise_on_typecast_failure is off and assigning invalid datetime" do
+    @c.raise_on_typecast_failure = false
+    @c.instance_variable_set(:@db_schema, {:x=>{:type=>:datetime}})
+    model = @c.new
+    model.x = '0000'
+    model.x.should == '0000'
+    Sequel.datetime_class = DateTime
+    model = @c.new
+    model.x = '0000'
+    model.x.should == '0000'
+    model.x = 'a'
+    model.x.should == 'a'
+  end
 end

data/spec/sequel_model/spec_helper.rb

@@ -45,6 +45,14 @@ class MockDatabase < Sequel::Database
     @sqls = []
   end
 
+  def schema(table_name, opts)
+    if table_name
+      [[:id, {:primary_key=>true}]]
+    else
+      {table_name=>[[:id, {:primary_key=>true}]]}
+    end
+  end
+
   def transaction; yield; end
   
   def dataset; MockDataset.new(self); end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-03 00:00:00 -07:00
+date: 2008-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,7 @@ extra_rdoc_files:
 - doc/dataset_filtering.rdoc
 - doc/prepared_statements.rdoc
 - doc/sharding.rdoc
+- doc/schema.rdoc
 files: 
 - COPYING
 - CHANGELOG
@@ -39,6 +40,7 @@ files:
 - doc/dataset_filtering.rdoc
 - doc/prepared_statements.rdoc
 - doc/sharding.rdoc
+- doc/schema.rdoc
 - spec/adapters
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
@@ -177,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sequel
-rubygems_version: 1.0.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: The Database Toolkit for Ruby