sequel 4.49.0 → 5.3.0

data/spec/core_extensions_spec.rb

@@ -1,29 +1,14 @@
-require 'rubygems'
-
 if ENV['COVERAGE']
-  require File.join(File.dirname(File.expand_path(__FILE__)), "sequel_coverage")
+  require_relative "sequel_coverage"
   SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/extensions/core_extensions\.rb\z})
 end
 
-unless Object.const_defined?('Sequel') && Sequel.const_defined?('Model')
-  $:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../lib/"))
-  require 'sequel'
-end
-
-# SEQUEL5: Remove
-output = Sequel::Deprecation.output
-Sequel::Deprecation.output = nil
-Sequel.quote_identifiers = false
-Sequel.identifier_input_method = nil
-Sequel.identifier_output_method = nil
-Sequel::Deprecation.output = output
+$:.unshift(File.join(File.dirname(File.expand_path(__FILE__)), "../lib/"))
+require_relative '../lib/sequel'
 
 Regexp.send(:include, Sequel::SQL::StringMethods)
 String.send(:include, Sequel::SQL::StringMethods)
 Sequel.extension :core_extensions
-if RUBY_VERSION < '1.9.0'
-  Sequel.extension :ruby18_symbol_extensions
-end
 Sequel.extension :symbol_aref
 Sequel.extension :virtual_row_method_block
 
@@ -31,7 +16,7 @@ gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'
 
-require File.expand_path("#{File.dirname(__FILE__)}/deprecation_helper.rb")
+require_relative "deprecation_helper.rb"
 
 describe "Sequel core extensions" do
   it "should have Sequel.core_extensions? be true if enabled" do
@@ -53,45 +38,6 @@ describe "Core extensions" do
     end
   end
   
-  if RUBY_VERSION < '1.9.0'
-    it "should not allow inequality operations on true, false, or nil" do
-      @d.lit(:x > 1).must_equal "(x > 1)"
-      @d.lit(:x < true).must_equal "(x < 't')"
-      @d.lit(:x >= false).must_equal "(x >= 'f')"
-      @d.lit(:x <= nil).must_equal "(x <= NULL)"
-    end
-
-    it "should not allow inequality operations on boolean complex expressions" do
-      @d.lit(:x > (:y > 5)).must_equal "(x > (y > 5))"
-      @d.lit(:x < (:y < 5)).must_equal "(x < (y < 5))"
-      @d.lit(:x >= (:y >= 5)).must_equal "(x >= (y >= 5))"
-      @d.lit(:x <= (:y <= 5)).must_equal "(x <= (y <= 5))"
-      @d.lit(:x > {:y => nil}).must_equal "(x > (y IS NULL))"
-      @d.lit(:x < ~{:y => nil}).must_equal "(x < (y IS NOT NULL))"
-      @d.lit(:x >= {:y => 5}).must_equal "(x >= (y = 5))"
-      @d.lit(:x <= ~{:y => 5}).must_equal "(x <= (y != 5))"
-      @d.lit(:x >= {:y => [1,2,3]}).must_equal "(x >= (y IN (1, 2, 3)))"
-      @d.lit(:x <= ~{:y => [1,2,3]}).must_equal "(x <= (y NOT IN (1, 2, 3)))"
-    end
-    
-    it "should support >, <, >=, and <= via Symbol#>,<,>=,<=" do
-      @d.l(:x > 100).must_equal '(x > 100)'
-      @d.l(:x < 100.01).must_equal '(x < 100.01)'
-      @d.l(:x >= 100000000000000000000000000000000000).must_equal '(x >= 100000000000000000000000000000000000)'
-      @d.l(:x <= 100).must_equal '(x <= 100)'
-    end
-    
-    it "should support negation of >, <, >=, and <= via Symbol#~" do
-      @d.l(~(:x > 100)).must_equal '(x <= 100)'
-      @d.l(~(:x < 100.01)).must_equal '(x >= 100.01)'
-      @d.l(~(:x >= 100000000000000000000000000000000000)).must_equal '(x < 100000000000000000000000000000000000)'
-      @d.l(~(:x <= 100)).must_equal '(x > 100)'
-    end
-    
-    it "should support double negation via ~" do
-      @d.l(~~(:x > 100)).must_equal '(x > 100)'
-    end
-  end
   it "should support NOT via Symbol#~" do
     @d.l(~:x).must_equal 'NOT x'
   end
