sequel 4.0.0 → 4.1.0

data/spec/core/database_spec.rb

@@ -508,6 +508,11 @@ describe "Database#run" do
     @db.sqls.should == ["DELETE FROM items"]
   end
   
+  specify "should handle placeholder literal strings" do
+    @db.run(Sequel.lit("DELETE FROM ?", :items))
+    @db.sqls.should == ["DELETE FROM items"]
+  end
+  
   specify "should return nil" do
     @db.run("DELETE FROM items").should be_nil
   end
@@ -528,6 +533,11 @@ describe "Database#<<" do
     @db.sqls.should == ["DELETE FROM items"]
   end
   
+  specify "should handle placeholder literal strings" do
+    @db << Sequel.lit("DELETE FROM ?", :items)
+    @db.sqls.should == ["DELETE FROM items"]
+  end
+  
   specify "should be chainable" do
     @db << "DELETE FROM items" << "DELETE FROM items2"
     @db.sqls.should == ["DELETE FROM items", "DELETE FROM items2"]

data/spec/core/dataset_spec.rb

@@ -1609,10 +1609,10 @@ describe "Dataset#limit" do
   specify "should raise an error if an invalid limit or offset is used" do
     proc{@dataset.limit(-1)}.should raise_error(Sequel::Error)
     proc{@dataset.limit(0)}.should raise_error(Sequel::Error)
-    proc{@dataset.limit(1)}.should_not raise_error(Sequel::Error)
+    proc{@dataset.limit(1)}.should_not raise_error
     proc{@dataset.limit(1, -1)}.should raise_error(Sequel::Error)
-    proc{@dataset.limit(1, 0)}.should_not raise_error(Sequel::Error)
-    proc{@dataset.limit(1, 1)}.should_not raise_error(Sequel::Error)
+    proc{@dataset.limit(1, 0)}.should_not raise_error
+    proc{@dataset.limit(1, 1)}.should_not raise_error
   end
 end
 
@@ -4508,3 +4508,8 @@ describe "Dataset#escape_like" do
   end
 end
 
+describe "Dataset#supports_replace?" do
+  it "should be false by default" do
+    Sequel::Dataset.new(nil).supports_replace?.should be_false
+  end
+end

data/spec/core/expression_filters_spec.rb

@@ -429,7 +429,7 @@ describe Sequel::SQL::VirtualRow do
   end
 
   it "should raise an error if an unsupported argument is used with a block" do
-    proc{@d.l{count(:blah){}}}.should raise_error(Sequel::Error)
+    proc{@d.where{count(:blah){}}}.should raise_error(Sequel::Error)
   end
 
   it "should treat methods with a block and a leading argument :over as a window function call" do

data/spec/core/schema_spec.rb

@@ -446,7 +446,7 @@ describe "DB#create_table" do
     meta_def(@db, :execute_ddl){|*a| raise Sequel::DatabaseError if /blah/.match(a.first); super(*a)}
     lambda{@db.create_table(:cats){Integer :id; index :blah; index :id}}.should raise_error(Sequel::DatabaseError)
     @db.sqls.should == ['CREATE TABLE cats (id integer)']
-    lambda{@db.create_table(:cats, :ignore_index_errors=>true){Integer :id; index :blah; index :id}}.should_not raise_error(Sequel::DatabaseError)
+    lambda{@db.create_table(:cats, :ignore_index_errors=>true){Integer :id; index :blah; index :id}}.should_not raise_error
     @db.sqls.should == ['CREATE TABLE cats (id integer)', 'CREATE INDEX cats_id_index ON cats (id)']
   end
 
@@ -551,6 +551,14 @@ describe "DB#create_table" do
     @db.sqls.should == ["CREATE TABLE cats (score integer, CONSTRAINT valid_score CHECK (score <= 100))"]
   end
 
