sequel 4.49.0 → 5.0.0

data/spec/extensions/inverted_subsets_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::InvertedSubsets" do
   it "should add an inverted subset method which inverts the condition" do

data/spec/extensions/json_serializer_spec.rb

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

data/spec/extensions/lazy_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 require 'yaml'
 
 describe "Sequel::Plugins::LazyAttributes" do
@@ -42,12 +42,6 @@ describe "Sequel::Plugins::LazyAttributes" do
     Object.send(:remove_const, :LazyAttributesModel)
   end
   
-  deprecated "should allow access to lazy_attributes_module" do
-    @c.lazy_attributes_module.must_be_kind_of Module
-    @c.lazy_attributes_module = v = Module.new
-    @c.lazy_attributes_module.must_equal v
-  end
-
   it "should allowing adding additional lazy attributes via plugin :lazy_attributes" do
     @c.set_dataset(@ds.select(:id, :blah))
     @c.dataset.sql.must_equal 'SELECT id, blah FROM la'

data/spec/extensions/list_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "List plugin" do
   def klass(opts={})

data/spec/extensions/looser_typecasting_spec.rb

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

data/spec/extensions/many_through_many_spec.rb

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

data/spec/extensions/migration_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :migration
 
@@ -62,7 +62,7 @@ describe "Migration.apply" do
     m = Sequel::Migration.new(Sequel.mock)
     m.respond_to?(:foo).must_equal false
     m.respond_to?(:execute).must_equal true
-  end if RUBY_VERSION >= '1.9'
+  end
 end
 
 describe "SimpleMigration#apply" do

data/spec/extensions/modification_detection_spec.rb

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

data/spec/extensions/mssql_optimistic_locking_spec.rb

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

data/spec/extensions/named_timezones_spec.rb

@@ -1,9 +1,9 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 begin
   require 'tzinfo'
-rescue LoadError => e
-  skip_warn "named_timezones_spec: can't load tzinfo (#{e.class}: #{e})"
+rescue LoadError
+  warn "Skipping test of named_timezones extension: can't load tzinfo"
 else
 Sequel.extension :thread_local_timezones
 Sequel.extension :named_timezones

data/spec/extensions/nested_attributes_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "NestedAttributes plugin" do
   def check_sqls(should, is)
@@ -49,12 +49,6 @@ describe "NestedAttributes plugin" do
     @db.sqls
   end
   
-  deprecated "should allow access to nested_attributes_module" do
-    @Artist.nested_attributes_module.must_be_kind_of Module
-    @Artist.nested_attributes_module = v = Module.new
-    @Artist.nested_attributes_module.must_equal v
-  end
-
   it "should support creating new many_to_one objects" do
     a = @Album.new({:name=>'Al', :artist_attributes=>{:name=>'Ar'}})
     @db.sqls.must_equal []
@@ -462,17 +456,6 @@ describe "NestedAttributes plugin" do
     ar.set(:albums_attributes=>[{:id=>10, :_delete=>'t'}])
   end
   
-  deprecated "should not raise an Error if an unmatched primary key is given, if the :strict=>false option is used" do
-    @Artist.nested_attributes :albums, :strict=>false
-    al = @Album.load(:id=>10, :name=>'Al')
-    ar = @Artist.load(:id=>20, :name=>'Ar')
-    ar.associations[:albums] = [al]
-    ar.set(:albums_attributes=>[{:id=>30, :_delete=>'t'}])
-    @db.sqls.must_equal []
-    ar.save
-    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 20)"]
-  end
-  
   it "should not raise an Error if an unmatched primary key is given, if the :unmatched_pk=>:ignore option is used" do
     @Artist.nested_attributes :albums, :unmatched_pk=>:ignore
     al = @Album.load(:id=>10, :name=>'Al')
@@ -492,17 +475,6 @@ describe "NestedAttributes plugin" do
     ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-05', :_delete=>'t'}])
   end
 
-  deprecated "should not raise an Error if an unmatched composite primary key is given, if the :strict=>false option is used" do
-    @Artist.nested_attributes :concerts, :strict=>false
-    ar = @Artist.load(:id=>10, :name=>'Ar')
-    co = @Concert.load(:tour=>'To', :date=>'2004-04-05', :playlist=>'Pl')
-    ar.associations[:concerts] = [co]
-    ar.set(:concerts_attributes=>[{:tour=>'To', :date=>'2004-04-06', :_delete=>'t'}])
-    @db.sqls.must_equal []
-    ar.save
-    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 10)"]
-  end
-
   it "should not raise an Error if an unmatched composite primary key is given, if the :unmatched_pk=>:ignore option is used" do
     @Artist.nested_attributes :concerts, :unmatched_pk=>:ignore
     ar = @Artist.load(:id=>10, :name=>'Ar')

