sequel 4.44.0 → 4.45.0

data/spec/extensions/tactical_eager_loading_spec.rb

@@ -77,7 +77,7 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
     sql_match('SELECT * FROM t WHERE (t.id = 101) LIMIT 1', 'SELECT * FROM t WHERE (t.id = 102) LIMIT 1')
   end
 
-  it "association getter methods should not eagerly load the association if true is passed" do
+  deprecated "association getter methods should not eagerly load the association if true is passed" do
     ts.map{|x| x.parent(true)}.must_equal [ts[2], ts[3], nil, nil]
     sql_match('SELECT * FROM t WHERE id = 101', 'SELECT * FROM t WHERE id = 102')
   end

data/spec/extensions/validation_contexts_spec.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Sequel::Plugins::ValidationHelpers" do
+  before do
+    @c = Class.new(Sequel::Model(:foo))
+    @c.class_eval do
+      columns :a, :b, :c
+      plugin :validation_contexts
+      def validate
+        errors.add(:a, 'bad') if a == 1 && validation_context == :create
+        errors.add(:b, 'bad') if b == 2 && validation_context == :update
+        errors.add(:c, 'bad') if c == 3 && validation_context == :foo
+      end
+    end
+  end
+
+  it "should support :validation_context option to valid?" do
+    @c.new(:c=>3).valid?.must_equal true
+    @c.new(:c=>3).valid?(:validation_context=>:foo).must_equal false
+  end
+
+  it "should support :validation_context option to save?" do
+    @c.new(:c=>3).save
+    proc{@c.new(:c=>3).save(:validation_context=>:foo)}.must_raise Sequel::ValidationFailed
+  end
+
+  it "should raise error if using a validation context on a frozen model instance" do
+    @c.new(:c=>3).freeze.valid?.must_equal true
+    proc{@c.new(:c=>3).freeze.valid?(:validation_context=>:foo)}.must_raise RuntimeError, TypeError
+  end
+end

data/spec/guards_helper.rb

@@ -3,6 +3,8 @@ require 'minitest/autorun'
 require 'minitest/hooks/default'
 require 'minitest/shared_description'
 
+require "#{File.dirname(__FILE__)}/deprecation_helper.rb"
+
 def Sequel.guarded?(*checked)
   unless ENV['SEQUEL_NO_PENDING']
     checked.each do |c|

data/spec/integration/associations_test.rb

@@ -1588,22 +1588,24 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
   end
   
   it "should work correctly with prepared_statements_association plugin" do
-    @album.update(:artist => @artist)
-    @album.add_tag(@tag)
-    
-    @album.reload
-    @artist.reload
-    @tag.reload
-    
-    [Tag, Album, Artist].each{|x| x.plugin :prepared_statements_associations}
-    @album.artist.must_equal @artist
-    @artist.first_album.must_equal @album
-    @artist.albums.must_equal [@album]
-    @album.tags.must_equal [@tag]
-    @album.alias_tags.must_equal [@tag]
-    @tag.albums.must_equal [@album]
-    unless @no_many_through_many
-      @album.first_tag.must_equal @tag
+    deprecated do
+      @album.update(:artist => @artist)
+      @album.add_tag(@tag)
+      
+      @album.reload
+      @artist.reload
+      @tag.reload
+      
+      [Tag, Album, Artist].each{|x| x.plugin :prepared_statements_associations}
+      @album.artist.must_equal @artist
+      @artist.first_album.must_equal @album
+      @artist.albums.must_equal [@album]
+      @album.tags.must_equal [@tag]
+      @album.alias_tags.must_equal [@tag]
+      @tag.albums.must_equal [@album]
+      unless @no_many_through_many
+        @album.first_tag.must_equal @tag
+      end
     end
   end
 
@@ -2037,12 +2039,12 @@ describe "Sequel::Model Simple Associations" do
     @artist.add_album(@album)
 
     @artist.albums.must_equal [@album]
