sequel 4.44.0 → 4.45.0

data/spec/model/association_reflection_spec.rb

@@ -650,6 +650,10 @@ describe "Sequel::Model.finalize_associations" do
     Object.send(:remove_const, :OtoItem)
   end
 
+  it "AssociationReflection should have default finalize_settings method" do
+    Sequel::Model::Associations::AssociationReflection.new.finalize_settings[:associated_class].must_equal :class
+  end
+
   it "should finalize many_to_one associations" do
     r = Item.association_reflection(:item)
     r[:class].must_equal Item

data/spec/model/associations_spec.rb

@@ -447,12 +447,14 @@ describe Sequel::Model, "many_to_one" do
     DB.reset
     d.parent_id = 234
     d.associations[:parent] = 42
-    d.parent(true).wont_equal 42 
-    DB.sqls.must_equal ["SELECT * FROM nodes WHERE id = 234"]
     d.parent(:reload=>true).wont_equal 42 
     DB.sqls.must_equal ["SELECT * FROM nodes WHERE id = 234"]
-    d.parent(Object.new).wont_equal 42 
-    DB.sqls.must_equal ["SELECT * FROM nodes WHERE id = 234"]
+    deprecated do
+      d.parent(true).wont_equal 42 
+      DB.sqls.must_equal ["SELECT * FROM nodes WHERE id = 234"]
+      d.parent(Object.new).wont_equal 42 
+      DB.sqls.must_equal ["SELECT * FROM nodes WHERE id = 234"]
+    end
   end
   
   it "should use a callback if given one as the argument" do
@@ -462,7 +464,7 @@ describe Sequel::Model, "many_to_one" do
     DB.reset
     d.parent_id = 234
     d.associations[:parent] = 42
-    d.parent(proc{|ds| ds.filter{name > 'M'}}).wont_equal 42 
+    d.parent{|ds| ds.where{name > 'M'}}.wont_equal 42 
     DB.sqls.must_equal ["SELECT * FROM nodes WHERE ((nodes.id = 234) AND (name > 'M')) LIMIT 1"]
   end
   
@@ -995,8 +997,12 @@ describe Sequel::Model, "one_to_one" do
     @c2.one_to_one :parent, :class => @c2
     d = @c2.load(:id => 1)
     d.associations[:parent] = [42]
-    d.parent(true).wont_equal 42 
+    d.parent(:reload=>true).wont_equal 42 
     DB.sqls.must_equal ["SELECT * FROM nodes WHERE (nodes.node_id = 1) LIMIT 1"]
+    deprecated do
+      d.parent(true).wont_equal 42 
+      DB.sqls.must_equal ["SELECT * FROM nodes WHERE (nodes.node_id = 1) LIMIT 1"]
+    end
   end
   
   it "should have the setter set the reciprocal many_to_one cached association" do
@@ -1223,7 +1229,16 @@ describe Sequel::Model, "one_to_many" do
     end
   end
 
-  it "should use a callback if given one as the argument" do
+  it "should use a callback if given one as a block" do
+    @c2.one_to_many :attributes, :class => @c1, :key => :nodeid
+    
+    d = @c2.load(:id => 1234)
+    d.associations[:attributes] = []
+    d.attributes{|ds| ds.where{name > 'M'}}.wont_equal []
+    DB.sqls.must_equal ["SELECT * FROM attributes WHERE ((attributes.nodeid = 1234) AND (name > 'M'))"]
+  end
+  
+  deprecated "should use a callback if given one as the argument" do
     @c2.one_to_many :attributes, :class => @c1, :key => :nodeid
     
     d = @c2.load(:id => 1234)
@@ -1552,8 +1567,12 @@ describe Sequel::Model, "one_to_many" do
     @c2.one_to_many :attributes, :class => @c1
     n = @c2.new(:id => 1234)
     n.associations[:attributes] = 42
-    n.attributes(true).wont_equal 42
+    n.attributes(:reload=>true).wont_equal 42
     DB.sqls.must_equal ['SELECT * FROM attributes WHERE (attributes.node_id = 1234)']
+    deprecated do
+      n.attributes(true).wont_equal 42
+      DB.sqls.must_equal ['SELECT * FROM attributes WHERE (attributes.node_id = 1234)']
+    end
   end
 
   it "should add item to cache if it exists when calling add_" do
