sequel 4.49.0 → 5.3.0

data/spec/extensions/hook_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)
@@ -140,39 +140,6 @@ describe Sequel::Model, "hook_class_methods plugin" do
     adds.must_equal ['456']
   end
   
-  deprecated "should stop processing if a before hook returns false" do
-    flag = true
-    adds = []
-    
-    a = model_class.call Sequel::Model do
-      before_save{adds << 'cruel'; flag}
-      before_save{adds << 'blah'; flag}
-    end
-    
-    a.new.before_save
-    adds.must_equal ['blah', 'cruel']
-
-    # chain should not break on nil
-    adds = []
-    flag = nil
-    a.new.before_save
-    adds.must_equal ['blah', 'cruel']
-    
-    adds = []
-    flag = false
-    a.new.before_save
-    adds.must_equal ['blah']
-    
-    b = Class.new(a)
-    b.class_eval do
-      before_save{adds << 'mau'}
-    end
-    
-    adds = []
-    b.new.before_save
-    adds.must_equal ['mau', 'blah']
-  end
-
   it "should stop processing if a before hook calls cancel_action" do
     flag = true
     adds = []
@@ -226,25 +193,12 @@ describe "Model#before_create && Model#after_create" do
     DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after']
   end
 
-  deprecated ".create should cancel the save and raise an error if before_create returns false and raise_on_save_failure is true" do
-    @c.before_create{false}
-    proc{@c.create(:x => 2)}.must_raise(Sequel::HookFailed)
-    DB.sqls.must_equal []
-  end
-
   it ".create should cancel the save and raise an error if before_create calls cancel_action and raise_on_save_failure is true" do
     @c.before_create{cancel_action}
     proc{@c.create(:x => 2)}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  deprecated ".create should cancel the save and return nil if before_create returns false and raise_on_save_failure is false" do
-    @c.before_create{false}
-    @c.raise_on_save_failure = false
-    @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.before_create{cancel_action}
     @c.raise_on_save_failure = false
@@ -269,25 +223,12 @@ describe "Model#before_update && Model#after_update" do
     DB.sqls.must_equal ['BLAH before', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'BLAH after']
   end
 
-  deprecated "#save should cancel the save and raise an error if before_update returns false and raise_on_save_failure is true" do
-    @c.before_update{false}
-    proc{@c.load(:id => 2233).save}.must_raise(Sequel::HookFailed)
-    DB.sqls.must_equal []
-  end
-
   it "#save should cancel the save and raise an error if before_update calls cancel_action and raise_on_save_failure is true" do
     @c.before_update{cancel_action}
     proc{@c.load(:id => 2233).save}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  deprecated "#save should cancel the save and return nil if before_update returns false and raise_on_save_failure is false" do
-    @c.before_update{false}
-    @c.raise_on_save_failure = false
-    @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.before_update{cancel_action}
     @c.raise_on_save_failure = false
@@ -320,25 +261,12 @@ describe "Model#before_save && Model#after_save" do
     DB.sqls.must_equal ['BLAH before', 'INSERT INTO items (x) VALUES (2)', 'BLAH after']
   end
 
-  deprecated "#save should cancel the save and raise an error if before_save returns false and raise_on_save_failure is true" do
-    @c.before_save{false}
-    proc{@c.load(:id => 2233).save}.must_raise(Sequel::HookFailed)
-    DB.sqls.must_equal []
-  end
-
   it "#save should cancel the save and raise an error if before_save calls cancel_action and raise_on_save_failure is true" do
     @c.before_save{cancel_action}
     proc{@c.load(:id => 2233).save}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  deprecated "#save should cancel the save and return nil if before_save returns false and raise_on_save_failure is false" do
-    @c.before_save{false}
-    @c.raise_on_save_failure = false
-    @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.before_save{cancel_action}
     @c.raise_on_save_failure = false
@@ -363,25 +291,12 @@ describe "Model#before_destroy && Model#after_destroy" do
     DB.sqls.must_equal ['BLAH before', "DELETE FROM items WHERE id = 2233", 'BLAH after']
   end
 
