sequel 3.6.0 → 3.7.0

data/spec/model/model_spec.rb

@@ -565,3 +565,29 @@ context "Model.db_schema" do
     @c.primary_key.should == :id
   end
 end
+
+context "Model#use_transactions" do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+  end
+
+  specify "should return class value by default" do
+    @c.use_transactions = true
+    @c.new.use_transactions.should == true
+    @c.use_transactions = false
+    @c.new.use_transactions.should == false
+  end
+
+  specify "should return set value if manually set" do
+    instance = @c.new
+    instance.use_transactions = false
+    instance.use_transactions.should == false
+    @c.use_transactions = true
+    instance.use_transactions.should == false
+    
+    instance.use_transactions = true
+    instance.use_transactions.should == true
+    @c.use_transactions = false
+    instance.use_transactions.should == true
+  end
+end

data/spec/model/record_spec.rb

@@ -158,7 +158,7 @@ describe "Model#save" do
     res.should == [nil, nil]
   end
   
-  it "should use Model's save_in_transaction setting by default" do
+  it "should use Model's use_transactions setting by default" do
     @c.use_transactions = true
     @c.load(:id => 3, :x => 1, :y => nil).save(:y)
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
@@ -169,7 +169,7 @@ describe "Model#save" do
     MODEL_DB.reset
   end
 
-  it "should inherit Model's save_in_transaction setting" do
+  it "should inherit Model's use_transactions setting" do
     @c.use_transactions = true
     Class.new(@c).load(:id => 3, :x => 1, :y => nil).save(:y)
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
@@ -180,7 +180,7 @@ describe "Model#save" do
     MODEL_DB.reset
   end
 
-  it "should use object's save_in_transaction setting" do
+  it "should use object's use_transactions setting" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.use_transactions = false
     @c.use_transactions = true
@@ -207,6 +207,56 @@ describe "Model#save" do
     MODEL_DB.sqls.should == ["BEGIN", "UPDATE items SET y = NULL WHERE (id = 3)", "COMMIT"]
     MODEL_DB.reset
   end
+
+  it "should rollback if before_save returns false and raise_on_save_failure = true" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.use_transactions = true
+    o.raise_on_save_failure = true
+    def o.before_save
+      false
+    end
+    proc { o.save(:y) }.should raise_error(Sequel::BeforeHookFailed)
+    MODEL_DB.sqls.should == ["BEGIN", "ROLLBACK"]
+    MODEL_DB.reset
+  end
+
+  it "should not rollback outer transactions if before_save returns false and raise_on_save_failure = false" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.use_transactions = true
+    o.raise_on_save_failure = false
+    def o.before_save
+      false
+    end
+    MODEL_DB.transaction do
+      o.save(:y).should == nil
+      MODEL_DB.run "BLAH"
+    end
+    MODEL_DB.sqls.should == ["BEGIN", "BLAH", "COMMIT"]
+    MODEL_DB.reset
+  end
+
+  it "should rollback if before_save returns false and raise_on_save_failure = false" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.use_transactions = true
+    o.raise_on_save_failure = false
+    def o.before_save
+      false
+    end
+    o.save(:y).should == nil
+    MODEL_DB.sqls.should == ["BEGIN", "ROLLBACK"]
+    MODEL_DB.reset
+  end
+
+  it "should not rollback if before_save throws Rollback and use_transactions = false" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.use_transactions = false
+    def o.before_save
+      raise Sequel::Rollback
+    end
+    proc { o.save(:y) }.should raise_error(Sequel::Rollback)
+    MODEL_DB.sqls.should == []
+    MODEL_DB.reset
+  end
 end
 
 describe "Model#marshallable" do
@@ -760,6 +810,18 @@ describe Sequel::Model, "#destroy" do
     @instance.destroy
   end
 
+  it "should run within a transaction if :transaction option is true" do
+    @instance.use_transactions = false
+    @model.db.should_receive(:transaction)
+    @instance.destroy(:transaction => true)
+  end
+
+  it "should not run within a transaction if :transaction option is false" do
+    @instance.use_transactions = true
+    @model.db.should_not_receive(:transaction)
+    @instance.destroy(:transaction => false)
+  end
+
   it "should run before_destroy and after_destroy hooks" do
     @model.send(:define_method, :before_destroy){MODEL_DB.execute('before blah')}
     @model.send(:define_method, :after_destroy){MODEL_DB.execute('after blah')}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.6.0
+  version: 3.7.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-12-01 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt
+- doc/release_notes/3.7.0.txt
 files: 
 - COPYING
 - CHANGELOG
@@ -94,6 +95,7 @@ files:
 - doc/release_notes/3.4.0.txt
 - doc/release_notes/3.5.0.txt
 - doc/release_notes/3.6.0.txt
+- doc/release_notes/3.7.0.txt
 - doc/schema.rdoc
 - doc/sharding.rdoc
 - doc/virtual_rows.rdoc
@@ -176,7 +178,6 @@ files:
 - spec/model/spec_helper.rb
 - spec/model/validations_spec.rb
 - spec/rcov.opts
-- spec/spec.opts
 - spec/spec_config.rb
 - spec/spec_config.rb.example
 - lib/sequel.rb