sequel 4.41.0 → 4.42.0

data/spec/model/hooks_spec.rb

@@ -37,14 +37,14 @@ describe "Model#before_create && Model#after_create" do
   it ".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_equal nil
+    @c.create(:x => 2).must_be_nil
     DB.sqls.must_equal []
   end
 
   it ".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).must_equal nil
+    @c.create(:x => 2).must_be_nil
     DB.sqls.must_equal []
   end
 end
@@ -89,14 +89,14 @@ describe "Model#before_update && Model#after_update" do
   it "#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_equal nil
+    @c.load(:id => 2233).save.must_be_nil
     DB.sqls.must_equal []
   end
 
   it "#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.must_equal nil
+    @c.load(:id => 2233).save.must_be_nil
     DB.sqls.must_equal []
   end
 end
@@ -150,14 +150,14 @@ describe "Model#before_save && Model#after_save" do
   it "#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_equal nil
+    @c.load(:id => 2233).save.must_be_nil
     DB.sqls.must_equal []
   end
 
   it "#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.must_equal nil
+    @c.load(:id => 2233).save.must_be_nil
     DB.sqls.must_equal []
   end
 
@@ -207,14 +207,14 @@ describe "Model#before_destroy && Model#after_destroy" do
   it "#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_equal nil
+    @c.load(:id => 2233).destroy.must_be_nil
     DB.sqls.must_equal []
   end
 
   it "#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.must_equal nil
+    @c.load(:id => 2233).destroy.must_be_nil
     DB.sqls.must_equal []
   end
 end
@@ -253,7 +253,7 @@ describe "Model#before_validation && Model#after_validation" do
 
     m = @c.load(:id => 22)
     m.raise_on_save_failure = false
-    m.save.must_equal nil
+    m.save.must_be_nil
     DB.sqls.must_equal ['BLAH before', 'BLAH after']
   end
 
@@ -279,14 +279,14 @@ describe "Model#before_validation && Model#after_validation" do
   it "#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_equal nil
+    @c.load(:id => 2233).save.must_be_nil
     DB.sqls.must_equal []
   end
 
   it "#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.must_equal nil
+    @c.load(:id => 2233).save.must_be_nil
     DB.sqls.must_equal []
   end
   
@@ -431,19 +431,19 @@ describe "Model around filters" do
 
     o = @c.load(:id => 1)
     def o.around_save() end
-    o.save.must_equal nil
+    o.save.must_be_nil
 
     o = @c.load(:id => 1)
     def o.around_update() end
-    o.save.must_equal nil
+    o.save.must_be_nil
 
     o = @c.new
     def o.around_create() end
-    o.save.must_equal nil
+    o.save.must_be_nil
 
     o = @c.new
     def o.around_validation() end
-    o.save.must_equal nil
+    o.save.must_be_nil
   end
 end
 

data/spec/model/model_spec.rb

@@ -9,7 +9,7 @@ describe "Sequel::Model()" do
     ds = @db[:blah]
     c = Sequel::Model(ds)
     c.superclass.must_equal Sequel::Model
-    c.dataset.must_equal ds
+    c.dataset.row_proc.must_equal c
   end
 
   it "should return a model subclass with a dataset with the default database and given table name if given a Symbol" do
@@ -51,14 +51,14 @@ describe "Sequel::Model()" do
     ds = @db[Sequel.identifier(:blah)]
     c = Sequel::Model(ds)
     c.superclass.must_equal Sequel::Model
-    c.dataset.must_equal ds
+    c.dataset.row_proc.must_equal c
   end
 
   it "should be callable on Sequel::Model" do
     ds = @db[:blah]
     c = Sequel::Model::Model(ds)
     c.superclass.must_equal Sequel::Model
-    c.dataset.must_equal ds
+    c.dataset.row_proc.must_equal c
   end
 
   it "should be callable on subclasses of Sequel::Model" do
@@ -66,7 +66,7 @@ describe "Sequel::Model()" do
     c = Class.new(Sequel::Model)
     sc = c::Model(ds)
     sc.superclass.must_equal c
-    sc.dataset.must_equal ds
+    sc.dataset.row_proc.must_equal sc
   end
 
   it "should be callable on other modules if def_Model is used" do
@@ -75,7 +75,7 @@ describe "Sequel::Model()" do
     ds = @db[:blah]
     c = m::Model(ds)
     c.superclass.must_equal Sequel::Model
-    c.dataset.must_equal ds
+    c.dataset.row_proc.must_equal c
   end
 
   it "should be callable using model subclasses on other modules if def_Model is used" do