-  deprecated "#destroy should cancel the destroy and raise an error if before_destroy returns false and raise_on_save_failure is true" do
-    @c.before_destroy{false}
-    proc{@c.load(:id => 2233).destroy}.must_raise(Sequel::HookFailed)
-    DB.sqls.must_equal []
-  end
-
   it "#destroy should cancel the destroy and raise an error if before_destroy calls cancel_action and raise_on_save_failure is true" do
     @c.before_destroy{cancel_action}
     proc{@c.load(:id => 2233).destroy}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  deprecated "#destroy should cancel the destroy and return nil if before_destroy returns false and raise_on_save_failure is false" do
-    @c.before_destroy{false}
-    @c.raise_on_save_failure = false
-    @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.before_destroy{cancel_action}
     @c.raise_on_save_failure = false
@@ -430,25 +345,12 @@ describe "Model#before_validation && Model#after_validation" do
     DB.sqls.must_equal ['BLAH before', 'BLAH after']
   end
 
-  deprecated "#save should cancel the save and raise an error if before_validation returns false and raise_on_save_failure is true" do
-    @c.before_validation{false}
-    proc{@c.load(:id => 2233).save}.must_raise(Sequel::HookFailed)
-    DB.sqls.must_equal []
-  end
-
   it "#save should cancel the save and raise an error if before_validation calls cancel_action and raise_on_save_failure is true" do
     @c.before_validation{cancel_action}
     proc{@c.load(:id => 2233).save}.must_raise(Sequel::HookFailed)
     DB.sqls.must_equal []
   end
 
-  deprecated "#save should cancel the save and return nil if before_validation returns false and raise_on_save_failure is false" do
-    @c.before_validation{false}
-    @c.raise_on_save_failure = false
-    @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.before_validation{cancel_action}
     @c.raise_on_save_failure = false
@@ -457,52 +359,6 @@ describe "Model#before_validation && Model#after_validation" do
   end
 end
 
-describe "Model transaction hooks" do
-  before do
-    DB.reset
-
-    @c = model_class.call(Sequel::Model(:items)) do
-      columns :x
-      after_save {DB << "AS"}
-      after_destroy {DB << "AD"}
-      self.use_transactions = true
-    end
-  end
-  
-  deprecated "should call after_commit or after_rollback depending on whether the transaction commits or rolls back" do
-    @c.after_commit{DB << 'AC'}
-    @c.after_rollback{DB << 'AR'}
-    m = @c.load(:id => 2233, :x=>123)
-
-    m.save
-    DB.sqls.must_equal ['BEGIN', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'AS', 'COMMIT', 'AC']
-
-    @c.db.transaction(:rollback=>:always){m.save}
-    DB.sqls.must_equal ['BEGIN', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'AS', 'ROLLBACK', 'AR']
-
-    @c.db.transaction do
-      m.save
-      DB.sqls.must_equal ['BEGIN', 'UPDATE items SET x = 123 WHERE (id = 2233)', 'AS']
-    end
-  end
-  
-  deprecated "should call after_destroy_commit or after_destroy_rollback depending on whether the transaction commits or rolls back" do
-    @c.after_destroy_commit {DB << 'ADC'}
-    @c.after_destroy_rollback{DB << 'ADR'}
-
-    @c.load(:id => 2233).destroy
-    DB.sqls.must_equal ['BEGIN', 'DELETE FROM items WHERE id = 2233', 'AD', 'COMMIT', 'ADC']
-
-    @c.db.transaction(:rollback=>:always){@c.load(:id => 2233).destroy}
-    DB.sqls.must_equal ['BEGIN', 'DELETE FROM items WHERE id = 2233', 'AD', 'ROLLBACK', 'ADR']
-
-    @c.db.transaction do
-      @c.load(:id => 2233).destroy
-      DB.sqls.must_equal ['BEGIN', 'DELETE FROM items WHERE id = 2233', 'AD']
-    end
-  end
-end
-
 describe "Model.has_hooks?" do
   before do
     @c = model_class.call(Sequel::Model(:items))
@@ -522,52 +378,3 @@ describe "Model.has_hooks?" do
     @d.has_hooks?(:before_save).must_equal false
   end
 end