@@ -2416,8 +2435,12 @@ describe Sequel::Model, "many_to_many" do
 
     n = @c2.new(:id => 1234)
     n.associations[:attributes] = 42
-    n.attributes(true).wont_equal 42
+    n.attributes(:reload=>true).wont_equal 42
     DB.sqls.must_equal ["SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id = 1234)"]
+    deprecated do
+      n.attributes(true).wont_equal 42
+      DB.sqls.must_equal ["SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id = 1234)"]
+    end
   end
 
   it "should add item to cache if it exists when calling add_" do
@@ -3004,8 +3027,12 @@ describe Sequel::Model, "one_through_one" do
 
     n = @c2.new(:id => 1234)
     n.associations[:attribute] = 42
-    n.attribute(true).wont_equal 42
+    n.attribute(:reload=>true).wont_equal 42
     DB.sqls.must_equal ["SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id = 1234) LIMIT 1"]
+    deprecated do
+      n.attribute(true).wont_equal 42
+      DB.sqls.must_equal ["SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON (attributes_nodes.attribute_id = attributes.id) WHERE (attributes_nodes.node_id = 1234) LIMIT 1"]
+    end
   end
 
   it "should not add associations methods directly to class" do

data/spec/model/base_spec.rb

@@ -285,6 +285,12 @@ describe Sequel::Model, ".dataset_module" do
     @c.where(:foo).released.sql.must_equal 'SELECT * FROM items WHERE (foo AND released)'
   end
 
+  if Sequel::Model.dataset_module_class == Sequel::Model::DatasetModule
+    it "should have dataset_module not support an eager method" do
+      proc{@c.dataset_module{eager :foo}}.must_raise NoMethodError
+    end
+  end
+
   it "should have dataset_module support a having method" do
     @c.dataset_module{having(:released){released}}
     @c.released.sql.must_equal 'SELECT * FROM items HAVING released'

data/spec/model/hooks_spec.rb

@@ -20,7 +20,7 @@ describe "Model#before_create && Model#after_create" do
     DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after', 'SELECT * FROM items WHERE x = 2']
   end
 
-  it ".create should cancel the save and raise an error if before_create returns false and raise_on_save_failure is true" do
+  deprecated ".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)}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
@@ -34,7 +34,7 @@ describe "Model#before_create && Model#after_create" do
     @c.load(:id => 2233).save
   end
 
-  it ".create should cancel the save and return nil if before_create returns false and raise_on_save_failure is false" do
+  deprecated ".create should cancel the save and return nil if before_create returns false and raise_on_save_failure is false" do
     @c.send(:define_method, :before_create){false}
     @c.raise_on_save_failure = false
     @c.create(:x => 2).must_be_nil
@@ -67,7 +67,7 @@ describe "Model#before_update && Model#after_update" do
     DB.sqls.must_equal ['BLAH before', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'BLAH after']
   end
 
-  it "#save should cancel the save and raise an error if before_update returns false and raise_on_save_failure is true" do
+  deprecated "#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}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
@@ -79,14 +79,14 @@ describe "Model#before_update && Model#after_update" do
     DB.sqls.must_equal []
   end
 
-  it "#save should cancel the save and raise an error if before_update returns false and raise_on_failure option is true" do
+  deprecated "#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)}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  it "#save should cancel the save and return nil if before_update returns false and raise_on_save_failure is false" do
+  deprecated "#save should cancel the save and return nil if before_update returns false and raise_on_save_failure is false" do
     @c.send(:define_method, :before_update){false}
     @c.raise_on_save_failure = false
     @c.load(:id => 2233).save.must_be_nil
@@ -127,13 +127,13 @@ describe "Model#before_save && Model#after_save" do
     DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after', 'SELECT * FROM items WHERE x = 2']
   end
 
-  it "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
+  deprecated "#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}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  it "#save should cancel the save and raise an error if before_save returns false and raise_on_failure option is true" do
+  deprecated "#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)}.must_raise(Sequel::HookFailed)
@@ -147,7 +147,7 @@ describe "Model#before_save && Model#after_save" do
     DB.sqls.must_equal []
   end
 