data/spec/extensions/null_dataset_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "null_dataset extension" do
   before do
@@ -73,16 +73,6 @@ describe "null_dataset extension" do
     @i.must_equal 1
   end
 
-  deprecated "should have nullify! method modify receiver" do
-    ds = @db[:table]
-    # SEQUEL5: Remove
-    unless ds.frozen?
-      ds.nullify!.must_be_same_as(ds)
-      ds.each(&@pr)
-      @i.must_equal 0
-    end
-  end
-
   it "should work with method chaining" do
     @ds.where(:a=>1).select(:b).each(&@pr)
     @i.must_equal 0

data/spec/extensions/optimistic_locking_spec.rb

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

data/spec/extensions/pagination_spec.rb

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

data/spec/extensions/pg_array_associations_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, "pg_array_associations" do
   before do
@@ -748,6 +748,9 @@ end
 describe "Sequel::Model.finalize_associations" do
   before do
     @db = Sequel.mock(:host=>'postgres', :numrows=>1)
+    @db.extend_datasets do
+      def quote_identifiers?; false end
+    end
     class ::Foo < Sequel::Model(@db)
       plugin :pg_array_associations
       many_to_pg_array :items

data/spec/extensions/pg_array_ops_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 Sequel.extension :pg_array, :pg_array_ops, :pg_hstore, :pg_hstore_ops
 

data/spec/extensions/pg_array_spec.rb

@@ -1,12 +1,8 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "pg_array extension" do
   before(:all) do
     Sequel.extension :pg_array
-    @pg_types = Sequel::Postgres::PG__TYPES.dup # SEQUEL5: Remove
-  end
-  after(:all) do
-    Sequel::Postgres::PG__TYPES.replace(@pg_types) # SEQUEL5: Remove
   end
 
   before do
@@ -37,7 +33,7 @@ describe "pg_array extension" do
   it "should preserve encoding when parsing text arrays" do
     c = @converter[1009]
     c.call("{a,\u00E4}".encode('ISO-8859-1')).map(&:encoding).must_equal [Encoding::ISO_8859_1, Encoding::ISO_8859_1]
-  end if RUBY_VERSION >= '1.9'
+  end
 
   it "should parse multi-dimensional text arrays" do
     c = @converter[1009]
@@ -261,17 +257,6 @@ describe "pg_array extension" do
     @db.select(Sequel.pg_array([1], :integer).as(:col1)).sql.must_equal 'SELECT ARRAY[1]::integer[] AS col1'
   end
 
-  deprecated "should support registering custom array types" do
-    Sequel::Postgres::PGArray.register('foo')
-    @db.typecast_value(:foo_array, []).class.must_equal(Sequel::Postgres::PGArray)
-    @db.fetch = [{:name=>'id', :db_type=>'foo[]'}]
-    @db.schema(:items).map{|e| e[1][:type]}.must_equal [:foo_array]
-  end
-
-  deprecated "should raise error if register given convertor option and block" do
-    proc{Sequel::Postgres::PGArray.register('foo', :converter=>:to_s.to_proc, &:to_s)}.must_raise Sequel::Error
-  end
-
   it "should support registering custom array types" do
     @db.register_array_type('foo')
     @db.typecast_value(:foo_array, []).class.must_equal(Sequel::Postgres::PGArray)
@@ -301,20 +286,6 @@ describe "pg_array extension" do
     @db.conversion_procs[1234].call('{t}').must_equal [true]
   end
 
-  deprecated "should support using a given conversion procs hash via the :type_procs option" do
-    h = {16=>proc{|s| "!#{s}"}}
-    Sequel::Postgres::PGArray.register('foo', :oid=>1234, :scalar_oid=>16, :type_procs=>h)
-    h[1234].call('{t}').must_equal ["!t"]
-  end
-
-  deprecated "should support adding methods to the given module via the :typecast_methods_module option" do
-    m = Module.new
-    Sequel::Postgres::PGArray.register('foo15', :scalar_typecast=>:boolean, :typecast_methods_module=>m)
-    @db.typecast_value(:foo15_array, ['t']).must_equal ['t']
-    @db.extend(m)
-    @db.typecast_value(:foo15_array, ['t']).must_equal [true]
-  end
-
   it "should not raise an error if using :scalar_oid option with unexisting scalar conversion proc" do
     @db.register_array_type('foo', :oid=>1234, :scalar_oid=>0)
     @db.conversion_procs[1234].call('{t}').must_equal ["t"]