-    @artist.albums(proc{|ds| ds.exclude(:id=>@album.id)}).must_equal []
-    @artist.albums(proc{|ds| ds.filter(:id=>@album.id)}).must_equal [@album]
+    @artist.albums{|ds| ds.exclude(:id=>@album.id)}.must_equal []
+    @artist.albums{|ds| ds.filter(:id=>@album.id)}.must_equal [@album]
 
     @album.artist.must_equal @artist
-    @album.artist(proc{|ds| ds.exclude(:id=>@artist.id)}).must_be_nil
-    @album.artist(proc{|ds| ds.filter(:id=>@artist.id)}).must_equal @artist
+    @album.artist{|ds| ds.exclude(:id=>@artist.id)}.must_be_nil
+    @album.artist{|ds| ds.filter(:id=>@artist.id)}.must_equal @artist
 
     @artist.albums{|ds| ds.exclude(:id=>@album.id)}.must_equal []
     @artist.albums{|ds| ds.filter(:id=>@album.id)}.must_equal [@album]

data/spec/integration/dataset_test.rb

@@ -616,6 +616,10 @@ describe "Dataset UNION, EXCEPT, and INTERSECT" do
     DB.drop_table?(:i1, :i2, :i3)
   end
   
+  it "should give the correct results for UNION with an existing order" do
+    @ds1.order(:number).union(@ds2).order(:number).map{|x| x[:number].to_s}.must_equal %w'10 20 30'
+  end
+
   it "should give the correct results for simple UNION, EXCEPT, and INTERSECT" do
     @ds1.union(@ds2).order(:number).map{|x| x[:number].to_s}.must_equal %w'10 20 30'
     if @ds1.supports_intersect_except?
@@ -624,7 +628,10 @@ describe "Dataset UNION, EXCEPT, and INTERSECT" do
     end
   end
   
-  cspecify "should give the correct results for UNION, EXCEPT, and INTERSECT when used with ordering and limits", :mssql do
+  it "should give the correct results for UNION, EXCEPT, and INTERSECT when used with ordering and limits and offsets" do
+    [%w'10 30', %w'10 20 30'].must_include @ds1.limit(1).union(@ds2).order(:number).map{|x| x[:number].to_s}
+    [%w'10 30', %w'10 20 30'].must_include @ds1.offset(1).union(@ds2).order(:number).map{|x| x[:number].to_s}
+
     @ds1.insert(:number=>8)
     @ds2.insert(:number=>9)
     @ds1.insert(:number=>38)
@@ -635,15 +642,31 @@ describe "Dataset UNION, EXCEPT, and INTERSECT" do
 
     @ds1.reverse_order(:number).limit(1).union(@ds2).order(:number).map{|x| x[:number].to_s}.must_equal %w'9 10 30 38 39'
     @ds2.reverse_order(:number).limit(1).union(@ds1).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 10 20 38 39'
+    @ds1.reverse_order(:number).limit(1, 1).union(@ds2).order(:number).map{|x| x[:number].to_s}.must_equal %w'9 10 20 30 39'
+    @ds2.reverse_order(:number).limit(1, 1).union(@ds1).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 10 20 30 38'
+    @ds1.reverse_order(:number).offset(1).union(@ds2).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 9 10 20 30 39'
+    @ds2.reverse_order(:number).offset(1).union(@ds1).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 9 10 20 30 38'
 
     @ds1.union(@ds2.order(:number).limit(1)).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 9 10 20 38'
     @ds2.union(@ds1.order(:number).limit(1)).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 9 10 30 39'