-
-describe "Model#add_hook_type" do
-  before do
-    deprecated do
-      class ::Foo < Sequel::Model(:items)
-        plugin :hook_class_methods
-        add_hook_type :before_bar, :after_bar
-
-        def bar
-          return :b if before_bar == false
-          return :a if after_bar == false
-          true
-        end
-      end
-      @f = Class.new(Foo)
-    end
-  end
-  after do
-    Object.send(:remove_const, :Foo)
-  end
-
-  deprecated "should have before_bar and after_bar class methods" do
-    @f.must_respond_to(:before_bar)
-    @f.must_respond_to(:before_bar)
-  end
-
-  deprecated "should have before_bar and after_bar instance methods" do
-    @f.new.must_respond_to(:before_bar)
-    @f.new.must_respond_to(:before_bar)
-  end
-
-  deprecated "it should return true for bar when before_bar and after_bar hooks are returing true" do
-    a = 1
-    @f.before_bar { a += 1}
-    @f.new.bar.must_equal true
-    a.must_equal 2
-    @f.after_bar { a *= 2}
-    @f.new.bar.must_equal true
-    a.must_equal 6
-  end
-
-  deprecated "it should return nil for bar when before_bar and after_bar hooks are returing false" do
-    @f.new.bar.must_equal true
-    @f.after_bar { false }
-    @f.new.bar.must_equal :a
-    @f.before_bar { false }
-    @f.new.bar.must_equal :b
-  end
-end

data/spec/extensions/identifier_mangling_spec.rb

@@ -1,14 +1,6 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "identifier_mangling extension" do
-  after do
-    deprecated do
-      Sequel.quote_identifiers = false
-      Sequel.identifier_input_method = nil
-      Sequel.identifier_output_method = nil
-    end
-  end
-  
   it "should respect the :quote_identifiers option" do
     db = Sequel::Database.new(:quote_identifiers=>false).extension(:identifier_mangling)
     db.quote_identifiers?.must_equal false
@@ -18,78 +10,37 @@ describe "identifier_mangling extension" do
 
   it "should respect the :quote_identifiers setting" do
     db = Sequel::Database.new.extension(:identifier_mangling)
-    db.quote_identifiers?.must_equal false
-    db.quote_identifiers = true
     db.quote_identifiers?.must_equal true
+    db.quote_identifiers = false
+    db.quote_identifiers?.must_equal false
   end
 
   it "should upcase on input and downcase on output by default" do
-    # SEQUEL5: Remove :identifier_mangling=>false
-    db = Sequel::Database.new(:identifier_mangling=>false).extension(:identifier_mangling)
+    db = Sequel::Database.new.extension(:identifier_mangling)
     db.send(:identifier_input_method_default).must_equal :upcase
     db.send(:identifier_output_method_default).must_equal :downcase
   end
 
   it "should respect the :identifier_input_method option" do
     db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :downcase
-    db.identifier_input_method.must_equal :downcase
-    db = Sequel::Database.new(:identifier_input_method=>nil).extension(:identifier_mangling)
-    db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :downcase
-    db.identifier_input_method.must_equal :downcase
-    db = Sequel::Database.new(:identifier_input_method=>:upcase).extension(:identifier_mangling)
     db.identifier_input_method.must_equal :upcase
     db.identifier_input_method = nil
     db.identifier_input_method.must_be_nil
-  end
-  
-  deprecated "should default to Sequel.identifier_input_method" do
-    Sequel.identifier_input_method = :downcase
-    Sequel::Database.identifier_input_method.must_equal :downcase
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_input_method.must_equal :downcase
-    db.identifier_input_method = :upcase
-    db.identifier_input_method.must_equal :upcase
     db = Sequel::Database.new(:identifier_input_method=>nil).extension(:identifier_mangling)
     db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :upcase
-    db.identifier_input_method.must_equal :upcase
+    db.identifier_input_method = :downcase
+    db.identifier_input_method.must_equal :downcase
     db = Sequel::Database.new(:identifier_input_method=>:upcase).extension(:identifier_mangling)
     db.identifier_input_method.must_equal :upcase
     db.identifier_input_method = nil
     db.identifier_input_method.must_be_nil
-    Sequel.identifier_input_method = nil
-    Sequel::Database.identifier_input_method.must_equal false
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_input_method.must_be_nil
-    db.identifier_input_method = :upcase
-    db.identifier_input_method.must_equal :upcase
   end
   
   it "should respect the :identifier_output_method option" do
     db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_output_method.must_be_nil