-  it "#save should cancel the save and return nil if before_save returns false and raise_on_save_failure is false" do
+  deprecated "#save should cancel the save and return nil if before_save returns false and raise_on_save_failure is false" do
     @c.send(:define_method, :before_save){false}
     @c.raise_on_save_failure = false
     @c.load(:id => 2233).save.must_be_nil
@@ -162,7 +162,7 @@ describe "Model#before_save && Model#after_save" do
   end
 
   it "#save should have a raised exception reference the model instance" do
-    @c.send(:define_method, :before_save){false}
+    @c.send(:define_method, :before_save){cancel_action}
     proc{@c.create(:x => 2233)}.must_raise(Sequel::HookFailed){|e| e.model.must_equal @c.load(:x=>2233)}
     DB.sqls.must_equal []
   end
@@ -185,7 +185,7 @@ describe "Model#before_destroy && Model#after_destroy" do
     DB.sqls.must_equal ['BLAH before', 'DELETE FROM items WHERE id = 2233', 'BLAH after']
   end
 
-  it "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_save_failure is true" do
+  deprecated "#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}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
@@ -197,14 +197,14 @@ describe "Model#before_destroy && Model#after_destroy" do
     DB.sqls.must_equal []
   end
 
-  it "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_failure option is true" do
+  deprecated "#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)}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  it "#destroy should cancel the destroy and return nil if before_destroy returns false and raise_on_save_failure is false" do
+  deprecated "#destroy should cancel the destroy and return nil if before_destroy returns false and raise_on_save_failure is false" do
     @c.send(:define_method, :before_destroy){false}
     @c.raise_on_save_failure = false
     @c.load(:id => 2233).destroy.must_be_nil
@@ -257,13 +257,13 @@ describe "Model#before_validation && Model#after_validation" do
     DB.sqls.must_equal ['BLAH before', 'BLAH after']
   end
 
-  it "#save should cancel the save and raise an error if before_validation returns false and raise_on_save_failure is true" do
+  deprecated "#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}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  it "#save should cancel the save and raise an error if before_validation returns false and raise_on_failure option is true" do
+  deprecated "#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)}.must_raise(Sequel::HookFailed)
@@ -276,7 +276,7 @@ describe "Model#before_validation && Model#after_validation" do
     DB.sqls.must_equal []
   end
 
-  it "#save should cancel the save and return nil if before_validation returns false and raise_on_save_failure is false" do
+  deprecated "#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.must_be_nil
@@ -290,7 +290,12 @@ describe "Model#before_validation && Model#after_validation" do
     DB.sqls.must_equal []
   end
   
-  it "#valid? should return false if before_validation returns false" do
+  it "#valid? should return false if before_validation calls cancel_action" do
+    @c.send(:define_method, :before_validation){cancel_action}
+    @c.load(:id => 2233).valid?.must_equal false
+  end
+  
+  deprecated "#valid? should return false if before_validation returns false" do
     @c.send(:define_method, :before_validation){false}
     @c.load(:id => 2233).valid?.must_equal false
   end
@@ -379,6 +384,22 @@ describe "Model around filters" do
     DB.sqls.must_equal [ 'av_before', 'validate', 'av_after' ]
   end
 
+  it "around_validation should handle cancel_action" do
+    @c.class_eval do
+      def around_validation
+        DB << 'av_before'
+        cancel_action
+        super
+        DB << 'av_after'
+      end
+      def validate
+        DB << 'validate'
+      end
+    end
+    @c.new(:x => 2).valid?.must_equal false
+    DB.sqls.must_equal [ 'av_before' ]
+  end
+
   it "around_validation should be able to catch validation errors and modify them" do
     @c.class_eval do
       def validate
@@ -480,25 +501,25 @@ describe "Model#after_commit and #after_rollback" do
     @db.sqls
   end
 
-  it "should call after_commit for save after the transaction commits if it commits" do
+  deprecated "should call after_commit for save after the transaction commits if it commits" do
     @o.save
     @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT', 'ac']
   end
 
-  it "should call after_rollback for save after the transaction rolls back if it rolls back" do
+  deprecated "should call after_rollback for save after the transaction rolls back if it rolls back" do
     @o.rb = true
     @o.save
     @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK', 'ar']
   end
 