+    @ds1.union(@ds2.order(:number).limit(1, 1)).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 10 20 38'
+    @ds2.union(@ds1.order(:number).limit(1, 1)).order(:number).map{|x| x[:number].to_s}.must_equal %w'9 10 30 39'
+    @ds1.union(@ds2.order(:number).offset(1)).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 10 20 30 38 39'
+    @ds2.union(@ds1.order(:number).offset(1)).order(:number).map{|x| x[:number].to_s}.must_equal %w'9 10 20 30 38 39'
 
     @ds1.union(@ds2).limit(2).order(:number).map{|x| x[:number].to_s}.must_equal %w'8 9'
     @ds2.union(@ds1).reverse_order(:number).limit(2).map{|x| x[:number].to_s}.must_equal %w'39 38'
+    @ds1.union(@ds2).limit(2, 1).order(:number).map{|x| x[:number].to_s}.must_equal %w'9 10'
+    @ds2.union(@ds1).reverse_order(:number).limit(2, 1).map{|x| x[:number].to_s}.must_equal %w'38 30'
+    @ds1.union(@ds2).offset(1).order(:number).map{|x| x[:number].to_s}.must_equal %w'9 10 20 30 38 39'
+    @ds2.union(@ds1).reverse_order(:number).offset(1).map{|x| x[:number].to_s}.must_equal %w'38 30 20 10 9 8'
 
     @ds1.reverse_order(:number).limit(2).union(@ds2.reverse_order(:number).limit(2)).order(:number).limit(3).map{|x| x[:number].to_s}.must_equal %w'20 30 38'
     @ds2.order(:number).limit(2).union(@ds1.order(:number).limit(2)).reverse_order(:number).limit(3).map{|x| x[:number].to_s}.must_equal %w'10 9 8'
+    @ds1.reverse_order(:number).limit(2, 1).union(@ds2.reverse_order(:number).limit(2, 1)).order(:number).limit(3, 1).map{|x| x[:number].to_s}.must_equal %w'20 30'
+    @ds2.order(:number).limit(2, 1).union(@ds1.order(:number).limit(2, 1)).reverse_order(:number).limit(3, 1).map{|x| x[:number].to_s}.must_equal %w'20 10'
+    @ds1.reverse_order(:number).offset(1).union(@ds2.reverse_order(:number).offset(1)).order(:number).offset(1).map{|x| x[:number].to_s}.must_equal %w'9 10 20 30'
+    @ds2.order(:number).offset(1).union(@ds1.order(:number).offset(1)).reverse_order(:number).offset(1).map{|x| x[:number].to_s}.must_equal %w'38 30 20 10'
   end
 
   it "should give the correct results for compound UNION, EXCEPT, and INTERSECT" do
@@ -1511,7 +1534,7 @@ describe "Sequel::Dataset DSL support" do
     @ds.insert(20, 10)
     @ds.filter(:a=>20, :b=>10).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter([[:a, 20], [:b, 10]]).all.must_equal [{:a=>20, :b=>10}]
-    @ds.filter({:a=>20}, {:b=>10}).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(Sequel.&({:a=>20}, {:b=>10})).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter(Sequel.|({:a=>20}, {:b=>5})).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter(Sequel.~(:a=>10)).all.must_equal [{:a=>20, :b=>10}]
   end

data/spec/integration/model_test.rb

@@ -86,7 +86,7 @@ describe "Sequel::Model basic support" do
     i.save.must_be_nil
   end
 
-  it "#should respect after_commit, after_rollback, after_destroy_commit, and after_destroy_rollback hooks" do
+  deprecated "#should respect after_commit, after_rollback, after_destroy_commit, and after_destroy_rollback hooks" do
     i = Item.create(:name=>'J')
     i.use_transactions = true
     def i.hooks

data/spec/integration/plugin_test.rb

@@ -237,7 +237,6 @@ describe "Many Through Many Plugin" do
     Artist[@artist3.id].albums.map{|x| x.name}.sort.must_equal %w'B C'
     Artist[@artist4.id].albums.map{|x| x.name}.sort.must_equal %w'B D'
     
