sequel 4.41.0 → 4.42.0

data/spec/integration/dataset_test.rb

@@ -357,11 +357,6 @@ describe "Simple dataset operations with nasty table names" do
   before do
     @db = DB
     @table = :"i`t' [e]\"m\\s" 
-    @qi = @db.quote_identifiers?
-    @db.quote_identifiers = true
-  end
-  after do
-    @db.quote_identifiers = @qi
   end
 
   cspecify "should work correctly", :oracle, :sqlanywhere, [:jdbc, :mssql] do
@@ -378,7 +373,7 @@ describe "Simple dataset operations with nasty table names" do
     @ds.count.must_equal 0
     @db.drop_table?(@table)
   end 
-end
+end if DB.dataset.quote_identifiers?
 
 describe Sequel::Dataset do
   before do
@@ -396,8 +391,12 @@ describe Sequel::Dataset do
     @d.count.must_equal 0
     @d << {:name => 'abc', :value => 123}
     @d << {:name => 'abc', :value => 456}
-    @d << {:name => 'def', :value => 789}
-    @d.count.must_equal 3
+    @d << {:name => 'def', :value => nil}
+    5.times do
+      @d.count.must_equal 3
+      @d.count(:name).must_equal 3
+      @d.count(:value).must_equal 2
+    end
   end
 
   it "should handle functions with identifier names correctly" do
@@ -455,7 +454,7 @@ describe Sequel::Dataset do
     @d << {:name => 'abc', :value => 456}
     @d << {:name => 'def', :value => 789}
     @d.count.must_equal 3
-    @d.truncate.must_equal nil
+    @d.truncate.must_be_nil
     @d.count.must_equal 0
   end
 
@@ -1435,7 +1434,6 @@ describe "Sequel::Dataset DSL support" do
   
   it "should work with multiple value arrays" do
     @ds.insert(20, 10)
-    @ds = @ds.with_quote_identifiers(false)
     @ds.filter([:a, :b]=>[[20, 10]]).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter([:a, :b]=>[[10, 20]]).all.must_equal []
     @ds.filter([:a, :b]=>[[20, 10], [1, 2]]).all.must_equal [{:a=>20, :b=>10}]
@@ -1449,7 +1447,7 @@ describe "Sequel::Dataset DSL support" do
 
   it "should work with IN/NOT in with datasets" do
     @ds.insert(20, 10)
-    ds = @ds.unordered.with_quote_identifiers(false)
+    ds = @ds.unordered
 
     @ds.filter(:a=>ds.select(:a)).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter(:a=>ds.select(:a).where(:a=>15)).all.must_equal []
@@ -1484,10 +1482,10 @@ describe "Sequel::Dataset DSL support" do
     unless Sequel.guarded?(:mssql, :oracle, :db2, :sqlanywhere)
       # Some databases don't like boolean results in the select list
       pr = proc{|r| r.is_a?(Integer) ? (r != 0) : r}
-      pr[@ds.get(Sequel.expr(:a=>[]))].must_equal nil
-      pr[@ds.get(~Sequel.expr(:a=>[]))].must_equal nil
-      pr[@ds.get(Sequel.expr([:a, :b]=>[]))].must_equal nil
-      pr[@ds.get(~Sequel.expr([:a, :b]=>[]))].must_equal nil
+      pr[@ds.get(Sequel.expr(:a=>[]))].must_be_nil
+      pr[@ds.get(~Sequel.expr(:a=>[]))].must_be_nil
+      pr[@ds.get(Sequel.expr([:a, :b]=>[]))].must_be_nil
+      pr[@ds.get(~Sequel.expr([:a, :b]=>[]))].must_be_nil
     end
   end
   
@@ -1531,7 +1529,7 @@ describe "SQL Extract Function" do
   
   it "should return the part of the datetime asked for" do
     t = Time.now
-    @ds = @ds.with_extend(Module.new do def supports_timestamp_timezones?() false end end)
+    @ds = @ds.with_extend{def supports_timestamp_timezones?() false end}
     @ds.insert(t)
     @ds.get{a.extract(:year)}.must_equal t.year
     @ds.get{a.extract(:month)}.must_equal t.month
