sequel 4.49.0 → 5.3.0

data/spec/extensions/validation_class_methods_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 model_class = proc do |klass, &block|
   c = Class.new(klass)
@@ -158,7 +158,7 @@ describe Sequel::Model do
     c.must_equal false
     @c.validates{c = respond_to?(:length_of)}
     c.must_equal true
-  end if RUBY_VERSION >= '1.9'
+  end
 end
 
 describe Sequel::Model do
@@ -197,7 +197,7 @@ describe "Sequel::Plugins::ValidationClassMethods::ClassMethods::Generator" do
     @testit = testit = []
     
     @c = model_class.call Sequel::Model do
-      (class << self; self end).send(:define_method, :validates_blah) do
+      singleton_class.send(:define_method, :validates_blah) do
         testit << 1324
       end
     end

data/spec/extensions/validation_contexts_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ValidationHelpers" do
   before do

data/spec/extensions/validation_helpers_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ValidationHelpers" do
   before do
@@ -19,9 +19,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.value = '1_1'
     @m.must_be :valid?
     o = String.new
-    class << o
-      undef_method :blank?
-    end
+    o.singleton_class.send(:undef_method, :blank?)
     @m.value = o
     @m.must_be :valid?
     o = Object.new
@@ -86,38 +84,6 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.must_be :valid?
   end
   
-  deprecated "should support modifying default options for all models" do
-    @c.set_validations{validates_presence(:value)}
-    @m.wont_be :valid?
-    @m.errors.must_equal(:value=>['is not present'])
-    o = Sequel::Plugins::ValidationHelpers::DEFAULT_OPTIONS[:presence].dup
-    Sequel::Plugins::ValidationHelpers::DEFAULT_OPTIONS[:presence][:message] = lambda{"was not entered"}
-    @m.wont_be :valid?
-    @m.errors.must_equal(:value=>["was not entered"])
-    @m.value = 1
-    @m.must_be :valid?
-    
-    @m.values.clear
-    Sequel::Plugins::ValidationHelpers::DEFAULT_OPTIONS[:presence][:allow_missing] = true
-    @m.must_be :valid?
-    @m.value = nil
-    @m.wont_be :valid?
-    @m.errors.must_equal(:value=>["was not entered"])
-
-    c = Class.new(Sequel::Model)
-    c.class_eval do
-      plugin :validation_helpers
-      set_columns([:value])
-      def validate
-        validates_presence(:value)
-      end
-    end
-    m = c.new(:value=>nil)
-    m.wont_be :valid?
-    m.errors.must_equal(:value=>["was not entered"])
-    Sequel::Plugins::ValidationHelpers::DEFAULT_OPTIONS[:presence] = o
-  end
-  
   it "should support modifying default validation options for a particular model" do
     @c.set_validations{validates_presence(:value)}
     @m.wont_be :valid?
@@ -369,7 +335,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
   it "should support validates_unique with a single attribute" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