-    Artist.plugin :prepared_statements_associations
     Artist[@artist1.id].albums.map{|x| x.name}.sort.must_equal %w'A D'
     Artist[@artist2.id].albums.map{|x| x.name}.sort.must_equal %w'A C'
     Artist[@artist3.id].albums.map{|x| x.name}.sort.must_equal %w'B C'
@@ -294,13 +293,12 @@ describe "Many Through Many Plugin" do
   end
 
   it "should handle typical case with 3 join tables" do
-    Artist.many_through_many :related_artists, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_artists, :album_id, :artist_id]], :class=>Artist, :distinct=>true
+    Artist.many_through_many :related_artists, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_artists, :album_id, :artist_id]], :class=>Artist, :distinct=>true, :delay_pks=>false
     Artist[@artist1.id].related_artists.map{|x| x.name}.sort.must_equal %w'1 2 4'
     Artist[@artist2.id].related_artists.map{|x| x.name}.sort.must_equal %w'1 2 3'
     Artist[@artist3.id].related_artists.map{|x| x.name}.sort.must_equal %w'2 3 4'
     Artist[@artist4.id].related_artists.map{|x| x.name}.sort.must_equal %w'1 3 4'
     
-    Artist.plugin :prepared_statements_associations
     Artist[@artist1.id].related_artists.map{|x| x.name}.sort.must_equal %w'1 2 4'
     Artist[@artist2.id].related_artists.map{|x| x.name}.sort.must_equal %w'1 2 3'
     Artist[@artist3.id].related_artists.map{|x| x.name}.sort.must_equal %w'2 3 4'
@@ -366,7 +364,6 @@ describe "Many Through Many Plugin" do
     Artist[@artist3.id].related_albums.map{|x| x.name}.sort.must_equal %w'A B D'
     Artist[@artist4.id].related_albums.map{|x| x.name}.sort.must_equal %w'B D'
     
-    Artist.plugin :prepared_statements_associations
     Artist[@artist1.id].related_albums.map{|x| x.name}.sort.must_equal %w'A B C'
     Artist[@artist2.id].related_albums.map{|x| x.name}.sort.must_equal %w'A B C D'
     Artist[@artist3.id].related_albums.map{|x| x.name}.sort.must_equal %w'A B D'
@@ -1193,11 +1190,11 @@ describe "AssociationPks plugin" do
     end
     class ::Artist < Sequel::Model
       plugin :association_pks
-      one_to_many :albums, :order=>:id
+      one_to_many :albums, :order=>:id, :delay_pks=>false
     end 
     class ::Album < Sequel::Model
       plugin :association_pks
-      many_to_many :tags, :order=>:id
+      many_to_many :tags, :order=>:id, :delay_pks=>false
     end 
     class ::Tag < Sequel::Model
     end 
@@ -1293,7 +1290,7 @@ describe "AssociationPks plugin" do
     Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [@h2], []]
   end
 
-  it "should handle :delay association option for new instances" do
+  deprecated "should handle :delay_pks=>true association option for new instances" do
     album_class = Class.new(Album)
     album_class.many_to_many :tags, :clone=>:tags, :delay_pks=>true, :join_table=>:albums_tags, :left_key=>:album_id
     album = album_class.new(:name=>'test album')
@@ -1309,7 +1306,7 @@ describe "AssociationPks plugin" do
     album_class.with_pk!(album.pk).tag_pks.sort.must_equal []
   end
 
-  it "should handle :delay=>:all association option for existing instances" do
+  it "should handle :delay_pks=>:always association option for existing instances" do
     album_class = Class.new(Album)
     album_class.many_to_many :tags, :clone=>:tags, :delay_pks=>:always, :join_table=>:albums_tags, :left_key=>:album_id
     album = album_class.with_pk!(@al1)
@@ -1368,7 +1365,7 @@ describe "AssociationPks plugin" do
 
   it "should set associated right-side cpks correctly for a one_to_many association" do
     Album.use_transactions = true