@@ -284,8 +230,7 @@ describe "Array#case and Hash#case" do
   it "should return SQL CASE expression" do
     @d.literal({:x=>:y}.case(:z)).must_equal '(CASE WHEN x THEN y ELSE z END)'
     @d.literal({:x=>:y}.case(:z, :exp)).must_equal '(CASE exp WHEN x THEN y ELSE z END)'
-    ['(CASE WHEN x THEN y WHEN a THEN b ELSE z END)',
-     '(CASE WHEN a THEN b WHEN x THEN y ELSE z END)'].must_include(@d.literal({:x=>:y, :a=>:b}.case(:z)))
+    @d.literal({:x=>:y, :a=>:b}.case(:z)).must_equal '(CASE WHEN x THEN y WHEN a THEN b ELSE z END)'
     @d.literal([[:x, :y]].case(:z)).must_equal '(CASE WHEN x THEN y ELSE z END)'
     @d.literal([[:x, :y], [:a, :b]].case(:z)).must_equal '(CASE WHEN x THEN y WHEN a THEN b ELSE z END)'
     @d.literal([[:x, :y], [:a, :b]].case(:z, :exp)).must_equal '(CASE exp WHEN x THEN y WHEN a THEN b ELSE z END)'
@@ -308,7 +253,7 @@ describe "Array#case and Hash#case" do
   end
 end
 
-describe "Array#sql_value_list and #sql_array" do
+describe "Array#sql_value_list" do
   before do
     @d = Sequel.mock.dataset
   end
@@ -316,17 +261,11 @@ describe "Array#sql_value_list and #sql_array" do
   it "should treat the array as an SQL value list instead of conditions when used as a placeholder value" do
     @d.filter(Sequel.lit("(a, b) IN ?", [[:x, 1], [:y, 2]])).sql.must_equal 'SELECT * WHERE ((a, b) IN ((x = 1) AND (y = 2)))'
     @d.filter(Sequel.lit("(a, b) IN ?", [[:x, 1], [:y, 2]].sql_value_list)).sql.must_equal 'SELECT * WHERE ((a, b) IN ((x, 1), (y, 2)))'
-    deprecated do
-      @d.filter(Sequel.lit("(a, b) IN ?", [[:x, 1], [:y, 2]].sql_array)).sql.must_equal 'SELECT * WHERE ((a, b) IN ((x, 1), (y, 2)))'
-    end
   end
 
   it "should be no difference when used as a hash value" do
     @d.filter([:a, :b]=>[[:x, 1], [:y, 2]]).sql.must_equal 'SELECT * WHERE ((a, b) IN ((x, 1), (y, 2)))'
     @d.filter([:a, :b]=>[[:x, 1], [:y, 2]].sql_value_list).sql.must_equal 'SELECT * WHERE ((a, b) IN ((x, 1), (y, 2)))'
-    deprecated do
-      @d.filter([:a, :b]=>[[:x, 1], [:y, 2]].sql_array).sql.must_equal 'SELECT * WHERE ((a, b) IN ((x, 1), (y, 2)))'
-    end
   end
 end
 
@@ -504,17 +443,6 @@ describe "Blob" do
   end
 end
 
-if RUBY_VERSION < '1.9.0'
-  describe "Symbol#[]" do
-    it "should format an SQL Function" do
-      ds = Sequel.mock.dataset
-      ds.literal(:xyz[]).must_equal 'xyz()'
-      ds.literal(:xyz[1]).must_equal 'xyz(1)'
-      ds.literal(:xyz[1, 2, :abc[3]]).must_equal 'xyz(1, 2, abc(3))'
-    end
-  end
-end
-
 describe "Symbol#*" do
   before do
     @ds = Sequel.mock.dataset
