sequel 4.18.0 → 4.19.0

data/spec/extensions/migration_spec.rb

@@ -278,7 +278,10 @@ 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
-    proc{Sequel::Migrator.run(@db, "spec/files/missing_integer_migrations", :allow_missing_migration_files => true)}.should_not raise_error
+    Sequel::Migrator.run(@db, "spec/files/missing_integer_migrations", :allow_missing_migration_files => true)
+    @db.sqls.last.should == "UPDATE schema_info SET version = 3"
+    Sequel::Migrator.run(@db, "spec/files/missing_integer_migrations", :allow_missing_migration_files => true, :target=>0)
+    @db.sqls.last.should == "UPDATE schema_info SET version = 0"
   end
 
   specify "should raise and error if there is a duplicate integer migration version" do

data/spec/extensions/static_cache_spec.rb

@@ -261,17 +261,17 @@ describe "Sequel::Plugins::StaticCache with :frozen=>false option" do
     end
 
     it "should not allow the saving of new objects" do
-      proc{@c.create}.should raise_error(Sequel::BeforeHookFailed)
+      proc{@c.create}.should raise_error(Sequel::HookFailed)
     end
 
     it "should not allow the saving of existing objects" do
       @db.fetch = {:id=>1}
-      proc{@c.first(:id=>1).save}.should raise_error(Sequel::BeforeHookFailed)
+      proc{@c.first(:id=>1).save}.should raise_error(Sequel::HookFailed)
     end
 
     it "should not allow the destroying of existing objects" do
       @db.fetch = {:id=>1}
-      proc{@c.first(:id=>1).destroy}.should raise_error(Sequel::BeforeHookFailed)
+      proc{@c.first(:id=>1).destroy}.should raise_error(Sequel::HookFailed)
     end
   end
 

data/spec/model/hooks_spec.rb

@@ -22,7 +22,14 @@ 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.send(:define_method, :before_create){false}
-    proc{@c.create(:x => 2)}.should raise_error(Sequel::BeforeHookFailed)
+    proc{@c.create(:x => 2)}.should raise_error(Sequel::HookFailed)
+    DB.sqls.should == []
+    proc{@c.load(:id => 2233).save}.should_not raise_error
+  end
+
+  specify ".create should cancel the save and raise an error if before_create calls cancel_action and raise_on_save_failure is true" do
+    @c.send(:define_method, :before_create){cancel_action 'not good'}
+    proc{@c.create(:x => 2)}.should raise_error(Sequel::HookFailed, 'not good')
     DB.sqls.should == []
     proc{@c.load(:id => 2233).save}.should_not raise_error
   end
@@ -33,6 +40,13 @@ describe "Model#before_create && Model#after_create" do
     @c.create(:x => 2).should == nil
     DB.sqls.should == []
   end
+
+  specify ".create should cancel the save and return nil if before_create calls cancel_action and raise_on_save_failure is false" do
+    @c.send(:define_method, :before_create){cancel_action}
+    @c.raise_on_save_failure = false
+    @c.create(:x => 2).should == nil
+    DB.sqls.should == []
+  end
 end
 
 describe "Model#before_update && Model#after_update" do
@@ -55,14 +69,20 @@ 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 raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::HookFailed)
+    DB.sqls.should == []
+  end
+
+  specify "#save should cancel the save and raise an error if before_update calls cancel_action and raise_on_save_failure is true" do
+    @c.send(:define_method, :before_update){cancel_action}
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
   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 raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
@@ -72,6 +92,13 @@ describe "Model#before_update && Model#after_update" do
     @c.load(:id => 2233).save.should == nil
     DB.sqls.should == []
   end
+
+  specify "#save should cancel the save and return nil if before_update calls cancel_action and raise_on_save_failure is false" do
+    @c.send(:define_method, :before_update){cancel_action}
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).save.should == nil
+    DB.sqls.should == []
+  end
 end
 
 describe "Model#before_save && Model#after_save" do
@@ -102,14 +129,21 @@ 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 raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
   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 raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::HookFailed)