-  it "should have after_commit respect any surrounding transactions" do
+  deprecated "should have after_commit respect any surrounding transactions" do
     @db.transaction do
       @o.save
     end
     @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT', 'ac']
   end
 
-  it "should have after_rollback respect any surrounding transactions" do
+  deprecated "should have after_rollback respect any surrounding transactions" do
     @db.transaction do
       @o.rb = true
       @o.save
@@ -506,14 +527,14 @@ describe "Model#after_commit and #after_rollback" do
     @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK', 'ar']
   end
 
-  it "should have after_commit work with surrounding transactions and sharding" do
+  deprecated "should have after_commit work with surrounding transactions and sharding" do
     @db.transaction(:server=>:test) do
       @o.save
     end
     @db.sqls.must_equal ['BEGIN -- test', 'BEGIN', 'as', 'COMMIT', 'ac', 'COMMIT -- test']
   end
 
-  it "should have after_rollback work with surrounding transactions and sharding" do
+  deprecated "should have after_rollback work with surrounding transactions and sharding" do
     @db.transaction(:server=>:test) do
       @o.rb = true
       @o.save
@@ -521,25 +542,25 @@ describe "Model#after_commit and #after_rollback" do
     @db.sqls.must_equal ['BEGIN -- test', 'BEGIN', 'as', 'ROLLBACK', 'ar', 'COMMIT -- test']
   end
 
-  it "should call after_destroy_commit for destroy after the transaction commits if it commits" do
+  deprecated "should call after_destroy_commit for destroy after the transaction commits if it commits" do
     @o.destroy
     @db.sqls.must_equal ['BEGIN', 'ad', 'COMMIT', 'adc']
   end
 
-  it "should call after_destroy_rollback for destroy after the transaction rolls back if it rolls back" do
+  deprecated "should call after_destroy_rollback for destroy after the transaction rolls back if it rolls back" do
     @o.rb = true
     @o.destroy
     @db.sqls.must_equal ['BEGIN', 'ad', 'ROLLBACK', 'adr']
   end
 
-  it "should have after_destroy_commit respect any surrounding transactions" do
+  deprecated "should have after_destroy_commit respect any surrounding transactions" do
     @db.transaction do
       @o.destroy
     end
     @db.sqls.must_equal ['BEGIN', 'ad', 'COMMIT', 'adc']
   end
 
-  it "should have after_destroy_rollback respect any surrounding transactions" do
+  deprecated "should have after_destroy_rollback respect any surrounding transactions" do
     @db.transaction do
       @o.rb = true
       @o.destroy
@@ -547,14 +568,14 @@ describe "Model#after_commit and #after_rollback" do
     @db.sqls.must_equal ['BEGIN', 'ad', 'ROLLBACK', 'adr']
   end
 
-  it "should have after_destroy commit work with surrounding transactions and sharding" do
+  deprecated "should have after_destroy commit work with surrounding transactions and sharding" do
     @db.transaction(:server=>:test) do
       @o.destroy
     end
     @db.sqls.must_equal ['BEGIN -- test', 'BEGIN', 'ad', 'COMMIT', 'adc', 'COMMIT -- test']
   end
 
-  it "should have after_destroy_rollback work with surrounding transactions and sharding" do
+  deprecated "should have after_destroy_rollback work with surrounding transactions and sharding" do
     @db.transaction(:server=>:test) do
       @o.rb = true
       @o.destroy
@@ -562,39 +583,39 @@ describe "Model#after_commit and #after_rollback" do
     @db.sqls.must_equal ['BEGIN -- test', 'BEGIN', 'ad', 'ROLLBACK', 'adr', 'COMMIT -- test']
   end
 
-  it "should not call after_commit if use_after_commit_rollback is false" do
+  deprecated "should not call after_commit if use_after_commit_rollback is false" do
     @o.use_after_commit_rollback = false
     @o.save
     @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT']
   end
 
-  it "should not call after_rollback if use_after_commit_rollback is false" do
+  deprecated "should not call after_rollback if use_after_commit_rollback is false" do
     @o.use_after_commit_rollback = false
     @o.rb = true
     @o.save
     @db.sqls.must_equal ['BEGIN', 'as', 'ROLLBACK']
   end
 