@@ -740,11 +668,7 @@ describe "symbol_aref extensions" do
   end
 
   it "should not affect other arguments to Symbol#[]" do
-    if RUBY_VERSION >= '1.9'
-      :x[0].must_equal "x"
-    else
-      @db.literal(:x[0]).must_equal "x(0)"
-    end
+    :x[0].must_equal "x"
   end
 end
 

data/spec/core_model_spec.rb

@@ -1,2 +1,2 @@
-require './spec/core_spec'
-require './spec/model_spec'
+require_relative 'core_spec'
+require_relative 'model_spec'

data/spec/deprecation_helper.rb

@@ -16,27 +16,15 @@ class Minitest::HooksSpec
   end
 
   def self.with_symbol_splitting(a, &block)
-    it(a) do
+    it("#{a}, with symbol splitting enabled") do
       with_symbol_splitting{instance_exec(&block)}
     end
-    it("#{a}, except when symbol_splitting disabled") do
-      without_symbol_splitting{instance_exec(&block)}
-    end
-  end
-
-  def without_symbol_splitting
-    Sequel.split_symbols = false
-    DB.send(:reset_default_dataset) if defined?(DB)
-    proc{yield}.must_raise Minitest::Assertion
-  ensure
-    Sequel.split_symbols = :deprecated
-    DB.send(:reset_default_dataset) if defined?(DB)
   end
 
   def with_symbol_splitting
     Sequel.split_symbols = true
     yield
   ensure
-    Sequel.split_symbols = :deprecated
+    Sequel.split_symbols = false
   end
 end

data/spec/extensions/accessed_columns_spec.rb

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

data/spec/extensions/active_model_spec.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 begin
   require 'active_model'
-rescue LoadError => e
-  skip_warn "active_model plugin: can't load active_model (#{e.class}: #{e})"
+rescue LoadError
+  warn "Skipping test of active_model plugin: can't load active_model"
 else
 describe "ActiveModel plugin" do
   before do

data/spec/extensions/after_initialize_spec.rb

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

data/spec/extensions/arbitrary_servers_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "arbtirary servers" do
   before do
@@ -33,7 +33,7 @@ describe "arbtirary servers" do
 
   it "should disconnect when connection is finished" do
     x, x1 = nil, nil
-    meta_def(@db, :disconnect_connection){|c| x = c}
+    @db.define_singleton_method(:disconnect_connection){|c| x = c}
     @db.synchronize(:host=>'host1', :database=>'db1') do |c|
       x1 = c
       @db.synchronize(:host=>'host1', :database=>'db1') do |c2|

data/spec/extensions/association_dependencies_spec.rb

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

data/spec/extensions/association_pks_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::AssociationPks" do
   before do
@@ -90,13 +90,6 @@ describe "Sequel::Plugins::AssociationPks" do
     @db.sqls.must_equal ["SELECT tags.id FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) WHERE (albums_tags.album_id = 3)"]
   end
 
-  deprecated "should set associated pks correctly for a one_to_many association when :delay_pks is not set" do
-    @Artist.one_to_many :albums, :class=>@Album, :key=>:artist_id
-    @Artist.load(:id=>1).album_pks = [1, 2]
-    @db.sqls.must_equal ["UPDATE albums SET artist_id = 1 WHERE (id IN (1, 2))",
-      "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (id NOT IN (1, 2)))"]
-  end
-
   it "should set associated pks correctly for a one_to_many association" do
     @Artist.load(:id=>1).album_pks = [1, 2]
     @db.sqls.must_equal ["UPDATE albums SET artist_id = 1 WHERE (id IN (1, 2))",
@@ -112,13 +105,11 @@ describe "Sequel::Plugins::AssociationPks" do
 
   it "should set associated pks correctly for a many_to_many association" do
     @Album.load(:id=>2).tag_pks = [1, 3]
-    sqls = @db.sqls
-    sqls[0].must_equal "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))"
-    sqls[1].must_equal 'SELECT tag_id FROM albums_tags WHERE (album_id = 2)'
-    sqls[2].must_equal 'BEGIN'
-    sqls[3].must_match(/INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, 1|1, 2)\)/)
-    sqls[4].must_equal 'COMMIT'
-    sqls.length.must_equal 5
+    @db.sqls.must_equal ["DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))",
+      'SELECT tag_id FROM albums_tags WHERE (album_id = 2)',
+      'BEGIN',
+      'INSERT INTO albums_tags (album_id, tag_id) VALUES (2, 1)',
+      'COMMIT']
   end
 
   it "should return correct right-side associated cpks for one_to_many associations" do