@@ -85,7 +85,7 @@ describe "Sequel::Model()" do
     ds = @db[:blah]
     sc = m::Model(ds)
     sc.superclass.must_equal c
-    sc.dataset.must_equal ds
+    sc.dataset.row_proc.must_equal sc
   end
 
   it "should return a model subclass associated to the given database if given a database" do
@@ -227,6 +227,12 @@ describe Sequel::Model do
     @model.table_name.must_equal :foo
   end
 
+  it "allows frozen dataset" do
+    @model.set_dataset(DB[:foo].freeze)
+    @model.table_name.must_equal :foo
+    @model.dataset.sql.must_equal 'SELECT * FROM foo'
+  end
+
   it "allows set_dataset to accept a Symbol" do
     @model.db = DB
     @model.set_dataset(:foo)
@@ -269,11 +275,10 @@ describe Sequel::Model do
   it "set_dataset should add the destroy method to the dataset that destroys each object" do
     ds = DB[:foo]
     ds.wont_respond_to(:destroy)
-    @model.set_dataset(ds)
+    ds = @model.set_dataset(ds).dataset
     ds.must_respond_to(:destroy)
     DB.sqls
-    ds._fetch = [{:id=>1}, {:id=>2}]
-    ds.destroy.must_equal 2
+    ds.with_fetch([{:id=>1}, {:id=>2}]).destroy.must_equal 2
     DB.sqls.must_equal ["SELECT * FROM foo", "DELETE FROM foo WHERE id = 1", "DELETE FROM foo WHERE id = 2"]
   end
 
@@ -281,7 +286,7 @@ describe Sequel::Model do
     db = Sequel.mock(:servers=>{:s1=>{}})
     ds = db[:foo].server(:s1)
     @model.use_transactions = true
-    @model.set_dataset(ds)
+    ds = @model.set_dataset(ds).dataset
     db.sqls
     ds.destroy.must_equal 0
     db.sqls.must_equal ["BEGIN -- s1", "SELECT * FROM foo -- s1", "COMMIT -- s1"]
@@ -462,8 +467,7 @@ describe Sequel::Model, "new" do
   end
 
   it "should use the last inserted id as primary key if not in values" do
-    @m.instance_dataset._fetch = @m.dataset._fetch = {:x => 1, :id => 1234}
-    @m.instance_dataset.autoid = @m.dataset.autoid = 1234
+    @m.dataset = @m.dataset.with_fetch(:x => 1, :id => 1234).with_autoid(1234)
 
     o = @m.new(:x => 1)
     o.save
@@ -508,7 +512,7 @@ end
 describe Sequel::Model, ".find" do
   before do
     @c = Class.new(Sequel::Model(:items))
-    @c.dataset._fetch = {:name => 'sharon', :id => 1}
+    @c.dataset = @c.dataset.with_fetch(:name => 'sharon', :id => 1)
     DB.reset
   end
   
@@ -874,7 +878,7 @@ describe Sequel::Model, "attribute accessors" do
       o.methods.collect{|z| z.to_s}.must_include(x)
     end
 
-    o.x.must_equal nil
+    o.x.must_be_nil
     o.x = 34
     o.x.must_equal 34
   end
@@ -912,7 +916,7 @@ end
 describe Sequel::Model, ".[]" do
   before do
     @c = Class.new(Sequel::Model(:items))
-    @c.dataset._fetch = {:name => 'sharon', :id => 1}
+    @c.dataset = @c.dataset.with_fetch(:name => 'sharon', :id => 1)
     DB.reset
   end
 
@@ -924,8 +928,8 @@ describe Sequel::Model, ".[]" do
   end
 
   it "should have #[] return nil if no rows match" do
-    @c.dataset._fetch = []
-    @c[1].must_equal nil
+    @c.dataset = @c.dataset.with_fetch([])
+    @c[1].must_be_nil
     DB.sqls.must_equal ["SELECT * FROM items WHERE id = 1"]
   end
 
@@ -971,12 +975,15 @@ describe "Model.db_schema" do
     def @db.schema(table, opts = {})
       raise Sequel::Error
     end
-    @dataset.instance_variable_set(:@columns, [:x, :y])
+    @dataset = @dataset.with_extend do
+      def columns
+        [:x, :y]
+      end
+    end
 
     @c.dataset = @dataset
     @c.db_schema.must_equal(:x=>{}, :y=>{})
     @c.columns.must_equal [:x, :y]
-    @c.dataset.instance_variable_get(:@columns).must_equal [:x, :y]
   end
 
   it "should use the database's schema and set the columns and dataset columns" do