@@ -394,7 +365,7 @@ describe "pg_array extension" do
   end
 
   it "should set appropriate timestamp conversion procs when adding conversion procs" do
-    @db.fetch = [[{:oid=>2222, :typname=>'foo'}], [{:oid=>2222, :typarray=>2223, :typname=>'foo'}]]
+    @db.fetch = [[{:oid=>2222}], [{:oid=>2222, :typarray=>2223}]]
     @db.add_named_conversion_proc(:foo){|v| v*2}
     procs = @db.conversion_procs
     procs[1185].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
@@ -403,22 +374,6 @@ describe "pg_array extension" do
     procs[2223].call('{"2"}').must_equal ['22']
   end
 
-  deprecated "should set appropriate timestamp conversion procs when resetting conversion procs when modifying PG_NAMED_TYPES" do
-    @pg_named_types = Sequel::Postgres::PG_NAMED_TYPES.dup
-    begin
-      Sequel::Postgres::PG_NAMED_TYPES[:foo] = proc{|v| v*2}
-      @db.fetch = [[{:oid=>2222, :typname=>'foo'}], [{:oid=>2222, :typarray=>2223, :typname=>'foo'}]]
-      @db.reset_conversion_procs
-      procs = @db.conversion_procs
-      procs[1185].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
-      procs[1115].call('{"2011-10-20 11:12:13"}').must_equal [Time.local(2011, 10, 20, 11, 12, 13)]
-      procs[2222].call('1').must_equal '11'
-      procs[2223].call('{"2"}').must_equal ['22']
-    ensure
-      Sequel::Postgres::PG_NAMED_TYPES.replace(@pg_named_types)
-    end
-  end
-
   it "should return correct results for Database#schema_type_class" do
     @db.register_array_type('banana', :oid=>7866, :scalar_typecast=>:integer){|s| s.to_i}
     @db.schema_type_class(:banana_array).must_equal Sequel::Postgres::PGArray

data/spec/extensions/pg_enum_spec.rb

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

data/spec/extensions/pg_hstore_ops_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 Sequel.extension :pg_array, :pg_array_ops, :pg_hstore, :pg_hstore_ops
 

data/spec/extensions/pg_hstore_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "pg_hstore extension" do
   before do
@@ -39,11 +39,6 @@ describe "pg_hstore extension" do
     @db.conversion_procs[9999].call('"a"=>"b"').must_equal('a'=>'b')
   end
 
-  deprecated "should reregister conversion proc when resetting conversion procs" do
-    @db.reset_conversion_procs
-    @db.conversion_procs[9999].call('"a"=>"b"').must_equal('a'=>'b')
-  end
-
   it "should have Sequel.hstore method for creating HStore instances" do
     Sequel.hstore({}).class.must_equal(@c)
   end
@@ -100,10 +95,8 @@ describe "pg_hstore extension" do
 
     Sequel.hstore('foo'=>'bar', '1'=>'2').values_at(:foo3, :foo, :foo2, 1).must_equal [nil, 'bar', nil, '2']
 
-    if RUBY_VERSION >= '1.9.0'
-      Sequel.hstore('foo'=>'bar').assoc(:foo).must_equal ['foo', 'bar']
-      Sequel.hstore('foo'=>'bar').assoc(:foo2).must_be_nil
-    end
+    Sequel.hstore('foo'=>'bar').assoc(:foo).must_equal ['foo', 'bar']
+    Sequel.hstore('foo'=>'bar').assoc(:foo2).must_be_nil
   end
 
   it "should convert has_value?/value? lookups to string" do
@@ -124,28 +117,26 @@ describe "pg_hstore extension" do
     Sequel.hstore('1'=>'bar').to_hash[1].must_equal 'bar'
   end
 