@@ -168,10 +159,8 @@ describe "Sequel::Plugins::AssociationPks" do
   it "should set associated pks correctly for left-side cpks for a one_to_many association" do
     @Vocalist.one_to_many :instruments, :class=>@Instrument, :key=>[:first, :last], :delay_pks=>false
     @Vocalist.load(:first=>'F1', :last=>'L1').instrument_pks = [1, 2]
-    sqls = @db.sqls
-    sqls[0].must_match(/UPDATE instruments SET (first = 'F1', last = 'L1'|last = 'L1', first = 'F1') WHERE \(id IN \(1, 2\)\)/)
-    sqls[1].must_match(/UPDATE instruments SET (first = NULL, last = NULL|last = NULL, first = NULL) WHERE \(\(instruments.first = 'F1'\) AND \(instruments.last = 'L1'\) AND \(id NOT IN \(1, 2\)\)\)/)
-    sqls.length.must_equal 2
+    @db.sqls.must_equal ["UPDATE instruments SET first = 'F1', last = 'L1' WHERE (id IN (1, 2))",
+      "UPDATE instruments SET first = NULL, last = NULL WHERE ((instruments.first = 'F1') AND (instruments.last = 'L1') AND (id NOT IN (1, 2)))"]
   end
 
   it "should set associated pks correctly for left-side cpks for a many_to_many association" do
@@ -216,10 +205,8 @@ describe "Sequel::Plugins::AssociationPks" do
   it "should set associated right-side cpks correctly for left-side cpks for a one_to_many association" do
     @Vocalist.one_to_many :hits, :class=>@Hit, :key=>[:first, :last], :order=>:week, :delay_pks=>false
     @Vocalist.load(:first=>'F1', :last=>'L1').hit_pks = [[1997, 1], [1997, 2]]
-    sqls = @db.sqls
-    sqls[0].must_match(/UPDATE hits SET (first = 'F1', last = 'L1'|last = 'L1', first = 'F1') WHERE \(\(year, week\) IN \(\(1997, 1\), \(1997, 2\)\)\)/)
-    sqls[1].must_match(/UPDATE hits SET (first = NULL, last = NULL|last = NULL, first = NULL) WHERE \(\(hits.first = 'F1'\) AND \(hits.last = 'L1'\) AND \(\(year, week\) NOT IN \(\(1997, 1\), \(1997, 2\)\)\)\)/)
-    sqls.length.must_equal 2
+    @db.sqls.must_equal ["UPDATE hits SET first = 'F1', last = 'L1' WHERE ((year, week) IN ((1997, 1), (1997, 2)))",
+      "UPDATE hits SET first = NULL, last = NULL WHERE ((hits.first = 'F1') AND (hits.last = 'L1') AND ((year, week) NOT IN ((1997, 1), (1997, 2))))"]
   end
 
   it "should set associated right-side cpks correctly for left-side cpks for a many_to_many association" do
@@ -245,13 +232,11 @@ describe "Sequel::Plugins::AssociationPks" do
     album = @Album.load(:id=>2)
     album.use_transactions = true
     album.tag_pks = [1, 3]