@@ -986,7 +993,7 @@ describe "Model.db_schema" do
     @c.dataset = @dataset
     @c.db_schema.must_equal(:x=>{:type=>:integer}, :y=>{:type=>:string})
     @c.columns.must_equal [:x, :y]
-    @c.dataset.instance_variable_get(:@columns).must_equal [:x, :y]
+    @c.dataset.columns.must_equal [:x, :y]
   end
 
   it "should not restrict the schema for datasets with a :select option" do
@@ -1052,7 +1059,7 @@ describe "Model.db_schema" do
     @c.primary_key.must_equal :id
     @c.dataset = ds
     @c.db_schema.must_equal(:x=>{:primary_key=>false}, :y=>{:primary_key=>false})
-    @c.primary_key.must_equal nil
+    @c.primary_key.must_be_nil
   end
   
   it "should automatically set primary key for dataset selecting table.*" do

data/spec/model/plugins_spec.rb

@@ -284,16 +284,15 @@ describe Sequel::Plugins do
     m = Module.new do
       module self::ClassMethods
         Sequel::Plugins.after_set_dataset(self, :one)
+        def foo; dataset.send(:cache_get, :foo) end
         private
-        def one
-          dataset.opts[:foo] = 1
-        end
+        def one; dataset.send(:cache_set, :foo, 1) end
       end
     end
     @c.plugin m
-    @c.dataset.opts[:foo].must_equal nil
+    @c.foo.must_be_nil
     @c.set_dataset :blah
-    @c.dataset.opts[:foo].must_equal 1
+    @c.foo.must_equal 1
   end
 end
   

data/spec/model/record_spec.rb

@@ -57,7 +57,7 @@ describe "Model#save" do
     @c = Class.new(Sequel::Model(:items)) do
       columns :id, :x, :y
     end
-    @c.instance_dataset.autoid = @c.dataset.autoid = 13
+    @c.dataset = @c.dataset.with_autoid(13)
     DB.reset
   end
   
@@ -69,16 +69,16 @@ describe "Model#save" do
 
   it "should raise if the object can't be refreshed after save" do
     o = @c.new(:x => 1)
-    @c.instance_dataset._fetch =@c.dataset._fetch = []
+    @c.dataset = @c.dataset.with_fetch([])
     proc{o.save}.must_raise(Sequel::NoExistingObject)
   end
 
   it "should use dataset's insert_select method if present" do
-    ds = @c.instance_dataset
-    ds._fetch = {:y=>2}
-    def ds.supports_insert_select?() true end
-    def ds.insert_select(hash)
-      with_sql_first("INSERT INTO items (y) VALUES (2) RETURNING *")
+    @c.dataset = @c.dataset.with_fetch(:y=>2).with_extend do
+      def supports_insert_select?; true end
+      def insert_select(hash)
+        with_sql_first("INSERT INTO items (y) VALUES (2) RETURNING *")
+      end
     end
     o = @c.new(:x => 1)
     o.save
@@ -88,21 +88,19 @@ describe "Model#save" do
   end
 
   it "should not use dataset's insert_select method if specific columns are selected" do
-    ds = @c.dataset = @c.dataset.select(:y)
-    def ds.insert_select(*) raise; end
+    ds = @c.dataset = @c.dataset.select(:y).with_extend{def insert_select(*) raise; end}
     @c.new(:x => 1).save
   end
 
   it "should use dataset's insert_select method if the dataset uses returning, even if specific columns are selected" do
-    def (@c.dataset).supports_returning?(_) true end
-    ds = @c.dataset = @c.dataset.select(:y).returning(:y)
+    ds = @c.dataset = @c.dataset.select(:y).with_fetch(:y=>2).with_extend do
+      def supports_returning?(_) true end
+      def supports_insert_select?; true end
+      def insert_select(hash)
+        with_sql_first("INSERT INTO items (y) VALUES (2) RETURNING y")
+      end
+    end.returning(:y)
     DB.reset
-    ds = @c.instance_dataset
-    ds._fetch = {:y=>2}
-    def ds.supports_insert_select?() true end
-    def ds.insert_select(hash)
-      with_sql_first("INSERT INTO items (y) VALUES (2) RETURNING y")
-    end
     o = @c.new(:x => 1)
     o.save
     
@@ -149,19 +147,19 @@ describe "Model#save" do
   end
   
   it "should raise a NoExistingObject exception if the dataset update call doesn't return 1, unless require_modification is false" do
+    i = 0
+    @c.dataset = @c.dataset.with_extend{define_method(:numrows){i}}
     o = @c.load(:id => 3, :x => 1)