-    db.identifier_output_method = :upcase
-    db.identifier_output_method.must_equal :upcase
-    db = Sequel::Database.new(:identifier_output_method=>nil).extension(:identifier_mangling)
-    db.identifier_output_method.must_be_nil
-    db.identifier_output_method = :downcase
     db.identifier_output_method.must_equal :downcase
-    db = Sequel::Database.new(:identifier_output_method=>:upcase).extension(:identifier_mangling)
-    db.identifier_output_method.must_equal :upcase
     db.identifier_output_method = nil
     db.identifier_output_method.must_be_nil
-  end
-
-  deprecated "should default to Sequel.identifier_output_method" do
-    Sequel.identifier_output_method = :upcase
-    Sequel::Database.identifier_output_method.must_equal :upcase
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_output_method.must_equal :upcase
-    db.identifier_output_method = :downcase
-    db.identifier_output_method.must_equal :downcase
     db = Sequel::Database.new(:identifier_output_method=>nil).extension(:identifier_mangling)
     db.identifier_output_method.must_be_nil
     db.identifier_output_method = :downcase
@@ -98,56 +49,8 @@ describe "identifier_mangling extension" do
     db.identifier_output_method.must_equal :upcase
     db.identifier_output_method = nil
     db.identifier_output_method.must_be_nil
-    Sequel.identifier_output_method = nil
-    Sequel::Database.identifier_output_method.must_equal false
-    db = Sequel::Database.new.extension(:identifier_mangling)
-    db.identifier_output_method.must_be_nil
-    db.identifier_output_method = :downcase
-    db.identifier_output_method.must_equal :downcase
-  end
-
-  deprecated "should use the default Sequel.quote_identifiers value" do
-    Sequel.quote_identifiers = true
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-    Sequel.quote_identifiers = false
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal false
-    Sequel::Database.quote_identifiers = true
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-    Sequel::Database.quote_identifiers = false
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal false
-  end
-
-  deprecated "should use the default Sequel.identifier_input_method value" do
-    Sequel.identifier_input_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :downcase
-    Sequel.identifier_input_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :upcase
-    Sequel::Database.identifier_input_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :downcase
-    Sequel::Database.identifier_input_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_input_method.must_equal :upcase
-  end
-  
-  deprecated "should use the default Sequel.identifier_output_method value" do
-    Sequel.identifier_output_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :downcase
-    Sequel.identifier_output_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :upcase
-    Sequel::Database.identifier_output_method = :downcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :downcase
-    Sequel::Database.identifier_output_method = :upcase
-    Sequel::Database.new.extension(:identifier_mangling).identifier_output_method.must_equal :upcase
   end
 
-  deprecated "should respect the quote_indentifiers_default method if Sequel.quote_identifiers = nil" do
-    Sequel.quote_identifiers = nil
-    Sequel::Database.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-    x = Class.new(Sequel::Database){def dataset_class_default; Sequel::Dataset end; def quote_identifiers_default; false end}
-    x.new.extension(:identifier_mangling).quote_identifiers?.must_equal false
-    y = Class.new(Sequel::Database){def dataset_class_default; Sequel::Dataset end; def quote_identifiers_default; true end}
-    y.new.extension(:identifier_mangling).quote_identifiers?.must_equal true
-  end
-  
   it "should respect the identifier_input_method_default method if Sequel.identifier_input_method is not called" do
     class Sequel::Database
       @identifier_input_method = nil
@@ -172,6 +75,7 @@ end
 describe "Database#input_identifier_meth" do
   it "should be the input_identifer method of a default dataset for this database" do
     db = Sequel::Database.new.extension(:identifier_mangling)
+    db.identifier_input_method = nil
     db.send(:input_identifier_meth).call(:a).must_equal 'a'
     db.identifier_input_method = :upcase
     db.send(:input_identifier_meth).call(:a).must_equal 'A'
@@ -181,6 +85,7 @@ end
 describe "Database#output_identifier_meth" do
   it "should be the output_identifer method of a default dataset for this database" do
     db = Sequel::Database.new.extension(:identifier_mangling)
+    db.identifier_output_method = nil
     db.send(:output_identifier_meth).call('A').must_equal :A
     db.identifier_output_method = :downcase
     db.send(:output_identifier_meth).call('A').must_equal :a
@@ -190,7 +95,7 @@ end
 describe "Database#metadata_dataset" do
   it "should be a dataset with the default settings for identifier_mangling" do
     ds = Sequel::Database.new.extension(:identifier_mangling).send(:metadata_dataset)