@@ -1725,7 +1723,7 @@ describe "Dataset identifier methods" do
   it "should work when not quoting identifiers" do
     @ds.with_quote_identifiers(false).first.must_equal(:ab=>1)
   end
-end
+end if IDENTIFIER_MANGLING
 
 describe "Dataset defaults and overrides" do
   before(:all) do
@@ -1806,7 +1804,7 @@ describe "Emulated functions" do
   end
   
   it "Sequel.char_length should return the length of characters in the string" do
-    @ds.get(Sequel.char_length(:a)).must_equal nil
+    @ds.get(Sequel.char_length(:a)).must_be_nil
     @ds.insert(:a=>'foo')
     @ds.get(Sequel.char_length(:a)).must_equal 3
     # Check behavior with leading/trailing blanks
@@ -1815,7 +1813,7 @@ describe "Emulated functions" do
   end
   
   it "Sequel.trim should return the string with spaces trimmed from both sides" do
-    @ds.get(Sequel.trim(:a)).must_equal nil
+    @ds.get(Sequel.trim(:a)).must_be_nil
     @ds.insert(:a=>'foo')
     @ds.get(Sequel.trim(:a)).must_equal 'foo'
     # Check behavior with leading/trailing blanks

data/spec/integration/eager_loader_test.rb

@@ -103,7 +103,7 @@ describe "Eagerly loading a tree structure" do
     nodes.length.must_equal 2
     nodes.collect{|x| x.pk}.must_equal [3, 7]
     nodes.first.parent.pk.must_equal 1
-    nodes.first.parent.parent.must_equal nil
+    nodes.first.parent.parent.must_be_nil
     node = nodes.last
     node.parent.pk.must_equal 6
     node = node.parent
@@ -114,7 +114,7 @@ describe "Eagerly loading a tree structure" do
     node.parent.pk.must_equal 2
     node = node.parent
     node.parent.pk.must_equal 1
-    node.parent.parent.must_equal nil
+    node.parent.parent.must_be_nil
   end
 end
 
@@ -291,7 +291,7 @@ describe "has_many :through has_many and has_one :through belongs_to" do
     firm.must_equal @firm1
     @invoice1.client.must_equal @client1
     @invoice1.client.firm.must_equal @firm1
-    firm.associations[:clients].must_equal nil
+    firm.associations[:clients].must_be_nil
   end
 
   it "should eagerly load has_one :through belongs_to records for multiple objects" do
@@ -300,23 +300,23 @@ describe "has_many :through has_many and has_one :through belongs_to" do
     invs[0].firm.must_equal @firm1
     invs[0].client.must_equal @client1
     invs[0].client.firm.must_equal @firm1
-    invs[0].firm.associations[:clients].must_equal nil
+    invs[0].firm.associations[:clients].must_be_nil
     invs[1].firm.must_equal @firm1
     invs[1].client.must_equal @client1
     invs[1].client.firm.must_equal @firm1
-    invs[1].firm.associations[:clients].must_equal nil
+    invs[1].firm.associations[:clients].must_be_nil
     invs[2].firm.must_equal @firm1
     invs[2].client.must_equal @client2
     invs[2].client.firm.must_equal @firm1
-    invs[2].firm.associations[:clients].must_equal nil
+    invs[2].firm.associations[:clients].must_be_nil
     invs[3].firm.must_equal @firm2
     invs[3].client.must_equal @client3
     invs[3].client.firm.must_equal @firm2
-    invs[3].firm.associations[:clients].must_equal nil
+    invs[3].firm.associations[:clients].must_be_nil
     invs[4].firm.must_equal @firm2
     invs[4].client.must_equal @client3
     invs[4].client.firm.must_equal @firm2
-    invs[4].firm.associations[:clients].must_equal nil
+    invs[4].firm.associations[:clients].must_be_nil
   end
 end
 
@@ -415,9 +415,9 @@ describe "Polymorphic Associations" do
     @asset2.attachable_id.must_equal @post.pk
     @asset2.attachable_type.must_equal 'Post'
     @asset1.attachable = nil