-    t = o.this
-    t.numrows = 0
     proc{o.save}.must_raise(Sequel::NoExistingObject)
-    t.numrows = 2
+    i = 2
     proc{o.save}.must_raise(Sequel::NoExistingObject)
-    t.numrows = 1
+    i = 1
     o.save
     
     o.require_modification = false
-    t.numrows = 0
+    i = 0
     o.save
-    t.numrows = 2
+    i = 2
     o.save
   end
   
@@ -190,7 +188,7 @@ describe "Model#save" do
   end
   
   it "should mark all columns as not changed if this is a new record and insert_select was used" do
-    def (@c.dataset).insert_select(h) h.merge(:id=>1) end
+    ds = @c.dataset = @c.dataset.with_extend{def insert_select(h) h.merge(:id=>1) end}
     o = @c.new(:x => 1, :y => nil)
     o.x = 4
     o.changed_columns.must_equal [:x]
@@ -309,7 +307,7 @@ describe "Model#save" do
       false
     end
     DB.transaction do
-      o.save(:columns=>:y).must_equal nil
+      o.save(:columns=>:y).must_be_nil
       DB.run "BLAH"
     end
     DB.sqls.must_equal ["BEGIN", "BLAH", "COMMIT"]
@@ -322,7 +320,7 @@ describe "Model#save" do
     def o.before_save
       false
     end
-    o.save(:columns=>:y).must_equal nil
+    o.save(:columns=>:y).must_be_nil
     DB.sqls.must_equal ["BEGIN", "ROLLBACK"]
   end
 
@@ -499,11 +497,13 @@ describe "Model#dup" do
   end
 
   it "should not copy frozen status" do
-    @o.freeze.dup.wont_be :frozen?
-    @o.freeze.dup.values.wont_be :frozen?
-    @o.freeze.dup.changed_columns.wont_be :frozen?
-    @o.freeze.dup.errors.wont_be :frozen?
-    @o.freeze.dup.this.wont_be :frozen?
+    this_frozen = @o.this.frozen?
+    d = @o.freeze.dup
+    d.wont_be :frozen?
+    d.values.wont_be :frozen?
+    d.changed_columns.wont_be :frozen?
+    d.errors.wont_be :frozen?
+    d.this.frozen?.must_equal this_frozen
   end
 end
 
@@ -820,7 +820,7 @@ end
 
 describe Sequel::Model, "without a primary key" do
   it "should return nil for primary key" do
-    Class.new(Sequel::Model){no_primary_key}.primary_key.must_equal nil
+    Class.new(Sequel::Model){no_primary_key}.primary_key.must_be_nil
   end
 
   it "should raise a Sequel::Error on 'this'" do
@@ -1304,9 +1304,9 @@ describe Sequel::Model, "#(set|update)_(all|only)" do
   end
 
   it "#set_all should set not set restricted fields" do
-    @o1.use_after_commit_rollback.must_equal nil
+    @o1.use_after_commit_rollback.must_be_nil
     @o1.set_all(:x => 1, :use_after_commit_rollback => true)
-    @o1.use_after_commit_rollback.must_equal nil
+    @o1.use_after_commit_rollback.must_be_nil
     @o1.values.must_equal(:x => 1)
   end
 
@@ -1345,17 +1345,18 @@ describe Sequel::Model, "#destroy with filtered dataset" do
   end
 
   it "should raise a NoExistingObject exception if the dataset delete call doesn't return 1" do
-    def (@instance.this).execute_dui(*a) 0 end
+    i = 0
+    @model.dataset = @model.dataset.with_extend{define_method(:execute_dui){|*| i}}
     proc{@instance.delete}.must_raise(Sequel::NoExistingObject)
-    def (@instance.this).execute_dui(*a) 2 end
+    i = 2
     proc{@instance.delete}.must_raise(Sequel::NoExistingObject)
-    def (@instance.this).execute_dui(*a) 1 end
+    i = 1
     @instance.delete
     
     @instance.require_modification = false
-    def (@instance.this).execute_dui(*a) 0 end
+    i = 0
     @instance.delete
-    def (@instance.this).execute_dui(*a) 2 end
+    i = 2
     @instance.delete
   end
 
@@ -1379,17 +1380,18 @@ describe Sequel::Model, "#destroy" do
   end
   
   it "should raise a NoExistingObject exception if the dataset delete call doesn't return 1" do
-    def (@model.dataset).execute_dui(*a) 0 end
+    i = 0
+    @model.dataset = @model.dataset.with_extend{define_method(:execute_dui){|*| i}}
     proc{@instance.delete}.must_raise(Sequel::NoExistingObject)