-    Album.one_to_many :vocalists, :order=>:first
+    Album.one_to_many :vocalists, :order=>:first, :delay_pks=>false
     Album.order(:id).all.map{|a| a.vocalist_pks.sort}.must_equal [[@v1, @v2, @v3], [], []]
 
     Album[@al2].vocalist_pks = [@v1, @v3]
@@ -1389,7 +1386,7 @@ describe "AssociationPks plugin" do
 
   it "should set associated right-side cpks correctly for a many_to_many association" do
     Album.use_transactions = true
-    Album.many_to_many :vocalists, :join_table=>:albums_vocalists, :right_key=>[:first, :last], :order=>:first
+    Album.many_to_many :vocalists, :join_table=>:albums_vocalists, :right_key=>[:first, :last], :order=>:first, :delay_pks=>false
 
     @db[:albums_vocalists].filter(:album_id=>@al1).select_order_map([:first, :last]).must_equal [@v1, @v2, @v3]
     Album[@al1].vocalist_pks = [@v1, @v3]
@@ -1412,7 +1409,7 @@ describe "AssociationPks plugin" do
 
   it "should set associated pks correctly with left-side cpks for a one_to_many association" do
     Vocalist.use_transactions = true
-    Vocalist.one_to_many :instruments, :key=>[:first, :last], :order=>:id
+    Vocalist.one_to_many :instruments, :key=>[:first, :last], :order=>:id, :delay_pks=>false
     Vocalist.order(:first, :last).all.map{|a| a.instrument_pks.sort}.must_equal [[@i1, @i2, @i3], [], []]
 
     Vocalist[@v2].instrument_pks = [@i1, @i3]
@@ -1433,7 +1430,7 @@ describe "AssociationPks plugin" do
 
   it "should set associated pks correctly with left-side cpks for a many_to_many association" do
     Vocalist.use_transactions = true
-    Vocalist.many_to_many :instruments, :join_table=>:vocalists_instruments, :left_key=>[:first, :last], :order=>:id
+    Vocalist.many_to_many :instruments, :join_table=>:vocalists_instruments, :left_key=>[:first, :last], :order=>:id, :delay_pks=>false
 
     @db[:vocalists_instruments].filter([:first, :last]=>[@v1]).select_order_map(:instrument_id).must_equal [@i1, @i2, @i3]
     Vocalist[@v1].instrument_pks = [@i1, @i3]
@@ -1456,7 +1453,7 @@ describe "AssociationPks plugin" do
 
   it "should set associated right-side cpks correctly with left-side cpks for a one_to_many association" do
     Vocalist.use_transactions = true
-    Vocalist.one_to_many :hits, :key=>[:first, :last], :order=>:week
+    Vocalist.one_to_many :hits, :key=>[:first, :last], :order=>:week, :delay_pks=>false
     Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [], []]
 
     Vocalist[@v2].hit_pks = [@h1, @h3]
@@ -1477,7 +1474,7 @@ describe "AssociationPks plugin" do
 
   it "should set associated right-side cpks correctly with left-side cpks for a many_to_many association" do
     Vocalist.use_transactions = true
-    Vocalist.many_to_many :hits, :join_table=>:vocalists_hits, :left_key=>[:first, :last], :right_key=>[:year, :week], :order=>:week
+    Vocalist.many_to_many :hits, :join_table=>:vocalists_hits, :left_key=>[:first, :last], :right_key=>[:year, :week], :order=>:week, :delay_pks=>false
 
     @db[:vocalists_hits].filter([:first, :last]=>[@v1]).select_order_map([:year, :week]).must_equal [@h1, @h2, @h3]
     Vocalist[@v1].hit_pks = [@h1, @h3]
@@ -1819,7 +1816,6 @@ describe "Sequel::Plugins::PreparedStatements" do
       Integer :i
     end
     @c = Class.new(Sequel::Model(@db[:ps_test]))