-    @asset1.attachable.must_equal nil
-    @asset1.attachable_id.must_equal nil
-    @asset1.attachable_type.must_equal nil
+    @asset1.attachable.must_be_nil
+    @asset1.attachable_id.must_be_nil
+    @asset1.attachable_type.must_be_nil
   end
 
   it "should add items correctly" do
@@ -433,16 +433,16 @@ describe "Polymorphic Associations" do
     @note.assets.must_equal [@asset2]
     @note.remove_asset(@asset2)
     @note.assets.must_equal []
-    @asset2.attachable.must_equal nil
-    @asset2.attachable_id.must_equal nil
-    @asset2.attachable_type.must_equal nil
+    @asset2.attachable.must_be_nil
+    @asset2.attachable_id.must_be_nil
+    @asset2.attachable_type.must_be_nil
   end
 
   it "should remove all items correctly" do
     @post.remove_all_assets
     @note.remove_all_assets
-    @asset1.reload.attachable.must_equal nil
-    @asset2.reload.attachable.must_equal nil
+    @asset1.reload.attachable.must_be_nil
+    @asset2.reload.attachable.must_be_nil
   end
 end
 
@@ -543,7 +543,7 @@ describe "many_to_one/one_to_many not referencing primary key" do
     @invoice1.client.must_equal @client2
     @invoice1.client_name.must_equal 'Y'
     @invoice1.client = nil
-    @invoice1.client_name.must_equal nil
+    @invoice1.client_name.must_be_nil
   end
 
   it "should add the associated object correctly" do
@@ -552,7 +552,7 @@ describe "many_to_one/one_to_many not referencing primary key" do
     @client2.invoices.must_equal [@invoice1]
     @invoice1.client_name.must_equal 'Y'
     @invoice1.client = nil
-    @invoice1.client_name.must_equal nil
+    @invoice1.client_name.must_be_nil
   end
 
   it "should remove the associated object correctly" do
@@ -560,16 +560,16 @@ describe "many_to_one/one_to_many not referencing primary key" do
     invs.must_equal [@invoice1, @invoice2]
     @client1.remove_invoice(@invoice1)
     @client1.invoices.must_equal [@invoice2]
-    @invoice1.client_name.must_equal nil
-    @invoice1.client.must_equal nil
+    @invoice1.client_name.must_be_nil
+    @invoice1.client.must_be_nil
   end
 
   it "should remove all associated objects correctly" do
     @client1.remove_all_invoices
-    @invoice1.refresh.client.must_equal nil
-    @invoice1.client_name.must_equal nil
-    @invoice2.refresh.client.must_equal nil
-    @invoice2.client_name.must_equal nil
+    @invoice1.refresh.client.must_be_nil
+    @invoice1.client_name.must_be_nil
+    @invoice2.refresh.client.must_be_nil
+    @invoice2.client_name.must_be_nil
   end
 end
 

data/spec/integration/model_test.rb

@@ -17,7 +17,7 @@ describe "Sequel::Model basic support" do
 
   it ".find should return first matching item" do
     Item.all.must_equal []
-    Item.find(:name=>'J').must_equal nil
+    Item.find(:name=>'J').must_be_nil
     Item.create(:name=>'J')
     Item.find(:name=>'J').must_equal Item.load(:id=>1, :name=>'J')
   end
@@ -25,7 +25,7 @@ describe "Sequel::Model basic support" do
   it ".finder should create method that returns first matching item" do
     def Item.by_name(name) where(:name=>name) end
     Item.finder :by_name
-    Item.first_by_name('J').must_equal nil
+    Item.first_by_name('J').must_be_nil
     Item.create(:name=>'J')
     Item.first_by_name('J').must_equal Item.load(:id=>1, :name=>'J')
     Item.first_by_name(['J', 'K']).must_equal Item.load(:id=>1, :name=>'J')
@@ -34,7 +34,7 @@ describe "Sequel::Model basic support" do
   it ".prepared_finder should create method that returns first matching item" do
     def Item.by_name(name) where(:name=>name) end
     Item.prepared_finder :by_name
-    Item.first_by_name('J').must_equal nil
+    Item.first_by_name('J').must_be_nil
     Item.create(:name=>'J')
     Item.first_by_name('J').must_equal Item.load(:id=>1, :name=>'J')
   end