-    sqls = @db.sqls
-    sqls[0].must_equal "BEGIN"
-    sqls[1].must_equal "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))"
-    sqls[2].must_equal 'SELECT tag_id FROM albums_tags WHERE (album_id = 2)'
-    sqls[3].must_match(/INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, 1|1, 2)\)/)
-    sqls[4].must_equal "COMMIT"
-    sqls.length.must_equal 5
+    @db.sqls.must_equal ["BEGIN",
+      "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))",
+      'SELECT tag_id FROM albums_tags WHERE (album_id = 2)',
+      'INSERT INTO albums_tags (album_id, tag_id) VALUES (2, 1)',
+      "COMMIT"]
   end
 
   it "should automatically convert keys to numbers if the primary key is an integer for one_to_many associations" do
@@ -271,22 +256,23 @@ describe "Sequel::Plugins::AssociationPks" do
   it "should automatically convert keys to numbers if the primary key is an integer for many_to_many associations" do
     @Tag.db_schema[:id][:type] = :integer
     @Album.load(:id=>2).tag_pks = %w'1 3'
-    sqls = @db.sqls
-    sqls[0].must_equal "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))"
-    sqls[1].must_equal 'SELECT tag_id FROM albums_tags WHERE (album_id = 2)'
-    sqls[3].must_match(/INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, 1|1, 2)\)/)
-    sqls.length.must_equal 5
+    @db.sqls.must_equal ["DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 3)))",
+      'SELECT tag_id FROM albums_tags WHERE (album_id = 2)',
+      'BEGIN',
+      'INSERT INTO albums_tags (album_id, tag_id) VALUES (2, 1)',
+      'COMMIT']
   end
 
   it "should not automatically convert keys to numbers if the primary key is an integer for many_to_many associations" do
     @Tag.db_schema[:id][:type] = :string
     @Album.load(:id=>2).tag_pks = %w'1 3'
-    sqls = @db.sqls
-    sqls[0].must_equal "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN ('1', '3')))"
-    sqls[1].must_equal 'SELECT tag_id FROM albums_tags WHERE (album_id = 2)'
-    sqls[3].must_match(/INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, '1'|'1', 2)\)/)
-    sqls[4].must_match(/INSERT INTO albums_tags \((album_id, tag_id|tag_id, album_id)\) VALUES \((2, '3'|'3', 2)\)/)
-    sqls.length.must_equal 6
+    sqls = @db.sqls.must_equal [
+      "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN ('1', '3')))",
+      'SELECT tag_id FROM albums_tags WHERE (album_id = 2)',
+      'BEGIN',
+      "INSERT INTO albums_tags (album_id, tag_id) VALUES (2, '1')",
+      "INSERT INTO albums_tags (album_id, tag_id) VALUES (2, '3')",
+      'COMMIT']
   end
 
   it "should automatically convert keys to numbers for appropriate integer primary key for composite key associations" do
@@ -320,54 +306,6 @@ describe "Sequel::Plugins::AssociationPks" do
     sqls.length.must_equal 6
   end
 