-    @c.plugin :prepared_statements_with_pk
   end
   before do
     @c.dataset.delete
@@ -1895,7 +1891,6 @@ describe "Sequel::Plugins::PreparedStatements with schema changes" do
     @c.one_to_many :ps_tests, :key=>:id, :class=>@c
     @c.many_to_many :mps_tests, :left_key=>:id, :right_key=>:id, :class=>@c, :join_table=>Sequel[:ps_test].as(:x)
     @c.plugin :prepared_statements
-    @c.plugin :prepared_statements_associations
   end
   after do
     @db.drop_table?(:ps_test)

data/spec/integration/prepared_statement_test.rb

@@ -396,20 +396,22 @@ end
 
 describe "Dataset#unbind" do
   before do
-    @ds = ds = DB[:items]
-    @ct = proc do |t, v|
-      DB.create_table!(:items) do
-        column :c, t
+    deprecated do
+      @ds = ds = DB[:items]
+      @ct = proc do |t, v|
+        DB.create_table!(:items) do
+          column :c, t
+        end
+        ds.insert(:c=>v)
       end
-      ds.insert(:c=>v)
+      @u = proc{|ds1| ds2, bv = ds1.unbind; ds2.call(:first, bv)}
     end
-    @u = proc{|ds1| ds2, bv = ds1.unbind; ds2.call(:first, bv)}
   end
   after do
     DB.drop_table?(:items)
   end
   
-  it "should unbind values assigned to equality and inequality statements" do
+  deprecated "should unbind values assigned to equality and inequality statements" do
     @ct[Integer, 10]
     @u[@ds.filter(:c=>10)].must_equal(:c=>10)
     @u[@ds.exclude(:c=>10)].must_be_nil
@@ -420,46 +422,52 @@ describe "Dataset#unbind" do
   end
 
   cspecify "should handle numerics and strings", [:odbc], [:swift, :sqlite] do
-    @ct[Integer, 10]
-    @u[@ds.filter(:c=>10)].must_equal(:c=>10)
-    @ct[Float, 0.0]
-    @u[@ds.filter{c < 1}].must_equal(:c=>0.0)
-    @ct[String, 'foo']
-    @u[@ds.filter(:c=>'foo')].must_equal(:c=>'foo')
+    deprecated do
+      @ct[Integer, 10]
+      @u[@ds.filter(:c=>10)].must_equal(:c=>10)
+      @ct[Float, 0.0]
+      @u[@ds.filter{c < 1}].must_equal(:c=>0.0)
+      @ct[String, 'foo']
+      @u[@ds.filter(:c=>'foo')].must_equal(:c=>'foo')
 
-    DB.create_table!(:items) do
-      BigDecimal :c, :size=>[15,2]
+      DB.create_table!(:items) do
+        BigDecimal :c, :size=>[15,2]
+      end
+      @ds.insert(:c=>BigDecimal.new('1.1'))
+      @u[@ds.filter{c > 0}].must_equal(:c=>BigDecimal.new('1.1'))
     end
-    @ds.insert(:c=>BigDecimal.new('1.1'))
-    @u[@ds.filter{c > 0}].must_equal(:c=>BigDecimal.new('1.1'))
   end
 
   cspecify "should handle dates and times", [:do], [:jdbc, :mssql], [:jdbc, :sqlite], [:swift], [:tinytds], :oracle do
-    @ct[Date, Date.today]
-    @u[@ds.filter(:c=>Date.today)].must_equal(:c=>Date.today)
-    t = Time.now
-    @ct[Time, t]
-    @u[@ds.filter{c < t + 1}][:c].to_i.must_equal t.to_i
+    deprecated do
+      @ct[Date, Date.today]
+      @u[@ds.filter(:c=>Date.today)].must_equal(:c=>Date.today)
+      t = Time.now
+      @ct[Time, t]
+      @u[@ds.filter{c < t + 1}][:c].to_i.must_equal t.to_i
+    end
   end
 