-    def (@model.dataset).execute_dui(*a) 2 end
+    i = 2
     proc{@instance.delete}.must_raise(Sequel::NoExistingObject)
-    def (@model.dataset).execute_dui(*a) 1 end
+    i = 1
     @instance.delete
     
     @instance.require_modification = false
-    def (@model.dataset).execute_dui(*a) 0 end
+    i = 0
     @instance.delete
-    def (@model.dataset).execute_dui(*a) 2 end
+    i = 2
     @instance.delete
   end
 
@@ -1428,7 +1430,7 @@ end
 describe Sequel::Model, "#exists?" do
   before do
     @model = Class.new(Sequel::Model(:items))
-    @model.instance_dataset._fetch = @model.dataset._fetch = proc{|sql| {:x=>1} if sql =~ /id = 1/}
+    @model.dataset = @model.dataset.with_fetch(proc{|sql| {:x=>1} if sql =~ /id = 1/})
     DB.reset
   end
 
@@ -1736,7 +1738,7 @@ describe Sequel::Model, "#refresh" do
   it "should reload the instance values from the database" do
     @m = @c.new(:id => 555)
     @m[:x] = 'blah'
-    @c.instance_dataset._fetch = @c.dataset._fetch = {:x => 'kaboom', :id => 555}
+    @c.dataset = @c.dataset.with_fetch(:x => 'kaboom', :id => 555)
     @m.refresh
     @m[:x].must_equal 'kaboom'
     DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) LIMIT 1"]
@@ -1744,14 +1746,14 @@ describe Sequel::Model, "#refresh" do
   
   it "should raise if the instance is not found" do
     @m = @c.new(:id => 555)
-    @c.instance_dataset._fetch =@c.dataset._fetch = []
+    @c.dataset = @c.dataset.with_fetch([])
     proc {@m.refresh}.must_raise(Sequel::NoExistingObject)
     DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) LIMIT 1"]
   end
   
   it "should be aliased by #reload" do
     @m = @c.new(:id => 555)
-    @c.instance_dataset._fetch =@c.dataset._fetch = {:x => 'kaboom', :id => 555}
+    @c.dataset = @c.dataset.with_fetch(:x => 'kaboom', :id => 555)
     @m.reload
     @m[:x].must_equal 'kaboom'
     DB.sqls.must_equal ["SELECT * FROM items WHERE (id = 555) LIMIT 1"]
@@ -1795,7 +1797,7 @@ describe Sequel::Model, "typecasting" do
       @c.db_schema = {:x=>{:type=>x}}
       m = @c.new
       m.x = ''
-      m.x.must_equal nil
+      m.x.must_be_nil
     end
    [:string, :blob].each do |x|
       @c.db_schema = {:x=>{:type=>x}}
@@ -1826,7 +1828,7 @@ describe Sequel::Model, "typecasting" do
     @c.db_schema[:x][:allow_null] = true
     m = @c.new
     m.x = nil
-    m.x.must_equal nil
+    m.x.must_be_nil
   end
 
   it "should raise an error if attempting to typecast nil and NULLs are not allowed" do
@@ -1840,7 +1842,7 @@ describe Sequel::Model, "typecasting" do
     @c.db_schema[:x][:allow_null] = false
     m = @c.new
     m.x = nil
-    m.x.must_equal nil
+    m.x.must_be_nil
   end
 
   it "should not raise when typecasting nil to NOT NULL column but raise_on_typecast_failure is off" do
@@ -1848,9 +1850,9 @@ describe Sequel::Model, "typecasting" do
     @c.typecast_on_assignment = true
     m = @c.new
     m.x = ''
-    m.x.must_equal nil
+    m.x.must_be_nil
     m.x = nil
-    m.x.must_equal nil
+    m.x.must_be_nil
   end
 
   it "should raise an error if invalid data is used in an integer field" do
@@ -1950,11 +1952,11 @@ describe Sequel::Model, "typecasting" do
     m.x = true
     m.x.must_equal true
     m.x = nil
-    m.x.must_equal nil
+    m.x.must_be_nil
     m.x = ''
-    m.x.must_equal nil
+    m.x.must_be_nil
     m.x = []
-    m.x.must_equal nil
+    m.x.must_be_nil
     m.x = 'f'
     m.x.must_equal false
     m.x = 'F'
@@ -2123,7 +2125,7 @@ describe "Model#lock!" do
     @c = Class.new(Sequel::Model(:items)) do
       columns :id
     end
-    @c.dataset._fetch = {:id=>1}
+    @c.dataset = @c.dataset.with_fetch(:id=>1)
     DB.reset
   end