-    ds.literal(:a).must_equal 'A'
+    ds.literal(:a).must_equal "\"A\""
     ds.send(:output_identifier, 'A').must_equal :a
   end
 end
@@ -221,35 +126,6 @@ describe "Dataset" do
     db[:a].identifier_output_method.must_equal :downcase
   end
   
-  # SEQUEL5: Remove
-  unless Sequel.mock(:identifier_mangling=>true).dataset.frozen?
-    deprecated "should have quote_identifiers= method which changes literalization of identifiers" do
-      @dataset.quote_identifiers = true
-      @dataset.literal(:a).must_equal '"a"'
-      @dataset.quote_identifiers = false
-      @dataset.literal(:a).must_equal 'a'
-    end
-    
-    deprecated "should have identifier_input_method= method which changes literalization of identifiers" do
-      @dataset.identifier_input_method = :upcase
-      @dataset.literal(:a).must_equal 'A'
-      @dataset.identifier_input_method = :downcase
-      @dataset.literal(:A).must_equal 'a'
-      @dataset.identifier_input_method = :reverse
-      @dataset.literal(:at_b).must_equal 'b_ta'
-    end
-    
-    deprecated "should have identifier_output_method= method which changes identifiers returned from the database" do
-      @dataset.send(:output_identifier, "at_b_C").must_equal :at_b_C
-      @dataset.identifier_output_method = :upcase
-      @dataset.send(:output_identifier, "at_b_C").must_equal :AT_B_C
-      @dataset.identifier_output_method = :downcase
-      @dataset.send(:output_identifier, "at_b_C").must_equal :at_b_c
-      @dataset.identifier_output_method = :reverse
-      @dataset.send(:output_identifier, "at_b_C").must_equal :C_b_ta
-    end
-  end
-  
   it "should have with_quote_identifiers method which returns cloned dataset with changed literalization of identifiers" do
     @dataset.with_quote_identifiers(true).literal(:a).must_equal '"a"'
     @dataset.with_quote_identifiers(false).literal(:a).must_equal 'a'
@@ -285,45 +161,16 @@ describe "Dataset" do
   end
 end
 
-describe "Frozen Datasets" do
-  before do
-    @ds = Sequel.mock(:identifier_mangling=>true)[:test].freeze
-  end
-
-  deprecated "should raise an error when calling mutation methods" do
-    proc{@ds.identifier_input_method = :a}.must_raise RuntimeError
-    proc{@ds.identifier_output_method = :a}.must_raise RuntimeError
-    proc{@ds.quote_identifiers = false}.must_raise RuntimeError
-  end
-end
-
 describe "identifier_mangling extension" do
   it "should be able to load dialects based on the database name" do