@@ -83,7 +83,7 @@ describe "Sequel::Model basic support" do
     def i.after_save
       raise Sequel::Rollback
     end
-    i.save.must_equal nil
+    i.save.must_be_nil
   end
 
   it "#should respect after_commit, after_rollback, after_destroy_commit, and after_destroy_rollback hooks" do
@@ -118,12 +118,12 @@ describe "Sequel::Model basic support" do
     end
     i.name = 'K'
     i.rb = true
-    i.save.must_equal nil
+    i.save.must_be_nil
     i.reload.name.must_equal 'J'
     i.hooks.must_equal [:as, :ar]
 
     i.rb = true
-    i.destroy.must_equal nil
+    i.destroy.must_be_nil
     i.exists?.must_equal true
     i.hooks.must_equal [:ad, :adr]
 

data/spec/integration/plugin_test.rb

@@ -70,27 +70,27 @@ describe "Class Table Inheritance Plugin" do
   end
   
   it "should lazily load columns in subclass tables" do
-    Employee[@i2][:manager_id].must_equal nil
+    Employee[@i2][:manager_id].must_be_nil
     Employee[@i2].manager_id.must_equal @i4
-    Employee[@i3][:num_staff].must_equal nil
+    Employee[@i3][:num_staff].must_be_nil
     Employee[@i3].num_staff.must_equal 7
-    Employee[@i4][:num_staff].must_equal nil
+    Employee[@i4][:num_staff].must_be_nil
     Employee[@i4].num_staff.must_equal 5
-    Employee[@i4][:num_managers].must_equal nil
+    Employee[@i4][:num_managers].must_be_nil
     Employee[@i4].num_managers.must_equal 6
-    Employee[@i5][:num_managers].must_equal nil
+    Employee[@i5][:num_managers].must_be_nil
     Employee[@i5].num_managers.must_equal 1
   end
   
   it "should eagerly load columns in subclass tables when retrieving multiple objects" do
     a = Employee.order(:id).all
-    a[1][:manager_id].must_equal nil
+    a[1][:manager_id].must_be_nil
     a[1].manager_id.must_equal @i4
-    a[2][:num_staff].must_equal nil
+    a[2][:num_staff].must_be_nil
     a[2].num_staff.must_equal 7
     a[3][:num_staff].must_equal 5 # eagerly loaded by previous call
     a[3].num_staff.must_equal 5
-    a[3][:num_managers].must_equal nil
+    a[3][:num_managers].must_be_nil
     a[3].num_managers.must_equal 6
     a[4][:num_managers].must_equal 1
     a[4].num_managers.must_equal 1
@@ -117,9 +117,9 @@ describe "Class Table Inheritance Plugin" do
     i = e.id
     e.staff_members_dataset.destroy
     e.destroy
-    @db[:executives][:id=>i].must_equal nil
-    @db[:managers][:id=>i].must_equal nil
-    @db[:employees][:id=>i].must_equal nil
+    @db[:executives][:id=>i].must_be_nil
+    @db[:managers][:id=>i].must_be_nil
+    @db[:employees][:id=>i].must_be_nil
   end
   
   it "should handle associations only defined in subclasses" do
@@ -563,7 +563,7 @@ describe "Touch plugin" do
 
   it "should update the timestamp column when touching the record" do
     Album.plugin :touch
-    @album.updated_at.must_equal nil
+    @album.updated_at.must_be_nil
     @album.touch
     @album.updated_at.to_i.must_be_close_to Time.now.to_i, 2
   end
@@ -571,7 +571,7 @@ describe "Touch plugin" do
   cspecify "should update the timestamp column for many_to_one associated records when the record is updated or destroyed", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
     Album.many_to_one :artist
     Album.plugin :touch, :associations=>:artist
-    @artist.updated_at.must_equal nil
+    @artist.updated_at.must_be_nil
     @album.update(:name=>'B')
     ua = @artist.reload.updated_at
     if ua.is_a?(Time)
@@ -591,7 +591,7 @@ describe "Touch plugin" do
   cspecify "should update the timestamp column for one_to_many associated records when the record is updated", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
     Artist.one_to_many :albums
     Artist.plugin :touch, :associations=>:albums