-    @c.set_validations{validates_unique(:username)}
+    @c.set_validations{validates_unique(:username, :only_if_modified=>false)}
     @c.dataset = @c.dataset.with_fetch(proc do |sql|
       case sql
       when /count.*username = '0records'/
@@ -407,7 +373,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
   it "should support validates_unique with multiple attributes" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
-    @c.set_validations{validates_unique([:username, :password])}
+    @c.set_validations{validates_unique([:username, :password], :only_if_modified=>false)}
     @c.dataset = @c.dataset.with_fetch(proc do |sql|
       case sql
       when /count.*username = '0records'/
@@ -452,7 +418,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
   it "should support validates_unique with a block" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
-    @c.set_validations{validates_unique(:username){|ds| ds.filter(:active)}}
+    @c.set_validations{validates_unique(:username, :only_if_modified=>false){|ds| ds.filter(:active)}}
     @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
@@ -465,7 +431,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
   it "should support validates_unique with :where option" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
-    @c.set_validations{validates_unique(:username, :where=>proc{|ds, obj, cols| ds.where(cols.map{|c| [Sequel.function(:lower, c), obj.send(c).downcase]})})}
+    @c.set_validations{validates_unique(:username, :only_if_modified=>false, :where=>proc{|ds, obj, cols| ds.where(cols.map{|c| [Sequel.function(:lower, c), obj.send(c).downcase]})})}
     @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
@@ -479,7 +445,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     c = @c
-    @c.set_validations{validates_unique(:username, :dataset=>c.where(:a=>[1,2,3]))}
+    @c.set_validations{validates_unique(:username, :only_if_modified=>false, :dataset=>c.where(:a=>[1,2,3]))}
     @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
@@ -493,7 +459,7 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
     c = @c
-    @c.set_validations{validates_unique(:username, :dataset=>c.cross_join(:a))}
+    @c.set_validations{validates_unique(:username, :only_if_modified=>false, :dataset=>c.cross_join(:a))}
     @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset
@@ -503,10 +469,10 @@ describe "Sequel::Plugins::ValidationHelpers" do
                     "SELECT count(*) AS count FROM items CROSS JOIN a WHERE ((username = '0records') AND (items.id != 3)) LIMIT 1"]
   end
 
-  it "should support :only_if_modified option for validates_unique, and not check uniqueness for existing records if values haven't changed" do
+  it "should not have validates_unique check uniqueness for existing records if values haven't changed" do
     @c.columns(:id, :username, :password)
     @c.set_dataset DB[:items]
-    @c.set_validations{validates_unique([:username, :password], :only_if_modified=>true)}
+    @c.set_validations{validates_unique([:username, :password])}
     @c.dataset = @c.dataset.with_fetch(:v=>0)
     
     DB.reset

data/spec/extensions/whitelist_security_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "#(set|update)_(all|only)" do
   before do
@@ -16,7 +16,7 @@ describe Sequel::Model, "#(set|update)_(all|only)" do
   it "should raise errors if not all hash fields can be set and strict_param_setting is true" do
     @c.strict_param_setting = true
 
-    proc{@c.new.set_all(:x => 1, :y => 2, :z=>3, :use_after_commit_rollback => false)}.must_raise(Sequel::MassAssignmentRestriction)
+    proc{@c.new.set_all(:x => 1, :y => 2, :z=>3, :use_transactions => false)}.must_raise(Sequel::MassAssignmentRestriction)
     (o = @c.new).set_all(:x => 1, :y => 2, :z=>3)
     o.values.must_equal(:x => 1, :y => 2, :z=>3)
 
@@ -32,9 +32,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_be_nil
-    @o1.set_all(:x => 1, :use_after_commit_rollback => true)
-    @o1.use_after_commit_rollback.must_be_nil
+    @o1.use_transactions.must_equal false 
+    @o1.set_all(:x => 1, :use_transactions => true)
+    @o1.use_transactions.must_equal false
     @o1.values.must_equal(:x => 1)
   end
 

data/spec/extensions/xml_serializer_spec.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 begin
   require 'nokogiri'
-rescue LoadError => e
-  skip_warn "xml_serializer plugin: can't load nokogiri (#{e.class}: #{e})"
+rescue LoadError
+  warn "Skipping test of xml_serializer plugin: can't load nokogiri"
 else
 describe "Sequel::Plugins::XmlSerializer" do
   before do
@@ -125,30 +125,25 @@ describe "Sequel::Plugins::XmlSerializer" do
   end
 
   it "should support an :encoding option when serializing" do
-    ["<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>",
-     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><name>YJM</name><id>2</id></artist>"].must_include(@artist.to_xml(:encoding=>'UTF-8').gsub(/\n */m, ''))
+     @artist.to_xml(:encoding=>'UTF-8').gsub(/\n */m, '').must_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>"
   end
 
   it "should support a :builder_opts option when serializing" do
-    ["<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>",
-     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><name>YJM</name><id>2</id></artist>"].must_include(@artist.to_xml(:builder_opts=>{:encoding=>'UTF-8'}).gsub(/\n */m, ''))
+    @artist.to_xml(:builder_opts=>{:encoding=>'UTF-8'}).gsub(/\n */m, '').must_equal "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>"
   end
 
   it "should support an :types option when serializing" do
-    ["<?xml version=\"1.0\"?><artist><id type=\"integer\">2</id><name type=\"string\">YJM</name></artist>",
-     "<?xml version=\"1.0\"?><artist><name type=\"string\">YJM</name><id type=\"integer\">2</id></artist>"].must_include(@artist.to_xml(:types=>true).gsub(/\n */m, ''))
+    @artist.to_xml(:types=>true).gsub(/\n */m, '').must_equal "<?xml version=\"1.0\"?><artist><id type=\"integer\">2</id><name type=\"string\">YJM</name></artist>"
   end
 
   it "should support an :root_name option when serializing" do
-    ["<?xml version=\"1.0\"?><ar><id>2</id><name>YJM</name></ar>",
-     "<?xml version=\"1.0\"?><ar><name>YJM</name><id>2</id></ar>"].must_include(@artist.to_xml(:root_name=>'ar').gsub(/\n */m, ''))
+    @artist.to_xml(:root_name=>'ar').gsub(/\n */m, '').must_equal "<?xml version=\"1.0\"?><ar><id>2</id><name>YJM</name></ar>"
   end
 
   it "should support an :array_root_name option when serializing arrays" do
     artist = @artist
     Artist.dataset = Artist.dataset.with_extend{define_method(:all){[artist]}}
-    ["<?xml version=\"1.0\"?><ars><ar><id>2</id><name>YJM</name></ar></ars>",
-     "<?xml version=\"1.0\"?><ars><ar><name>YJM</name><id>2</id></ar></ars>"].must_include(Artist.to_xml(:array_root_name=>'ars', :root_name=>'ar').gsub(/\n */m, ''))
+    Artist.to_xml(:array_root_name=>'ars', :root_name=>'ar').gsub(/\n */m, '').must_equal "<?xml version=\"1.0\"?><ars><ar><id>2</id><name>YJM</name></ar></ars>"
   end
 
   it "should raise an exception for xml tags that aren't associations, columns, or setter methods" do

data/spec/guards_helper.rb

@@ -3,7 +3,7 @@ require 'minitest/autorun'
 require 'minitest/hooks/default'
 require 'minitest/shared_description'
 
-require "#{File.dirname(__FILE__)}/deprecation_helper.rb"
+require_relative "deprecation_helper"
 
 def Sequel.guarded?(*checked)
   unless ENV['SEQUEL_NO_PENDING']
@@ -36,6 +36,7 @@ module Minitest::Spec::DSL
   def cspecify(message, *checked, &block)
     if pending = Sequel.guarded?(*checked)
       it(message) do
+        proc{instance_exec(&block)}.must_raise(Exception) if ENV['SEQUEL_CHECK_PENDING']
         skip "Not yet working on #{Array(pending).map{|x| x.is_a?(Proc) ? :proc : x}.join(', ')}"
       end
     else

data/spec/integration/associations_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 OneToOneEagerLimitStrategies = shared_description do
   it "eager loading one_to_one associations should work correctly" do
@@ -1587,28 +1587,6 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
     @album.reload.alias_tags.must_equal []
   end
   
-  it "should work correctly with prepared_statements_association plugin" do
-    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
-
   it "should have working dataset associations" do
     album, artist, tag = @pr.call
 

data/spec/integration/database_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 describe Sequel::Database do
   before do
@@ -37,7 +37,7 @@ describe Sequel::Database do
       @db.drop_table?(:test2, :test)
     end
 
-    cspecify "should raise Sequel::UniqueConstraintViolation when a unique constraint is violated", [:jdbc, :sqlite], [:db2] do
+    cspecify "should raise Sequel::UniqueConstraintViolation when a unique constraint is violated", [:jdbc, :sqlite] do
       @db.create_table!(:test){String :a, :unique=>true, :null=>false}
       @db[:test].insert('1')
       proc{@db[:test].insert('1')}.must_raise(Sequel::UniqueConstraintViolation)
@@ -45,7 +45,7 @@ describe Sequel::Database do
       proc{@db[:test].update(:a=>'1')}.must_raise(Sequel::UniqueConstraintViolation)
     end
 
-    cspecify "should raise Sequel::UniqueConstraintViolation when a unique constraint is violated for composite primary keys", [:jdbc, :sqlite], [:db2] do
+    cspecify "should raise Sequel::UniqueConstraintViolation when a unique constraint is violated for composite primary keys", [:jdbc, :sqlite] do
       @db.create_table!(:test){String :a; String :b; primary_key [:a, :b]}
       @db[:test].insert(:a=>'1', :b=>'2')
       proc{@db[:test].insert(:a=>'1', :b=>'2')}.must_raise(Sequel::UniqueConstraintViolation)
@@ -53,14 +53,14 @@ describe Sequel::Database do
       proc{@db[:test].update(:a=>'1', :b=>'2')}.must_raise(Sequel::UniqueConstraintViolation)
     end
 
-    cspecify "should raise Sequel::CheckConstraintViolation when a check constraint is violated", :mysql, [:db2], [proc{|db| db.sqlite_version < 30802}, :sqlite] do
+    cspecify "should raise Sequel::CheckConstraintViolation when a check constraint is violated", [proc{|db| !db.mariadb? || db.server_version <= 100200}, :mysql], [proc{|db| db.sqlite_version < 30802}, :sqlite] do
       @db.create_table!(:test){String :a; check Sequel.~(:a=>'1')}
       proc{@db[:test].insert('1')}.must_raise(Sequel::CheckConstraintViolation)
       @db[:test].insert('2')
       proc{@db[:test].insert('1')}.must_raise(Sequel::CheckConstraintViolation)
     end
 
-    cspecify "should raise Sequel::ForeignKeyConstraintViolation when a foreign key constraint is violated", [:jdbc, :sqlite], [:db2]  do
+    cspecify "should raise Sequel::ForeignKeyConstraintViolation when a foreign key constraint is violated", [:jdbc, :sqlite]  do
       @db.create_table!(:test, :engine=>:InnoDB){primary_key :id}
       @db.create_table!(:test2, :engine=>:InnoDB){foreign_key :tid, :test}
       proc{@db[:test2].insert(:tid=>1)}.must_raise(Sequel::ForeignKeyConstraintViolation)
@@ -70,7 +70,7 @@ describe Sequel::Database do
       proc{@db[:test].where(:id=>1).delete}.must_raise(Sequel::ForeignKeyConstraintViolation)
     end
 
-    cspecify "should raise Sequel::NotNullConstraintViolation when a not null constraint is violated", [:jdbc, :sqlite], [:db2] do
+    cspecify "should raise Sequel::NotNullConstraintViolation when a not null constraint is violated", [:jdbc, :sqlite] do
       @db.create_table!(:test){Integer :a, :null=>false}
       proc{@db[:test].insert(:a=>nil)}.must_raise(Sequel::NotNullConstraintViolation)
       unless @db.database_type == :mysql
@@ -104,7 +104,7 @@ describe Sequel::Database do
     @db.disconnect_connection(conn)
   end
 
-  cspecify "should provide ability to check connections for validity", [:do, :postgres] do
+  it "should provide ability to check connections for validity" do
     conn = @db.synchronize{|c| c}
     @db.valid_connection?(conn).must_equal true
     @db.disconnect

data/spec/integration/dataset_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 describe "Simple Dataset operations" do
   before do
@@ -49,12 +49,6 @@ describe "Simple Dataset operations" do
     @ds.filter(:id=>2).first[:number].must_equal 20
   end
 
-  deprecated "should have insert_multiple return primary key values" do
-    @ds.extension(:sequel_3_dataset_methods).insert_multiple([{:number=>20}, {:number=>30}]).must_equal [2, 3]
-    @ds.filter(:id=>2).get(:number).must_equal 20
-    @ds.filter(:id=>3).get(:number).must_equal 30
-  end
-
   it "should join correctly" do
     @ds.join(Sequel[:items].as(:b), :id=>:id).select_all(:items).all.must_equal [{:id=>1, :number=>10}]
   end
@@ -108,7 +102,7 @@ describe "Simple Dataset operations" do
     @ds.all.must_equal [{:id=>1, :number=>11}]
   end
   
-  cspecify "should have update return the number of matched rows", [:do, :mysql] do
+  it "should have update return the number of matched rows" do
     @ds.update(:number=>:number).must_equal 1
     @ds.filter(:id=>1).update(:number=>:number).must_equal 1
     @ds.filter(:id=>2).update(:number=>:number).must_equal 0
@@ -171,7 +165,7 @@ describe "Simple Dataset operations" do
     @ds.all.must_equal [{:id=>1, :number=>10}]
   end
 
-  cspecify "should skip locked rows correctly", [:do] do
+  it "should skip locked rows correctly" do
     @ds.insert(:number=>10)
     q1 = Queue.new
     q2 = Queue.new
@@ -777,6 +771,13 @@ if DB.dataset.supports_cte?(:update) # Assume INSERT and DELETE support as well
       @ds2.filter(:id=>@db[:t].select{max(id)}).delete
       @ds.select_order_map(:id).must_equal [1, 1]
     end
+
+    it "should support a subselect in an subquery used for INSERT" do
+      @db.transaction(:rollback=>:always) do
+        @ds.insert([:id], @db[:foo].with(:foo, @ds.select{(id + 10).as(:id)}))
+        @ds.select_order_map(:id).must_equal [1,2,11,12]
+      end
+    end
   end
 end
 
@@ -927,13 +928,13 @@ describe Sequel::SQL::Constants do
     (Time.now - @c[@ds.get(:t)]).must_be_close_to 0, 60
   end
 
-  cspecify "should have working CURRENT_TIMESTAMP", [:jdbc, :sqlite], [:swift] do
+  cspecify "should have working CURRENT_TIMESTAMP", [:jdbc, :sqlite] do
     @db.create_table!(:constants){DateTime :ts}
     @ds.insert(:ts=>Sequel::CURRENT_TIMESTAMP)
     (Time.now - @c[@ds.get(:ts)]).must_be_close_to 0, 60
   end
 
-  cspecify "should have working CURRENT_TIMESTAMP when used as a column default", [:jdbc, :sqlite], [:swift] do
+  cspecify "should have working CURRENT_TIMESTAMP when used as a column default", [:jdbc, :sqlite] do
     @db.create_table!(:constants){DateTime :ts, :default=>Sequel::CURRENT_TIMESTAMP}
     @ds.insert
     (Time.now - @c[@ds.get(:ts)]).must_be_close_to 0, 60
@@ -1055,12 +1056,6 @@ describe "Sequel::Dataset convenience methods" do
     @db.drop_table?(:a)
   end
   
-  deprecated "#[]= should update matching rows" do
-    @ds.insert(20, 10)
-    @ds.extension(:sequel_3_dataset_methods)[:a=>20] = {:b=>30}
-    @ds.all.must_equal [{:a=>20, :b=>30}]
-  end
-  
   it "#empty? should return whether the dataset returns no rows" do
     @ds.empty?.must_equal true
     @ds.insert(20, 10)
@@ -1751,36 +1746,6 @@ describe "Dataset identifier methods" do
   end
 end if IDENTIFIER_MANGLING
 
-describe "Dataset defaults and overrides" do
-  before(:all) do
-    @db = DB
-    @db.create_table!(:a){Integer :a}
-    deprecated do
-      @ds = @db[:a].order(:a).extension(:set_overrides)
-    end
-  end
-  before do
-    @ds.delete
-  end
-  after(:all) do
-    @db.drop_table?(:a)
-  end
-  
-  it "#set_defaults should set defaults that can be overridden" do
-    @ds = @ds.set_defaults(:a=>10)
-    @ds.insert
-    @ds.insert(:a=>20)
-    @ds.all.must_equal [{:a=>10}, {:a=>20}]
-  end
-  
-  it "#set_overrides should set defaults that cannot be overridden" do
-    @ds = @ds.set_overrides(:a=>10)
-    @ds.insert
-    @ds.insert(:a=>20)
-    @ds.all.must_equal [{:a=>10}, {:a=>10}]
-  end
-end
-
 if DB.dataset.supports_modifying_joins?
   describe "Modifying joined datasets" do
     before do

data/spec/integration/eager_loader_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 describe "Eagerly loading a tree structure" do
   before(:all) do

data/spec/integration/migrator_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 Sequel.extension :migration
 describe Sequel::Migrator do

data/spec/integration/model_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 describe "Sequel::Model basic support" do 
   before do
@@ -49,20 +49,9 @@ describe "Sequel::Model basic support" do
     Item.all.must_equal [Item.load(:id=>1, :name=>'J')]
   end
 
-  deprecated "should not raise an error if the implied database table doesn't exist" do
-    class ::Item::Thing < Sequel::Model(@db)
-      set_dataset :items
-    end
-    Item.create(:name=>'J')
-    Item::Thing.first.must_equal Item::Thing.load(:id=>1, :name=>'J')
-  end
-
-  it "should raise an error if the implied database table doesn't exist if require_valid_table is true" do
+  it "should raise an error if the implied database table doesn't exist" do
     proc do
-      c = Sequel::Model(@db)
-      c.require_valid_table = true
-      class ::Item::Thing < c
-        set_dataset :items
+      class ::Item::Thing < Sequel::Model
       end
     end.must_raise Sequel::Error
   end
@@ -108,59 +97,6 @@ describe "Sequel::Model basic support" do
     i.save.must_be_nil
   end
 
-  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
-      @hooks
-    end
-    def i.rb=(x)
-      @hooks = []
-      @rb = x
-    end
-    def i.after_save
-      @hooks << :as
-      raise Sequel::Rollback if @rb
-    end
-    def i.after_destroy
-      @hooks << :ad
-      raise Sequel::Rollback if @rb
-    end
-    def i.after_commit
-      @hooks << :ac
-    end
-    def i.after_rollback
-      @hooks << :ar
-    end
-    def i.after_destroy_commit
-      @hooks << :adc
-    end
-    def i.after_destroy_rollback
-      @hooks << :adr
-    end
-    i.name = 'K'
-    i.rb = true
-    i.save.must_be_nil
-    i.reload.name.must_equal 'J'
-    i.hooks.must_equal [:as, :ar]
-
-    i.rb = true
-    i.destroy.must_be_nil
-    i.exists?.must_equal true
-    i.hooks.must_equal [:ad, :adr]
-
-    i.name = 'K'
-    i.rb = false
-    i.save.wont_equal nil
-    i.reload.name.must_equal 'K'
-    i.hooks.must_equal [:as, :ac]
-
-    i.rb = false
-    i.destroy.wont_equal nil
-    i.exists?.must_equal false
-    i.hooks.must_equal [:ad, :adc]
-  end
-
   it "#exists? should return whether the item is still in the database" do
     i = Item.create(:name=>'J')
     i.exists?.must_equal true
@@ -239,27 +175,13 @@ describe "Sequel::Model basic support" do
 end
 
 describe "Sequel::Model with no existing table" do 
-  deprecated "should not raise an error when setting the dataset" do
-    db = DB
-    db.drop_table?(:items)
-    c = Class.new(Sequel::Model)
-    c.set_dataset(db[:items])
-    db.transaction do
-      c = Class.new(Sequel::Model(db[:items]))
-      db.get(Sequel.cast(1, Integer)).must_equal 1
-    end
-  end
-
-  it "should not raise an error when setting the dataset when require_valid_table is true" do
+  it "should not raise an error when setting the dataset" do
     db = DB
     db.drop_table?(:items)
-    c1 = Sequel::Model(db);
     c = Class.new(Sequel::Model)
-    c.require_valid_table = true
     proc{c.set_dataset(db[:items])}.must_raise Sequel::Error
     db.transaction do
       c = Class.new(Sequel::Model)
-      c.require_valid_table = true
       proc{c.dataset = db[:items]}.must_raise Sequel::Error
       db.get(Sequel.cast(1, Integer)).must_equal 1
     end

data/spec/integration/plugin_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
+require_relative "spec_helper"
 
 describe "Class Table Inheritance Plugin" do
   before(:all) do
@@ -26,7 +26,7 @@ describe "Class Table Inheritance Plugin" do
   before do
     [:staff, :executives, :managers, :employees].each{|t| @db[t].delete}
     class ::Employee < Sequel::Model(@db)
-      plugin :class_table_inheritance, :key=>:kind, :table_map=>{:Staff=>:staff}, :alias=>:employees
+      plugin :class_table_inheritance, :key=>:kind, :table_map=>{:Staff=>:staff}
     end 
     class ::Manager < Employee
       one_to_many :staff_members, :class=>:Staff
@@ -570,7 +570,7 @@ describe "Touch plugin" do
     @album.updated_at.to_i.must_be_close_to Time.now.to_i, 2
   end
   
-  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
+  cspecify "should update the timestamp column for many_to_one associated records when the record is updated or destroyed", [:jdbc, :sqlite] do
     Album.many_to_one :artist
     Album.plugin :touch, :associations=>:artist
     @artist.updated_at.must_be_nil
@@ -590,7 +590,7 @@ describe "Touch plugin" do
     end
   end
 
-  cspecify "should update the timestamp column for one_to_many associated records when the record is updated", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
+  cspecify "should update the timestamp column for one_to_many associated records when the record is updated", [:jdbc, :sqlite] do
     Artist.one_to_many :albums
     Artist.plugin :touch, :associations=>:albums
     @album.updated_at.must_be_nil
@@ -603,7 +603,7 @@ describe "Touch plugin" do
     end
   end
 
-  cspecify "should update the timestamp column for many_to_many associated records when the record is updated", [:do, :sqlite], [:jdbc, :sqlite], [:swift] do
+  cspecify "should update the timestamp column for many_to_many associated records when the record is updated", [:jdbc, :sqlite] do
     Artist.many_to_many :albums
     Artist.plugin :touch, :associations=>:albums
     @artist.add_album(@album)
@@ -1315,25 +1315,9 @@ describe "AssociationPks plugin" do
     Vocalist.order(:first, :last).all.map{|a| a.hit_pks.sort}.must_equal [[@h1, @h2, @h3], [@h2], []]
   end
 
-  deprecated "should handle :delay_pks=>true association option for new instances" do
+  it "should default to delaying association_pks setter method changes until saving" 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')
-    album.tag_pks.must_equal []
-    album.tag_pks = [@t1, @t2]
-    album.tag_pks.must_equal [@t1, @t2]
-    album.save
-    album_class.with_pk!(album.pk).tag_pks.sort.must_equal [@t1, @t2]
-
-    album.tag_pks = []
-    album.tag_pks.must_equal []
-    album.save
-    album_class.with_pk!(album.pk).tag_pks.sort.must_equal []
-  end
-
-  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)
     album.tag_pks.sort.must_equal [@t1, @t2, @t3]
     album.tag_pks = [@t1, @t2]
@@ -2059,7 +2043,7 @@ describe "Sequel::Plugins::ConstraintValidations" do
   end
 
   ConstraintValidationsSpecs = shared_description do
-    cspecify "should set up constraints that work even outside the model", :mysql do 
+    cspecify "should set up constraints that work even outside the model", [proc{|db| !db.mariadb? || db.server_version <= 100200}, :mysql] do 
       @ds.insert(@valid_row)
 
       # Test for unique constraint