-    begin
-      qi, ii, io = nil
-      deprecated do
-        qi = class Sequel::Database; @quote_identifiers; end
-        ii = class Sequel::Database; @identifier_input_method; end
-        io = class Sequel::Database; @identifier_output_method; end
-        Sequel.quote_identifiers = nil
-        class Sequel::Database; @identifier_input_method=nil; end
-        class Sequel::Database; @identifier_output_method=nil; end
-      end
-      Sequel.mock(:host=>'access').select(Date.new(2011, 12, 13)).sql.must_equal 'SELECT #2011-12-13#'
-      Sequel.mock(:host=>'db2').select(1).sql.must_equal 'SELECT 1 FROM "SYSIBM"."SYSDUMMY1"'
-      Sequel.mock(:host=>'mssql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM [A] WHERE (CONTAINS ([B], 'c'))"
-      Sequel.mock(:host=>'mysql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM `a` WHERE (MATCH (`b`) AGAINST ('c'))"
-      Sequel.mock(:host=>'oracle')[:a].limit(1).sql.must_equal 'SELECT * FROM (SELECT * FROM "A") "T1" WHERE (ROWNUM <= 1)'
-      Sequel.mock(:host=>'postgres')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM \"a\" WHERE (to_tsvector(CAST('simple' AS regconfig), (COALESCE(\"b\", ''))) @@ to_tsquery(CAST('simple' AS regconfig), 'c'))"
-      Sequel.mock(:host=>'sqlanywhere').from(:a).offset(1).sql.must_equal 'SELECT TOP 2147483647 START AT (1 + 1) * FROM "A"'
-      Sequel.mock(:host=>'sqlite')[Sequel[:a].as(:b)].sql.must_equal "SELECT * FROM `a` AS 'b'"
-    ensure
-      deprecated do
-        Sequel.quote_identifiers = qi
-        Sequel::Database.send(:instance_variable_set, :@identifier_input_method, ii)
-        Sequel::Database.send(:instance_variable_set, :@identifier_output_method, io)
-      end
-    end
+    Sequel.mock(:host=>'access').select(Date.new(2011, 12, 13)).sql.must_equal 'SELECT #2011-12-13#'
+    Sequel.mock(:host=>'db2').select(1).sql.must_equal 'SELECT 1 FROM "SYSIBM"."SYSDUMMY1"'
+    Sequel.mock(:host=>'mssql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM [A] WHERE (CONTAINS ([B], 'c'))"
+    Sequel.mock(:host=>'mysql')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM `a` WHERE (MATCH (`b`) AGAINST ('c'))"
+    Sequel.mock(:host=>'oracle')[:a].limit(1).sql.must_equal 'SELECT * FROM (SELECT * FROM "A") "T1" WHERE (ROWNUM <= 1)'
+    Sequel.mock(:host=>'postgres')[:a].full_text_search(:b, 'c').sql.must_equal "SELECT * FROM \"a\" WHERE (to_tsvector(CAST('simple' AS regconfig), (COALESCE(\"b\", ''))) @@ to_tsquery(CAST('simple' AS regconfig), 'c'))"
+    Sequel.mock(:host=>'sqlanywhere').from(:a).offset(1).sql.must_equal 'SELECT TOP 2147483647 START AT (1 + 1) * FROM "A"'
+    Sequel.mock(:host=>'sqlite')[Sequel[:a].as(:b)].sql.must_equal "SELECT * FROM `a` AS 'b'"
   end
 end
 

data/spec/extensions/implicit_subquery_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Dataset::ImplicitSubquery" do
   it "should implicitly use a subquery for most dataset query methods" do
@@ -9,10 +9,6 @@ describe "Sequel::Dataset::ImplicitSubquery" do
     ods = db[:c]
     ods.columns(:id, :b)
 
-    deprecated do
-      ds.and(:c).sql.must_equal "SELECT * FROM (SELECT * FROM table) AS t1 WHERE c"
-      ds.exclude_where(:c).sql.must_equal "SELECT * FROM (SELECT * FROM table) AS t1 WHERE NOT c"
-    end
     ds.cross_join(:c).sql.must_equal "SELECT * FROM (SELECT * FROM table) AS t1 CROSS JOIN c"
     ds.distinct.sql.must_equal "SELECT DISTINCT * FROM (SELECT * FROM table) AS t1"
     ds.except(ods).sql.must_equal "SELECT * FROM (SELECT * FROM (SELECT * FROM table) AS t1 EXCEPT SELECT * FROM c) AS t1"

data/spec/extensions/inflector_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :inflector
 

data/spec/extensions/input_transformer_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::InputTransformer" do
   before do
@@ -15,6 +15,12 @@ describe "Sequel::Plugins::InputTransformer" do
     @o.name.must_equal [1, 2, 3]
   end
 
+  it "should have working .input_transformer_order" do
+    @c.input_transformer_order.must_equal [:reverser]
+    @c.plugin(:input_transformer, :reverser2){|v| v.is_a?(String) ? v.reverse : v}
+    @c.input_transformer_order.must_equal [:reverser2, :reverser]
+  end
+
   it "should not apply any transformers by default" do
     c = Class.new(Sequel::Model)
     c.columns :name, :b
@@ -56,7 +62,6 @@ describe "Sequel::Plugins::InputTransformer" do
     @c.skip_input_transformer :reverser, :name
     @c.freeze
     @c.input_transformers.frozen?.must_equal true
-    @c.input_transformer_order.frozen?.must_equal true
     skip = @c.instance_variable_get(:@skip_input_transformer_columns)
     skip.frozen?.must_equal true
     skip.values.all?(&:frozen?).must_equal true

data/spec/extensions/insert_returning_select_spec.rb

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

data/spec/extensions/instance_filters_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "instance_filters plugin" do
   before do