-  if RUBY_VERSION >= '1.9.0'
-    it "should convert key lookups to string" do
-      Sequel.hstore('foo'=>'bar').key(:bar).must_equal 'foo'
-      Sequel.hstore('foo'=>'bar').key(:bar2).must_be_nil
-    end
-
-    it "should handle nil values in key lookups" do
-      Sequel.hstore('foo'=>'').key('').must_equal 'foo'
-      Sequel.hstore('foo'=>'').key(nil).must_be_nil
-      Sequel.hstore('foo'=>nil).key(nil).must_equal 'foo'
-    end
-
-    it "should convert rassoc lookups to string" do
-      Sequel.hstore('foo'=>'bar').rassoc(:bar).must_equal ['foo', 'bar']
-      Sequel.hstore('foo'=>'bar').rassoc(:bar2).must_be_nil
-    end
-
-    it "should handle nil values in rassoc lookups" do
-      Sequel.hstore('foo'=>'').rassoc('').must_equal ['foo', '']
-      Sequel.hstore('foo'=>'').rassoc(nil).must_be_nil
-      Sequel.hstore('foo'=>nil).rassoc(nil).must_equal ['foo', nil]
-    end
+  it "should convert key lookups to string" do
+    Sequel.hstore('foo'=>'bar').key(:bar).must_equal 'foo'
+    Sequel.hstore('foo'=>'bar').key(:bar2).must_be_nil
+  end
+
+  it "should handle nil values in key lookups" do
+    Sequel.hstore('foo'=>'').key('').must_equal 'foo'
+    Sequel.hstore('foo'=>'').key(nil).must_be_nil
+    Sequel.hstore('foo'=>nil).key(nil).must_equal 'foo'
+  end
+
+  it "should convert rassoc lookups to string" do
+    Sequel.hstore('foo'=>'bar').rassoc(:bar).must_equal ['foo', 'bar']
+    Sequel.hstore('foo'=>'bar').rassoc(:bar2).must_be_nil
+  end
+
+  it "should handle nil values in rassoc lookups" do
+    Sequel.hstore('foo'=>'').rassoc('').must_equal ['foo', '']
+    Sequel.hstore('foo'=>'').rassoc(nil).must_be_nil
+    Sequel.hstore('foo'=>nil).rassoc(nil).must_equal ['foo', nil]
   end
 
   it "should have delete convert key to string" do

data/spec/extensions/pg_inet_ops_spec.rb

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

data/spec/extensions/pg_inet_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "pg_inet extension" do
   ipv6_broken = (IPAddr.new('::1'); false) rescue true
@@ -18,19 +18,6 @@ describe "pg_inet extension" do
     @db.literal(IPAddr.new('2001:4f8:3:ba:2e0:81ff:fe22:d1f1')).must_equal "'2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128'"
   end unless ipv6_broken
 
-  deprecated "should set up conversion procs correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[869].call("127.0.0.1").must_equal IPAddr.new('127.0.0.1')
-    cp[650].call("127.0.0.1").must_equal IPAddr.new('127.0.0.1')
-  end
-
-  deprecated "should set up conversion procs for arrays correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[1041].call("{127.0.0.1}").must_equal [IPAddr.new('127.0.0.1')]
-    cp[651].call("{127.0.0.1}").must_equal [IPAddr.new('127.0.0.1')]
-    cp[1040].call("{127.0.0.1}").must_equal ['127.0.0.1']
-  end
-
   it "should set up conversion procs correctly" do
     cp = @db.conversion_procs
     cp[869].call("127.0.0.1").must_equal IPAddr.new('127.0.0.1')

data/spec/extensions/pg_interval_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 begin
   require 'active_support/duration'
@@ -6,8 +6,8 @@ begin
     require 'active_support/gem_version'
   rescue LoadError
   end
-rescue LoadError => exc
-  skip_warn "pg_interval plugin: can't load active_support/duration (#{exc.class}: #{exc})"
+rescue LoadError
+  warn "Skipping test of pg_interval plugin: can't load active_support/duration"
 else
 describe "pg_interval extension" do
   before do
@@ -34,16 +34,6 @@ describe "pg_interval extension" do
     end
   end
 
-  deprecated "should set up conversion procs correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[1186].call("1 sec").must_equal ActiveSupport::Duration.new(1, [[:seconds, 1]])
-  end
-
-  deprecated "should set up conversion procs for arrays correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[1187].call("{1 sec}").must_equal [ActiveSupport::Duration.new(1, [[:seconds, 1]])]
-  end
-
   it "should set up conversion procs correctly" do
     cp = @db.conversion_procs
     cp[1186].call("1 sec").must_equal ActiveSupport::Duration.new(1, [[:seconds, 1]])