-  it "should handle QualifiedIdentifiers" do
+  deprecated "should handle QualifiedIdentifiers" do
     @ct[Integer, 10]
     @u[@ds.filter{items[:c] > 1}].must_equal(:c=>10)
   end
 
   cspecify "should handle deep nesting", :h2 do
-    DB.create_table!(:items) do
-      Integer :a
-      Integer :b
-      Integer :c
-      Integer :d
+    deprecated do
+      DB.create_table!(:items) do
+        Integer :a
+        Integer :b
+        Integer :c
+        Integer :d
+      end
+      @ds.insert(:a=>2, :b=>0, :c=>3, :d=>5)
+      @u[@ds.filter{a > 1}.and{b < 2}.or(:c=>3).and(Sequel.case({~Sequel.expr(:d=>4)=>1}, 0) => 1)].must_equal(:a=>2, :b=>0, :c=>3, :d=>5)
+      @u[@ds.filter{a > 1}.and{b < 2}.or(:c=>3).and(Sequel.case({~Sequel.expr(:d=>5)=>1}, 0) => 1)].must_be_nil
     end
-    @ds.insert(:a=>2, :b=>0, :c=>3, :d=>5)
-    @u[@ds.filter{a > 1}.and{b < 2}.or(:c=>3).and(Sequel.case({~Sequel.expr(:d=>4)=>1}, 0) => 1)].must_equal(:a=>2, :b=>0, :c=>3, :d=>5)
-    @u[@ds.filter{a > 1}.and{b < 2}.or(:c=>3).and(Sequel.case({~Sequel.expr(:d=>5)=>1}, 0) => 1)].must_be_nil
   end
 
-  it "should handle case where the same variable has the same value in multiple places " do
+  deprecated "should handle case where the same variable has the same value in multiple places " do
     @ct[Integer, 1]
     @u[@ds.filter{c > 1}.or{c < 1}.invert].must_equal(:c=>1)
     @u[@ds.filter{c > 1}.or{c < 1}].must_be_nil

data/spec/integration/spec_helper.rb

@@ -20,22 +20,19 @@ Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line
 Sequel.split_symbols = false if ENV['SEQUEL_NO_SPLIT_SYMBOLS']
 Sequel::Database.extension :columns_introspection if ENV['SEQUEL_COLUMNS_INTROSPECTION']
 Sequel::Model.cache_associations = false if ENV['SEQUEL_NO_CACHE_ASSOCIATIONS']
-if ENV['SEQUEL_MODEL_PREPARED_STATEMENTS']
-  Sequel::Model.plugin :prepared_statements
-  Sequel::Model.plugin :prepared_statements_associations
-end
+Sequel::Model.plugin :prepared_statements if ENV['SEQUEL_MODEL_PREPARED_STATEMENTS']
 Sequel::Model.use_transactions = false
-Sequel.cache_anonymous_models = false
+Sequel::Model.cache_anonymous_models = false
 
 require './spec/guards_helper'
 
 IDENTIFIER_MANGLING = !ENV['SEQUEL_NO_MANGLE'] unless defined?(IDENTIFIER_MANGLING)
 
 unless defined?(DB)
-  opts = {}
-  opts[:identifier_mangling] = false unless IDENTIFIER_MANGLING
-  DB = Sequel.connect(ENV['SEQUEL_INTEGRATION_URL'], opts)
+  # SEQUEL5: Remove :identifier_mangling=>false
+  DB = Sequel.connect(ENV['SEQUEL_INTEGRATION_URL'], :identifier_mangling=>false)
   DB.extension(:freeze_datasets) if ENV['SEQUEL_FREEZE_DATASETS']
+  DB.extension(:identifier_mangling) if IDENTIFIER_MANGLING
 end
 
 if DB.adapter_scheme == :ibmdb || (DB.adapter_scheme == :ado && DB.database_type == :access)