-  deprecated "should handle delaying setting of association pks until after saving for new objects, if :delay_pks=>true association option is used" do
-    @Artist.one_to_many :albums, :clone=>:albums, :delay_pks=>true
-    @Album.many_to_many :tags, :clone=>:tags, :delay_pks=>true
-    @Album.db_schema[:id][:type] = :integer
-
-    ar = @Artist.new
-    ar.album_pks.must_equal []
-    ar.album_pks = ["1","2","3"]
-    ar.album_pks.must_equal [1,2,3]
-    @db.sqls.must_equal []
-
-    ar.save
-    @db.sqls.must_equal [
-      "INSERT INTO artists DEFAULT VALUES",
-      "UPDATE albums SET artist_id = 1 WHERE (id IN (1, 2, 3))",
-      "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (id NOT IN (1, 2, 3)))",
-      "SELECT * FROM artists WHERE (id = 1) LIMIT 1",
-    ]
-
-    al = @Album.new
-    al.tag_pks.must_equal []
-    al.tag_pks = [1,2]
-    al.tag_pks.must_equal [1, 2]
-    @db.sqls.must_equal []
-
-    al.save
-    @db.sqls.must_equal [
-      "INSERT INTO albums DEFAULT VALUES",
-      "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 2)))",
-      "SELECT tag_id FROM albums_tags WHERE (album_id = 2)",
-      "BEGIN",
-      "INSERT INTO albums_tags (album_id, tag_id) VALUES (2, 1)",
-      "COMMIT",
-      "SELECT * FROM albums WHERE (id = 2) LIMIT 1"
-    ]
-
-    al = @Album.load(:id=>1)
-    al.tag_pks = [2,3]
-    @db.sqls.must_equal [
-      "DELETE FROM albums_tags WHERE ((album_id = 1) AND (tag_id NOT IN (2, 3)))",
-      "SELECT tag_id FROM albums_tags WHERE (album_id = 1)",
-      "BEGIN",
-      "INSERT INTO albums_tags (album_id, tag_id) VALUES (1, 3)",
-      "COMMIT"
-    ]
-    al.tag_pks.must_equal [1, 2]
-  end
-
   it "should handle delaying setting of association pks until after saving for existing objects, if :delay_pks=>:always association option is used" do
     @Artist.one_to_many :albums, :clone=>:albums, :delay_pks=>:always
     @Album.many_to_many :tags, :clone=>:tags, :delay_pks=>:always
@@ -382,9 +320,9 @@ describe "Sequel::Plugins::AssociationPks" do
     ar.save
     @db.sqls.must_equal [
       "INSERT INTO artists DEFAULT VALUES",
+      "SELECT * FROM artists WHERE (id = 1) LIMIT 1",
       "UPDATE albums SET artist_id = 1 WHERE (id IN (1, 2, 3))",
       "UPDATE albums SET artist_id = NULL WHERE ((albums.artist_id = 1) AND (id NOT IN (1, 2, 3)))",
-      "SELECT * FROM artists WHERE (id = 1) LIMIT 1",
     ]
 
     al = @Album.new
@@ -396,12 +334,12 @@ describe "Sequel::Plugins::AssociationPks" do
     al.save
     @db.sqls.must_equal [
       "INSERT INTO albums DEFAULT VALUES",
+      "SELECT * FROM albums WHERE (id = 2) LIMIT 1",
       "DELETE FROM albums_tags WHERE ((album_id = 2) AND (tag_id NOT IN (1, 2)))",
       "SELECT tag_id FROM albums_tags WHERE (album_id = 2)",
       "BEGIN",
       "INSERT INTO albums_tags (album_id, tag_id) VALUES (2, 1)",
-      "COMMIT",
-      "SELECT * FROM albums WHERE (id = 2) LIMIT 1"
+      "COMMIT"
     ]
     ar = @Artist.load(:id=>1)
     ar.album_pks.must_equal [1,2,3]

data/spec/extensions/association_proxies_spec.rb

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

data/spec/extensions/auto_literal_strings_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Dataset#where" do
   before do
@@ -112,17 +112,6 @@ describe "Dataset#exclude" do
   end
 end
 
-describe "Dataset#and" do
-  before do
-    @dataset = Sequel.mock.dataset.from(:test).extension(:auto_literal_strings)
-    @d1 = @dataset.where(:x => 1)
-  end
-
-  deprecated "should accept string filters with placeholders" do
-    @d1.and('y > ?', 2).sql.must_equal 'SELECT * FROM test WHERE ((x = 1) AND (y > 2))'
-  end
-end
-  
 describe "Dataset#or" do
   before do
     @dataset = Sequel.mock.dataset.from(:test).extension(:auto_literal_strings)

data/spec/extensions/auto_validations_spec.rb

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

data/spec/extensions/blacklist_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)_except" do
   before do

data/spec/extensions/blank_spec.rb

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

data/spec/extensions/boolean_readers_spec.rb

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

data/spec/extensions/boolean_subsets_spec.rb

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

data/spec/extensions/caching_spec.rb

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