-    @album.updated_at.must_equal nil
+    @album.updated_at.must_be_nil
     @artist.update(:name=>'B')
     ua = @album.reload.updated_at
     if ua.is_a?(Time)
@@ -605,7 +605,7 @@ describe "Touch plugin" do
     Artist.many_to_many :albums
     Artist.plugin :touch, :associations=>:albums
     @artist.add_album(@album)
-    @album.updated_at.must_equal nil
+    @album.updated_at.must_be_nil
     @artist.update(:name=>'B')
     ua = @album.reload.updated_at
     if ua.is_a?(Time)
@@ -717,7 +717,7 @@ describe "Composition plugin" do
 
   it "should return a composed object if the underlying columns have a value" do
     @e1.date.must_equal Date.civil(2010, 2, 15)
-    @e2.date.must_equal nil
+    @e2.date.must_be_nil
   end
 
   it "should decompose the object when saving the record" do
@@ -755,8 +755,8 @@ describe "RcteTree Plugin" do
       @aaab.children.must_equal []
       @aaaaa.children.must_equal []
       
-      @a.parent.must_equal nil
-      @b.parent.must_equal nil
+      @a.parent.must_be_nil
+      @b.parent.must_be_nil
       @aa.parent.must_equal @a
       @ab.parent.must_equal @a
       @ba.parent.must_equal @b
@@ -891,28 +891,28 @@ describe "RcteTree Plugin" do
     
     it "should populate all :parent associations when eagerly loading ancestors for a dataset" do
       nodes = @Node.filter(@Node.primary_key=>[@a.pk, @ba.pk, @aaa.pk, @aaaaa.pk]).order(:name).eager(:ancestors).all
-      nodes[0].associations.fetch(:parent, 1).must_equal nil
+      nodes[0].associations.fetch(:parent, 1).must_be_nil
       nodes[1].associations[:parent].must_equal @aa
       nodes[1].associations[:parent].associations[:parent].must_equal @a
-      nodes[1].associations[:parent].associations[:parent].associations.fetch(:parent, 1).must_equal nil
+      nodes[1].associations[:parent].associations[:parent].associations.fetch(:parent, 1).must_be_nil
       nodes[2].associations[:parent].must_equal @aaaa
       nodes[2].associations[:parent].associations[:parent].must_equal @aaa
       nodes[2].associations[:parent].associations[:parent].associations[:parent].must_equal @aa
       nodes[2].associations[:parent].associations[:parent].associations[:parent].associations[:parent].must_equal @a
-      nodes[2].associations[:parent].associations[:parent].associations[:parent].associations[:parent].associations.fetch(:parent, 1).must_equal nil
+      nodes[2].associations[:parent].associations[:parent].associations[:parent].associations[:parent].associations.fetch(:parent, 1).must_be_nil
       nodes[3].associations[:parent].must_equal @b
-      nodes[3].associations[:parent].associations.fetch(:parent, 1).must_equal nil
+      nodes[3].associations[:parent].associations.fetch(:parent, 1).must_be_nil
     end
     
     it "should populate all :parent associations when lazily loading ancestors" do
       @a.reload
       @a.ancestors
-      @a.associations[:parent].must_equal nil
+      @a.associations[:parent].must_be_nil
       
       @ba.reload
       @ba.ancestors
       @ba.associations[:parent].must_equal @b
-      @ba.associations[:parent].associations.fetch(:parent, 1).must_equal nil
+      @ba.associations[:parent].associations.fetch(:parent, 1).must_be_nil
       
       @ba.reload
       @aaaaa.ancestors
@@ -920,7 +920,7 @@ describe "RcteTree Plugin" do
       @aaaaa.associations[:parent].associations[:parent].must_equal @aaa
       @aaaaa.associations[:parent].associations[:parent].associations[:parent].must_equal @aa
       @aaaaa.associations[:parent].associations[:parent].associations[:parent].associations[:parent].must_equal @a