+    DB.sqls.should == []
+  end
+
+  specify "#save should cancel the save and raise an error if before_save calls cancel_action and raise_on_failure option is true" do
+    @c.send(:define_method, :before_save){cancel_action}
+    @c.raise_on_save_failure = false
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
@@ -120,6 +154,13 @@ describe "Model#before_save && Model#after_save" do
     DB.sqls.should == []
   end
 
+  specify "#save should cancel the save and return nil if before_save calls cancel_action and raise_on_save_failure is false" do
+    @c.send(:define_method, :before_save){cancel_action}
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).save.should == nil
+    DB.sqls.should == []
+  end
+
   specify "#save should have a raised exception reference the model instance" do
     @c.send(:define_method, :before_save){false}
     proc{@c.create(:x => 2233)}.should raise_error(Sequel::HookFailed){|e| e.model.should == @c.load(:x=>2233)}
@@ -146,14 +187,20 @@ describe "Model#before_destroy && Model#after_destroy" do
 
   specify "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_save_failure is true" do
     @c.send(:define_method, :before_destroy){false}
-    proc{@c.load(:id => 2233).destroy}.should raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).destroy}.should raise_error(Sequel::HookFailed)
+    DB.sqls.should == []
+  end
+
+  specify "#destroy should cancel the destroy and raise an error if before_destroy calls cancel_action and raise_on_save_failure is true" do
+    @c.send(:define_method, :before_destroy){cancel_action; true}
+    proc{@c.load(:id => 2233).destroy}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
   specify "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_failure option is true" do
     @c.send(:define_method, :before_destroy){false}
     @c.raise_on_save_failure = false
-    proc{@c.load(:id => 2233).destroy(:raise_on_failure => true)}.should raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).destroy(:raise_on_failure => true)}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
@@ -163,6 +210,13 @@ describe "Model#before_destroy && Model#after_destroy" do
     @c.load(:id => 2233).destroy.should == nil
     DB.sqls.should == []
   end
+
+  specify "#destroy should cancel the destroy and return nil if before_destroy calls cancel_action and raise_on_save_failure is false" do
+    @c.send(:define_method, :before_destroy){cancel_action; true}
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).destroy.should == nil
+    DB.sqls.should == []
+  end
 end
 
 describe "Model#before_validation && Model#after_validation" do
@@ -204,23 +258,36 @@ 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 raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
 
   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 raise_error(Sequel::BeforeHookFailed)
+    proc{@c.load(:id => 2233).save(:raise_on_failure => true)}.should raise_error(Sequel::HookFailed)
     DB.sqls.should == []
   end
   
+  specify "#save should cancel the save and raise an error if before_validation calls cancel_action and raise_on_save_failure is true" do
+    @c.send(:define_method, :before_validation){cancel_action}
+    proc{@c.load(:id => 2233).save}.should raise_error(Sequel::HookFailed)
+    DB.sqls.should == []
+  end
+
   specify "#save should cancel the save and return nil if before_validation returns false and raise_on_save_failure is false" do
     @c.send(:define_method, :before_validation){false}
     @c.raise_on_save_failure = false
     @c.load(:id => 2233).save.should == nil
     DB.sqls.should == []
   end
+
+  specify "#save should cancel the save and return nil if before_validation calls cancel_action and raise_on_save_failure is false" do
+    @c.send(:define_method, :before_validation){cancel_action}
+    @c.raise_on_save_failure = false
+    @c.load(:id => 2233).save.should == nil
+    DB.sqls.should == []
+  end
   
   specify "#valid? should return false if before_validation returns false" do
     @c.send(:define_method, :before_validation){false}

data/spec/model/record_spec.rb

@@ -16,6 +16,21 @@ describe "Model#values" do
   end
 end
 
+describe "Model#get_column_value and set_column_value" do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+    @c.columns :x
+    @o = @c.load(:x=>1)
+  end
+
+  it "should get and set column values" do
+    @o.get_column_value(:x).should == 1
+    @o.set_column_value(:x=, 2)
+    @o.get_column_value(:x).should == 2
+    @o.x.should == 2
+  end
+end
+
 describe "Model#save server use" do
   before do
     @db = Sequel.mock(:autoid=>proc{|sql| 10}, :fetch=>{:x=>1, :id=>10}, :servers=>{:blah=>{}, :read_only=>{}})