+  specify "should accept named constraint definitions with options" do
+    @db.create_table(:cats) do
+      integer :score
+      constraint({:name=>:valid_score, :deferrable=>true}, 'score <= 100')
+    end
+    @db.sqls.should == ["CREATE TABLE cats (score integer, CONSTRAINT valid_score CHECK (score <= 100) DEFERRABLE INITIALLY DEFERRED)"]
+  end
+
   specify "should accept named constraint definitions with block" do
     @db.create_table(:cats) do
       constraint(:blah_blah){(x.sql_number > 0) & (y.sql_number < 1)}
@@ -892,6 +900,13 @@ describe "DB#alter_table" do
     @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT valid_score CHECK (score <= 100)"]
   end
 
+  specify "should support add_constraint with options" do
+    @db.alter_table(:cats) do
+      add_constraint({:name=>:valid_score, :deferrable=>true}, 'score <= 100')
+    end
+    @db.sqls.should == ["ALTER TABLE cats ADD CONSTRAINT valid_score CHECK (score <= 100) DEFERRABLE INITIALLY DEFERRED"]
+  end
+
   specify "should support add_constraint with block" do
     @db.alter_table(:cats) do
       add_constraint(:blah_blah){(x.sql_number > 0) & (y.sql_number < 1)}
@@ -950,7 +965,7 @@ describe "DB#alter_table" do
   specify "should ignore errors if the database raises an error on an add_index call and the :ignore_errors option is used" do
     meta_def(@db, :execute_ddl){|*a| raise Sequel::DatabaseError}
     lambda{@db.add_index(:cats, :id)}.should raise_error(Sequel::DatabaseError)
-    lambda{@db.add_index(:cats, :id, :ignore_errors=>true)}.should_not raise_error(Sequel::DatabaseError)
+    lambda{@db.add_index(:cats, :id, :ignore_errors=>true)}.should_not raise_error
     @db.sqls.should == []
   end
 

data/spec/extensions/caching_spec.rb

@@ -125,12 +125,12 @@ describe Sequel::Model, "caching" do
     m = @c.new
     proc {m.cache_key}.should raise_error(Sequel::Error)
     m.values[:id] = 1
-    proc {m.cache_key}.should_not raise_error(Sequel::Error)
+    proc {m.cache_key}.should_not raise_error
 
     m = @c2.new
     proc {m.cache_key}.should raise_error(Sequel::Error)
     m.values[:id] = 1
-    proc {m.cache_key}.should_not raise_error(Sequel::Error)
+    proc {m.cache_key}.should_not raise_error
   end
   
   it "should not raise error if trying to save a new record" do

data/spec/extensions/hook_class_methods_spec.rb