-      @aaaaa.associations[:parent].associations[:parent].associations[:parent].associations[:parent].associations.fetch(:parent, 1).must_equal nil
+      @aaaaa.associations[:parent].associations[:parent].associations[:parent].associations[:parent].associations.fetch(:parent, 1).must_be_nil
     end
   end
 
@@ -1528,12 +1528,12 @@ describe "List plugin without a scope" do
 
   it "should define prev and next" do
     i = @c[:name => "abc"]
-    i.prev.must_equal nil
+    i.prev.must_be_nil
     i = @c[:name => "def"]
     i.prev.must_equal @c[:name => "abc"]
     i.next.must_equal @c[:name => "hig"]
     i = @c[:name => "hig"]
-    i.next.must_equal nil
+    i.next.must_be_nil
   end
 
   it "should define move_to" do
@@ -1623,10 +1623,10 @@ describe "List plugin with a scope" do
     @c[:name => "P3"].prev(2).name.must_equal 'P1'
     @c[:name => "P2"].prev(-1).name.must_equal 'P3'
 
-    @c[:name => "Ps"].prev.must_equal nil
-    @c[:name => "Au"].next.must_equal nil
-    @c[:name => "P1"].prev.must_equal nil
-    @c[:name => "P3"].next.must_equal nil
+    @c[:name => "Ps"].prev.must_be_nil
+    @c[:name => "Au"].next.must_be_nil
+    @c[:name => "P1"].prev.must_be_nil
+    @c[:name => "P3"].next.must_be_nil
   end
 
   it "should define move_to" do
@@ -1833,31 +1833,31 @@ describe "Sequel::Plugins::PreparedStatements" do
   it "should work with looking up using Model.[]" do 
     @c[@foo.id].must_equal @foo
     @c[@bar.id].must_equal @bar
-    @c[0].must_equal nil
-    @c[nil].must_equal nil
+    @c[0].must_be_nil
+    @c[nil].must_be_nil
   end
 
   it "should work with looking up using Dataset#with_pk" do 
     @c.dataset.with_pk(@foo.id).must_equal @foo
     @c.dataset.with_pk(@bar.id).must_equal @bar
-    @c.dataset.with_pk(0).must_equal nil
-    @c.dataset.with_pk(nil).must_equal nil
+    @c.dataset.with_pk(0).must_be_nil
+    @c.dataset.with_pk(nil).must_be_nil
 
-    @c.dataset.filter(:i=>0).with_pk(@foo.id).must_equal nil
+    @c.dataset.filter(:i=>0).with_pk(@foo.id).must_be_nil
     @c.dataset.filter(:i=>10).with_pk(@foo.id).must_equal @foo
     @c.dataset.filter(:i=>20).with_pk(@bar.id).must_equal @bar
-    @c.dataset.filter(:i=>10).with_pk(nil).must_equal nil
+    @c.dataset.filter(:i=>10).with_pk(nil).must_be_nil
     @c.dataset.filter(:name=>'foo').with_pk(@foo.id).must_equal @foo
     @c.dataset.filter(:name=>'bar').with_pk(@bar.id).must_equal @bar
-    @c.dataset.filter(:name=>'baz').with_pk(@bar.id).must_equal nil
-    @c.dataset.filter(:name=>'bar').with_pk(nil).must_equal nil
+    @c.dataset.filter(:name=>'baz').with_pk(@bar.id).must_be_nil
+    @c.dataset.filter(:name=>'bar').with_pk(nil).must_be_nil
   end
 
   it "should work with Model#destroy" do 
     @foo.destroy
     @bar.destroy
-    @c[@foo.id].must_equal nil
-    @c[@bar.id].must_equal nil
+    @c[@foo.id].must_be_nil
+    @c[@bar.id].must_be_nil
   end
 
   it "should work with Model#update" do 
@@ -1952,8 +1952,8 @@ describe "Caching plugins" do
     it "should work with looking up using Model.[]" do 
       @Artist[1].must_be_same_as(@Artist[1])
       @Artist[:id=>1].must_equal @Artist[1]
-      @Artist[0].must_equal nil
-      @Artist[nil].must_equal nil
+      @Artist[0].must_be_nil
+      @Artist[nil].must_be_nil
     end
 
     it "should work with lookup up many_to_one associated objects" do