-  it "should not call after_destroy_commit if use_after_commit_rollback is false" do
+  deprecated "should not call after_destroy_commit if use_after_commit_rollback is false" do
     @o.use_after_commit_rollback = false
     @o.destroy
     @db.sqls.must_equal ['BEGIN', 'ad', 'COMMIT']
   end
 
-  it "should not call after_destroy_rollback for save if use_after_commit_rollback is false" do
+  deprecated "should not call after_destroy_rollback for save if use_after_commit_rollback is false" do
     @o.use_after_commit_rollback = false
     @o.rb = true
     @o.destroy
     @db.sqls.must_equal ['BEGIN', 'ad', 'ROLLBACK']
   end
 
-  it "should handle use_after_commit_rollback at the class level" do
+  deprecated "should handle use_after_commit_rollback at the class level" do
     @m.use_after_commit_rollback = false
     @o.save
     @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT']
   end
 
-  it "should handle use_after_commit_rollback when subclassing" do
+  deprecated "should handle use_after_commit_rollback when subclassing" do
     @m.use_after_commit_rollback = false
     o = Class.new(@m).load({})
     @db.sqls
@@ -602,7 +623,7 @@ describe "Model#after_commit and #after_rollback" do
     @db.sqls.must_equal ['BEGIN', 'as', 'COMMIT']
   end
 
-  it "should handle use_after_commit_rollback when subclassing after loading" do
+  deprecated "should handle use_after_commit_rollback when subclassing after loading" do
     @m = Class.new(Sequel::Model(@db[:items]))
     @m.use_transactions = true
     o = @m.load({})

data/spec/model/model_spec.rb

@@ -102,17 +102,19 @@ describe "Sequel::Model()" do
 
   describe "reloading" do
     before do
-      Sequel.cache_anonymous_models = true
+      Sequel::Model.cache_anonymous_models = true
     end
     after do
-      Sequel.cache_anonymous_models = false
+      Sequel::Model.cache_anonymous_models = false
       Object.send(:remove_const, :Album) if defined?(::Album)
     end
 
-    it "Sequel.cache_anonymous_models should return value for Sequel::Model" do
+    deprecated "Sequel.cache_anonymous_models should return value for Sequel::Model" do
       Sequel.cache_anonymous_models.must_equal true
       Sequel::Model.cache_anonymous_models = false
       Sequel.cache_anonymous_models.must_equal false
+      Sequel.cache_anonymous_models = true
+      Sequel.cache_anonymous_models.must_equal true
     end
 
     it "should work without raising an exception with a symbol" do
@@ -156,14 +158,14 @@ describe "Sequel::Model()" do
     end
 
     it "should raise an exception if anonymous model caching is disabled" do
-      Sequel.cache_anonymous_models = false
+      Sequel::Model.cache_anonymous_models = false
       proc do
         class ::Album < Sequel::Model(@db[Sequel.identifier(:table)]); end
         class ::Album < Sequel::Model(@db[Sequel.identifier(:table)]); end
       end.must_raise TypeError
     end
 
-    it "should use separate cache and cache settings for subclasses" do
+    it "should use separate anonymous cache for subclasses" do
       c = Class.new(Sequel::Model)
       c.cache_anonymous_models.must_equal true
       class ::Album < c::Model(:table); end
@@ -268,6 +270,16 @@ describe Sequel::Model do
     DB.reset
   end
 
+  deprecated "should allow dup/clone" do
+    @model.dup.must_be :<, @model.superclass
+    @model.clone.must_be :<, @model.superclass
+  end
+
+  it "should not allow dup/clone" do
+    proc{@model.dup}.must_raise Sequel::Error
+    proc{@model.clone}.must_raise Sequel::Error
+  end if false # SEQUEL5
+
   it "has table_name return name of table" do
     @model.table_name.must_equal :items
   end
@@ -1043,6 +1055,10 @@ describe "Model.db_schema" do
     @c.dataset = @dataset
     @c.db_schema.must_equal(:x=>{}, :y=>{})
     @c.columns.must_equal [:x, :y]
+
+    @c.instance_eval{@db_schema = nil}
+    @c.db_schema.must_equal(:x=>{}, :y=>{})
+    @c.columns.must_equal [:x, :y]
   end
 
   it "should use the database's schema and set the columns and dataset columns" do