@@ -184,7 +184,6 @@ describe "Model#before_create && Model#after_create" do
 
   specify ".create should cancel the save and raise an error if before_create returns false and raise_on_save_failure is true" do
     @c.before_create{false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.create(:x => 2)}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -215,7 +214,6 @@ describe "Model#before_update && Model#after_update" do
 
   specify "#save should cancel the save and raise an error if before_update returns false and raise_on_save_failure is true" do
     @c.before_update{false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -254,7 +252,6 @@ describe "Model#before_save && Model#after_save" do
 
   specify "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
     @c.before_save{false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -339,7 +336,6 @@ describe "Model#before_validation && Model#after_validation" do
 
   specify "#save should cancel the save and raise an error if before_validation returns false and raise_on_save_failure is true" do
     @c.before_validation{false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end

data/spec/extensions/instance_filters_spec.rb

@@ -28,6 +28,28 @@ describe "instance_filters plugin" do
     DB.sqls.should == ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
   end 
   
+  specify "should work when using the prepared_statements plugin" do
+    @c.plugin :prepared_statements
+
+    @p.update(:name=>'Bob')
+    DB.sqls.should == ["UPDATE people SET name = 'Bob' WHERE (id = 1)"]
+    @p.instance_filter(:name=>'Jim')
+    @p.this.numrows = 0
+    proc{@p.update(:name=>'Joe')}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
+    DB.sqls.should == ["UPDATE people SET name = 'Joe' WHERE ((id = 1) AND (name = 'Jim'))"]
+
+    @p = @c.load(:id=>1, :name=>'John', :num=>1)
+    @p.this.numrows = 1
+    @p.destroy
+    DB.sqls.should == ["DELETE FROM people WHERE (id = 1)"]
+    @p.instance_filter(:name=>'Jim')
+    @p.this.numrows = 0
+    proc{@p.destroy}.should raise_error(Sequel::Plugins::InstanceFilters::Error)
+    DB.sqls.should == ["DELETE FROM people WHERE ((id = 1) AND (name = 'Jim'))"]
+    
+    @c.create.should be_a_kind_of(@c)
+  end 
+  
   specify "should apply all instance filters" do
     @p.instance_filter(:name=>'Jim')
     @p.instance_filter{num > 2}

data/spec/extensions/migration_spec.rb

@@ -194,19 +194,19 @@ describe "Reversible Migrations with Sequel.migration{change{}}" do
   
   specify "should raise in the down direction if migration uses unsupported method" do
     m = Sequel.migration{change{run 'SQL'}}
-    proc{m.apply(@db, :up)}.should_not raise_error(Sequel::Error)
+    proc{m.apply(@db, :up)}.should_not raise_error
     proc{m.apply(@db, :down)}.should raise_error(Sequel::Error)
   end
   
   specify "should raise in the down direction if migration uses add_primary_key with an array" do
     m = Sequel.migration{change{alter_table(:a){add_primary_key [:b]}}}
-    proc{m.apply(@db, :up)}.should_not raise_error(Sequel::Error)
+    proc{m.apply(@db, :up)}.should_not raise_error
     proc{m.apply(@db, :down)}.should raise_error(Sequel::Error)
   end
   
   specify "should raise in the down direction if migration uses add_foreign_key with an array" do
     m = Sequel.migration{change{alter_table(:a){add_foreign_key [:b]}}}
-    proc{m.apply(@db, :up)}.should_not raise_error(Sequel::Error)
+    proc{m.apply(@db, :up)}.should_not raise_error
     proc{m.apply(@db, :down)}.should raise_error(Sequel::Error)
   end
 end
@@ -263,7 +263,7 @@ describe "Sequel::IntegerMigrator" do
   end
   
   specify "should not raise and error if there is a missing integer migration version and allow_missing_migration_files is true" do
-    Sequel::Migrator.run(@db, "spec/files/missing_integer_migrations", :allow_missing_migration_files => true).should_not raise_error(Sequel::Migrator::Error)
+    proc{Sequel::Migrator.run(@db, "spec/files/missing_integer_migrations", :allow_missing_migration_files => true)}.should_not raise_error
   end
 
   specify "should raise and error if there is a duplicate integer migration version" do
@@ -622,7 +622,7 @@ describe "Sequel::TimestampMigrator" do
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253851_create_nodes.rb 1273253853_3_create_users.rb'
 
     @dir = 'spec/files/missing_timestamped_migrations'
-    proc{@m.run(@db, @dir, :allow_missing_migration_files => true)}.should_not raise_error(Sequel::Migrator::Error)
+    proc{@m.run(@db, @dir, :allow_missing_migration_files => true)}.should_not raise_error
     [:schema_migrations, :sm1111, :sm2222, :sm3333].each{|n| @db.table_exists?(n).should be_true}
     @db[:schema_migrations].select_order_map(:filename).should == %w'1273253849_create_sessions.rb 1273253851_create_nodes.rb 1273253853_3_create_users.rb'
   end

data/spec/extensions/nested_attributes_spec.rb

@@ -340,7 +340,7 @@ describe "NestedAttributes plugin" do
     @Album.nested_attributes :artist
     proc{a.set(:artist_attributes=>{:id=>'20', :_delete=>'1'})}.should raise_error(Sequel::Error)
     @Album.nested_attributes :artist, :destroy=>true
-    proc{a.set(:artist_attributes=>{:id=>'20', :_delete=>'1'})}.should_not raise_error(Sequel::Error)
+    proc{a.set(:artist_attributes=>{:id=>'20', :_delete=>'1'})}.should_not raise_error
   end
   
   it "should only allow removing associated objects if :remove option is used in the nested_attributes call" do
@@ -350,7 +350,7 @@ describe "NestedAttributes plugin" do
     @Album.nested_attributes :artist
     proc{a.set(:artist_attributes=>{:id=>'20', :_remove=>'1'})}.should raise_error(Sequel::Error)
     @Album.nested_attributes :artist, :remove=>true
-    proc{a.set(:artist_attributes=>{:id=>'20', :_remove=>'1'})}.should_not raise_error(Sequel::Error)
+    proc{a.set(:artist_attributes=>{:id=>'20', :_remove=>'1'})}.should_not raise_error
   end
   
   it "should raise an Error if a primary key is given in a nested attribute hash, but no matching associated object exists" do
@@ -358,7 +358,7 @@ describe "NestedAttributes plugin" do
     ar = @Artist.load(:id=>20, :name=>'Ar')
     ar.associations[:albums] = [al]
     proc{ar.set(:albums_attributes=>[{:id=>30, :_delete=>'t'}])}.should raise_error(Sequel::Error)
-    proc{ar.set(:albums_attributes=>[{:id=>10, :_delete=>'t'}])}.should_not raise_error(Sequel::Error)
+    proc{ar.set(:albums_attributes=>[{:id=>10, :_delete=>'t'}])}.should_not raise_error
   end
   
   it "should not raise an Error if an unmatched primary key is given, if the :strict=>false option is used" do
@@ -388,7 +388,7 @@ describe "NestedAttributes plugin" do
     co = @Concert.load(:tour=>'To', :date=>'2004-04-05', :playlist=>'Pl')
     ar.associations[:concerts] = [co]
     proc{ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-04', :_delete=>'t'}])}.should raise_error(Sequel::Error)
-    proc{ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-05', :_delete=>'t'}])}.should_not raise_error(Sequel::Error)
+    proc{ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-05', :_delete=>'t'}])}.should_not raise_error
   end
 
   it "should not raise an Error if an unmatched composite primary key is given, if the :strict=>false option is used" do

data/spec/extensions/prepared_statements_spec.rb

@@ -16,37 +16,48 @@ describe "prepared_statements plugin" do
     @db.sqls.should == ["SELECT * FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
   end 
 
-  specify "should correctly delete instance" do
-    @p.destroy.should == @p
-    @db.sqls.should == ["DELETE FROM people WHERE (id = 1)"]
-  end
-
-  specify "should correctly update instance" do
-    @p.update(:name=>'bar').should == @c.load(:id=>1, :name=>'bar', :i => 2)
-    @db.sqls.should == ["UPDATE people SET name = 'bar' WHERE (id = 1)"]
-  end
-
-  specify "should correctly create instance" do
-    @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
-    @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
-  end
+  shared_examples_for "prepared_statements plugin" do
+    specify "should correctly delete instance" do
+      @p.destroy.should == @p
+      @db.sqls.should == ["DELETE FROM people WHERE (id = 1)"]
+    end
 
-  specify "should correctly create instance if dataset supports insert_select" do
-    ds = @c.instance_dataset 
-    def ds.supports_insert_select?
-      true
+    specify "should correctly update instance" do
+      @p.update(:name=>'bar').should == @c.load(:id=>1, :name=>'bar', :i => 2)
+      @db.sqls.should == ["UPDATE people SET name = 'bar' WHERE (id = 1)"]
     end
-    def @ds.supports_insert_select?
-      true
+
+    specify "should correctly create instance" do
+      @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
+      @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo')", "SELECT * FROM people WHERE (id = 1) LIMIT 1"]
     end
-    def @ds.insert_select(h)
-      {:id=>1, :name=>'foo', :i => 2}
+
+    specify "should correctly create instance if dataset supports insert_select" do
+      @c.dataset_module do
+        def supports_insert_select?
+          true
+        end
+        def insert_select(h)
+          self._fetch = {:id=>1, :name=>'foo', :i => 2}
+          returning.server(:default).with_sql(:insert_sql, h).first
+        end
+        def insert_sql(*)
+          "#{super}#{' RETURNING *' if opts.has_key?(:returning)}"
+        end
+      end
+      @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
+      @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo') RETURNING *"]
     end
-    def @ds.insert_sql(*)
-      "#{super}#{' RETURNING *' if opts.has_key?(:returning)}"
+  end
+
+  it_should_behave_like "prepared_statements plugin"
+
+  describe "when #use_prepared_statements_for? returns false" do
+    before do
+      @c.class_eval{def use_prepared_statements_for?(type) false end}
     end
-    @c.create(:name=>'foo').should == @c.load(:id=>1, :name=>'foo', :i => 2)
-    @db.sqls.should == ["INSERT INTO people (name) VALUES ('foo') RETURNING *"]
+
+    it_should_behave_like "prepared_statements plugin"
   end
 
   specify "should work correctly when subclassing" do

data/spec/extensions/update_primary_key_spec.rb

@@ -68,6 +68,19 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
     DB.sqls.should == ["SELECT * FROM a LIMIT 1", "UPDATE a SET a = 2 WHERE (a = 1)", "UPDATE a SET b = 4 WHERE (a = 2)", "UPDATE a SET b = 5 WHERE (a = 2)", "SELECT * FROM a"]
   end
 
+  specify "should work correctly when using the prepared_statements plugin" do
+    @c.plugin :prepared_statements
+    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
+    o = @c.first
+    o.update(:a=>2, :b=>4)
+    @c.all.should == [@c.load(:a=>2, :b=>4)]
+    sqls = DB.sqls
+    ["UPDATE a SET a = 2, b = 4 WHERE (a = 1)", "UPDATE a SET b = 4, a = 2 WHERE (a = 1)"].should include(sqls.slice!(1))
+    sqls.should == ["SELECT * FROM a LIMIT 1", "SELECT * FROM a"]
+
+    o.delete
+  end
+
   specify "should clear the associations cache of non-many_to_one associations when changing the primary key" do
     @c.one_to_many :cs, :class=>@c
     @c.many_to_one :c, :class=>@c

data/spec/integration/dataset_test.rb

@@ -1671,3 +1671,39 @@ describe "Emulated functions" do
     @ds.get(Sequel.trim(:a)).should == 'foo22'
   end
 end
+
+describe "Dataset replace" do
+  before do
+    DB.create_table(:items){Integer :id, :unique=>true; Integer :value}
+    sqls = []
+    DB.loggers << Class.new{%w'info error'.each{|m| define_method(m){|sql| sqls << sql}}}.new
+
+    @d = DB[:items]
+    sqls.clear
+  end
+
+  after do
+    DB.drop_table?(:items)
+  end
+
+  specify "should use support arrays, datasets, and multiple values" do
+    @d.replace([1, 2])
+    @d.all.should == [{:id=>1, :value=>2}]
+    @d.replace(1, 2)
+    @d.all.should == [{:id=>1, :value=>2}]
+    @d.replace(@d)
+    @d.all.should == [{:id=>1, :value=>2}]
+  end
+
+  specify "should create a record if the condition is not met" do
+    @d.replace(:id => 111, :value => 333)
+    @d.all.should == [{:id => 111, :value => 333}]
+  end
+
+  specify "should update a record if the condition is met" do
+    @d << {:id => 111}
+    @d.all.should == [{:id => 111, :value => nil}]
+    @d.replace(:id => 111, :value => 333)
+    @d.all.should == [{:id => 111, :value => 333}]
+  end
+end if DB.dataset.supports_replace?

data/spec/model/associations_spec.rb

@@ -134,8 +134,8 @@ describe Sequel::Model, "associate" do
   it "should allow cloning of one_to_many to one_to_one associations and vice-versa" do
     c = Class.new(Sequel::Model(:c))
     c.one_to_one :c
-    proc{c.one_to_many :cs, :clone=>:c}.should_not raise_error(Sequel::Error)
-    proc{c.one_to_one :c2, :clone=>:cs}.should_not raise_error(Sequel::Error)
+    proc{c.one_to_many :cs, :clone=>:c}.should_not raise_error
+    proc{c.one_to_one :c2, :clone=>:cs}.should_not raise_error
   end
 
   it "should clear associations cache when refreshing object manually" do
@@ -1239,6 +1239,14 @@ describe Sequel::Model, "one_to_many" do
     DB.sqls.should == ["SELECT * FROM attributes WHERE id = 234", "UPDATE attributes SET node_id = 1234 WHERE (id = 234)"]
   end
 
+  it "should raise an error if the primary key passed to the add_ method does not match an existing record" do
+    @c2.one_to_many :attributes, :class => @c1
+    n = @c2.new(:id => 1234)
+    @c1.dataset._fetch = []
+    proc{n.add_attribute(234)}.should raise_error(Sequel::NoMatchingRow)
+    DB.sqls.should == ["SELECT * FROM attributes WHERE id = 234"]
+  end
+
   it "should raise an error in the add_ method if the passed associated object is not of the correct type" do
     @c2.one_to_many :attributes, :class => @c1
     proc{@c2.new(:id => 1234).add_attribute(@c2.new)}.should raise_error(Sequel::Error)
@@ -2013,6 +2021,16 @@ describe Sequel::Model, "many_to_many" do
     sqls.should == ["SELECT * FROM attributes WHERE id = 2345"]
   end
 
+  it "should raise an error if the primary key passed to the add_ method does not match an existing record" do
+    @c2.many_to_many :attributes, :class => @c1
+    
+    n = @c2.load(:id => 1234)
+    a = @c1.load(:id => 2345)
+    @c1.dataset._fetch = []
+    proc{n.add_attribute(2345)}.should raise_error(Sequel::NoMatchingRow)
+    DB.sqls.should == ["SELECT * FROM attributes WHERE id = 2345"]
+  end
+
   it "should allow passing a hash to the add_ method which creates a new record" do
     @c2.many_to_many :attributes, :class => @c1
     

data/spec/model/hooks_spec.rb

@@ -24,7 +24,7 @@ describe "Model#before_create && Model#after_create" do
     @c.send(:define_method, :before_create){false}
     proc{@c.create(:x => 2)}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
+    proc{@c.load(:id => 2233).save}.should_not raise_error
   end
 
   specify ".create should cancel the save and return nil if before_create returns false and raise_on_save_failure is false" do
@@ -55,7 +55,6 @@ describe "Model#before_update && Model#after_update" do
 
   specify "#save should cancel the save and raise an error if before_update returns false and raise_on_save_failure is true" do
     @c.send(:define_method, :before_update){false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -63,7 +62,6 @@ describe "Model#before_update && Model#after_update" do
   specify "#save should cancel the save and raise an error if before_update returns false and raise_on_failure option is true" do
     @c.send(:define_method, :before_update){false}
     @c.raise_on_save_failure = false
-    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -104,7 +102,6 @@ describe "Model#before_save && Model#after_save" do
 
   specify "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
     @c.send(:define_method, :before_save){false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -112,7 +109,6 @@ describe "Model#before_save && Model#after_save" do
   specify "#save should cancel the save and raise an error if before_save returns false and raise_on_failure option is true" do
     @c.send(:define_method, :before_save){false}
     @c.raise_on_save_failure = false
-    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -208,7 +204,6 @@ describe "Model#before_validation && Model#after_validation" do
 
   specify "#save should cancel the save and raise an error if before_validation returns false and raise_on_save_failure is true" do
     @c.send(:define_method, :before_validation){false}
-    proc{@c.load(:id => 2233).save}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end
@@ -216,7 +211,6 @@ describe "Model#before_validation && Model#after_validation" do
   specify "#save should cancel the save and raise an error if before_validation returns false and raise_on_failure option is true" do
     @c.send(:define_method, :before_validation){false}
     @c.raise_on_save_failure = false
-    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should_not raise_error(Sequel::ValidationFailed)
     proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
     DB.sqls.should == []
   end