@@ -254,7 +269,18 @@ describe "Model#save" do
     def o.before_save
       false
     end
-    proc { o.save(:columns=>:y) }.should raise_error(Sequel::BeforeHookFailed)
+    proc { o.save(:columns=>:y) }.should raise_error(Sequel::HookFailed)
+    DB.sqls.should == ["BEGIN", "ROLLBACK"]
+  end
+
+  it "should rollback if before_save calls cancel_action 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
+      cancel_action
+    end
+    proc { o.save(:columns=>:y) }.should raise_error(Sequel::HookFailed)
     DB.sqls.should == ["BEGIN", "ROLLBACK"]
   end
 
@@ -265,7 +291,7 @@ describe "Model#save" do
     def o.before_save
       false
     end
-    proc { o.save(:columns=>:y, :raise_on_failure => true) }.should raise_error(Sequel::BeforeHookFailed)
+    proc { o.save(:columns=>:y, :raise_on_failure => true) }.should raise_error(Sequel::HookFailed)
     DB.sqls.should == ["BEGIN", "ROLLBACK"]
   end
 
@@ -1171,6 +1197,21 @@ describe Sequel::Model, "#set_fields" do
     o.set_fields({:x => 3}, [:x, :y])
     o.values.should == {:x => 3}
   end
+
+  it "should respect set_column_value" do
+    @c.class_eval do
+      def set_column_value(c, v)
+        if c.to_s == 'model='
+          self[:model] = v
+        else
+          send(c, v)
+        end
+      end
+    end
+    @o1.set_fields({:model=>2, :x=>3}, [:model, :x])
+    @o1[:model].should == 2
+    @o1.x.should == 3
+  end
 end
 
 describe Sequel::Model, "#update_fields" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.18.0
+  version: 4.19.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -191,6 +191,7 @@ extra_rdoc_files:
 - doc/release_notes/4.16.0.txt
 - doc/release_notes/4.17.0.txt
 - doc/release_notes/4.18.0.txt
+- doc/release_notes/4.19.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -296,6 +297,7 @@ files:
 - doc/release_notes/4.16.0.txt
 - doc/release_notes/4.17.0.txt
 - doc/release_notes/4.18.0.txt
+- doc/release_notes/4.19.0.txt
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt
@@ -483,6 +485,7 @@ files:
 - lib/sequel/model/inflections.rb
 - lib/sequel/model/plugins.rb
 - lib/sequel/no_core_ext.rb
+- lib/sequel/plugins/accessed_columns.rb
 - lib/sequel/plugins/active_model.rb
 - lib/sequel/plugins/after_initialize.rb
 - lib/sequel/plugins/association_autoreloading.rb
@@ -494,6 +497,7 @@ files:
 - lib/sequel/plugins/boolean_readers.rb
 - lib/sequel/plugins/caching.rb
 - lib/sequel/plugins/class_table_inheritance.rb
+- lib/sequel/plugins/column_conflicts.rb
 - lib/sequel/plugins/column_select.rb
 - lib/sequel/plugins/composition.rb
 - lib/sequel/plugins/constraint_validations.rb
@@ -576,6 +580,7 @@ files:
 - spec/core/spec_helper.rb
 - spec/core/version_spec.rb
 - spec/core_extensions_spec.rb
+- spec/extensions/accessed_columns_spec.rb
 - spec/extensions/active_model_spec.rb
 - spec/extensions/after_initialize_spec.rb
 - spec/extensions/arbitrary_servers_spec.rb
@@ -588,6 +593,7 @@ files:
 - spec/extensions/boolean_readers_spec.rb
 - spec/extensions/caching_spec.rb
 - spec/extensions/class_table_inheritance_spec.rb
+- spec/extensions/column_conflicts_spec.rb
 - spec/extensions/column_select_spec.rb
 - spec/extensions/columns_introspection_spec.rb
 - spec/extensions/composition_spec.rb