sequel 4.49.0 → 5.3.0

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_extended_date_support_spec.rb

@@ -0,0 +1,122 @@
+require_relative "spec_helper"
+
+describe "pg_extended_date_support extension" do
+  before do
+    @db = Sequel.mock(:host=>'postgres', :fetch=>{:v=>1}).extension(:pg_extended_date_support)
+    @db.extend_datasets{def quote_identifiers?; false end}
+  end
+  after do
+    Sequel.datetime_class = Time
+    Sequel.default_timezone = nil
+  end
+
+  it "should convert infinite timestamps and dates as configured" do
+    cp = @db.conversion_procs
+    d = lambda{|v| cp[1082].call(v)}
+    t = lambda{|v| cp[1114].call(v)}
+    pi = 'infinity'
+    ni = '-infinity'
+    today = Date.today
+    now = Time.now
+
+    d.(today.to_s).must_equal today
+    t.(now.strftime("%Y-%m-%d %H:%M:%S.%N")).must_equal now
+    proc{@db.typecast_value(:date, pi)}.must_raise Sequel::InvalidValue
+    proc{@db.typecast_value(:datetime, pi)}.must_raise Sequel::InvalidValue
+
+    [:nil, 'nil'].each do |v|
+      @db.convert_infinite_timestamps = v
+      d.(pi).must_be_nil
+      t.(pi).must_be_nil
+      d.(ni).must_be_nil
+      t.(ni).must_be_nil
+      @db.typecast_value(:date, pi).must_equal pi
+      @db.typecast_value(:datetime, pi).must_equal pi
+      @db.typecast_value(:date, ni).must_equal ni
+      @db.typecast_value(:datetime, ni).must_equal ni
+    end
+
+    d.(today.to_s).must_equal today
+    t.(now.strftime("%Y-%m-%d %H:%M:%S.%N")).must_equal now
+    @db.typecast_value(:date, today.to_s).must_equal today
+    @db.typecast_value(:datetime, now.strftime("%Y-%m-%d %H:%M:%S.%N")).must_equal now
+
+    [:string, 'string'].each do |v|
+      @db.convert_infinite_timestamps = v
+      d.(pi).must_equal pi
+      t.(pi).must_equal pi
+      d.(ni).must_equal ni
+      t.(ni).must_equal ni
+    end
+
+    [:date, 'date'].each do |v|
+      @db.convert_infinite_timestamps = v
+      d.(pi).must_equal Date::Infinity.new
+      t.(pi).must_equal Date::Infinity.new
+      d.(ni).must_equal -Date::Infinity.new
+      t.(ni).must_equal -Date::Infinity.new
+    end
+
+    [:float, 'float', 't', true].each do |v|
+      @db.convert_infinite_timestamps = v
+      d.(pi).must_equal 1.0/0.0
+      t.(pi).must_equal 1.0/0.0
+      d.(ni).must_equal -1.0/0.0
+      t.(ni).must_equal -1.0/0.0
+    end
+
+    ['f', false].each do |v|
+      @db.convert_infinite_timestamps = v
+      proc{d.(pi)}.must_raise ArgumentError, Sequel::InvalidValue
+      proc{t.(pi)}.must_raise ArgumentError, Sequel::InvalidValue
+      proc{d.(ni)}.must_raise ArgumentError, Sequel::InvalidValue
+      proc{t.(ni)}.must_raise ArgumentError, Sequel::InvalidValue
+    end
+  end
+
+  it "should handle parsing BC dates" do
+    @db.conversion_procs[1082].call("1092-10-20 BC").must_equal Date.new(-1091, 10, 20)
+  end
+
+  it "should handle parsing BC timestamps as Time values" do
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00 BC").must_equal Time.at(-100000000000).utc
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00:00 BC").must_equal Time.at(-100000000000).utc
+    Sequel.default_timezone = :utc
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20 BC").must_equal Time.at(-100000000000).utc
+    Sequel.default_timezone = nil
+  end
+
+  it "should handle parsing BC timestamps as DateTime values" do
+    Sequel.datetime_class = DateTime
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00 BC").must_equal DateTime.new(-1199, 2, 15, 14, 13, 20)
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00:00 BC").must_equal DateTime.new(-1199, 2, 15, 14, 13, 20)
+    Sequel.default_timezone = :utc
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20 BC").must_equal DateTime.new(-1199, 2, 15, 14, 13, 20)
+  end
+
+  it "should handle parsing AD timestamps with offset seconds" do
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00:00").must_equal DateTime.new(1200, 2, 15, 14, 13, 20).to_time
+    Sequel.datetime_class = DateTime
+    @db.conversion_procs[1114].call("1200-02-15 14:13:20-00:00:00").must_equal DateTime.new(1200, 2, 15, 14, 13, 20)
+  end
+
+  it "should format Date::Infinity values" do
+    @db.literal(Date::Infinity.new).must_equal "'infinity'"
+    @db.literal(-Date::Infinity.new).must_equal "'-infinity'"
+  end
+
+  it "should format BC dates" do
+    @db.literal(Date.new(-1091, 10, 20)).must_equal "'1092-10-20 BC'"
+    @db.literal(Date.new(1092, 10, 20)).must_equal "'1092-10-20'"
+  end
+
+  it "should format BC datetimes" do
+    @db.literal(DateTime.new(-1199, 2, 15, 14, 13, 20)).must_equal "'1200-02-15 14:13:20.000000000+0000 BC'"
+    @db.literal(DateTime.new(1200, 2, 15, 14, 13, 20)).must_equal "'1200-02-15 14:13:20.000000+0000'"
+  end
+
+  it "should format BC times" do
+    @db.literal(Time.at(-100000000000).utc).must_equal "'1200-02-15 14:13:20.000000000+0000 BC'"
+    @db.literal(Time.at(100000000000).utc).must_equal "'5138-11-16 09:46:40.000000+0000'"
+  end
+end

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
@@ -32,18 +32,13 @@ describe "pg_hstore extension" do
     @db.literal(Sequel.hstore("c"=>nil)).must_equal '\'"c"=>NULL\'::hstore'
     @db.literal(Sequel.hstore("c"=>'NULL')).must_equal '\'"c"=>"NULL"\'::hstore'
     @db.literal(Sequel.hstore('c'=>'\ "\'=>')).must_equal '\'"c"=>"\\\\ \\"\'\'=>"\'::hstore'
-    ['\'"a"=>"b","c"=>"d"\'::hstore', '\'"c"=>"d","a"=>"b"\'::hstore'].must_include(@db.literal(Sequel.hstore("a"=>"b","c"=>"d")))
+    @db.literal(Sequel.hstore("a"=>"b","c"=>"d")).must_equal '\'"a"=>"b","c"=>"d"\'::hstore'
   end
 
   it "should register conversion proc correctly" 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 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 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 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 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
@@ -187,7 +178,7 @@ describe "pg_hstore extension" do
     @db.bound_variable_arg(Sequel.hstore('1'=>nil), nil).must_equal '"1"=>NULL'
     @db.bound_variable_arg(Sequel.hstore('1'=>"NULL"), nil).must_equal '"1"=>"NULL"'
     @db.bound_variable_arg(Sequel.hstore('1'=>"'\\ \"=>"), nil).must_equal '"1"=>"\'\\\\ \\"=>"'
-    ['"a"=>"b","c"=>"d"', '"c"=>"d","a"=>"b"'].must_include(@db.bound_variable_arg(Sequel.hstore("a"=>"b","c"=>"d"), nil))
+    @db.bound_variable_arg(Sequel.hstore("a"=>"b","c"=>"d"), nil).must_equal '"a"=>"b","c"=>"d"'
   end
 
   it "should parse hstore type from the schema correctly" 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]])

data/spec/extensions/pg_json_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_json, :pg_json_ops
 

data/spec/extensions/pg_json_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_json
 
@@ -17,18 +17,6 @@ describe "pg_json extension" do
     @db.extension(:pg_array, :pg_json)
   end
 
-  deprecated "should set up conversion procs correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[114].call("{}").must_equal @hc.new({})
-    cp[3802].call("{}").must_equal @bhc.new({})
-  end
-
-  deprecated "should set up conversion procs for arrays correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[199].call("{[]}").must_equal [@ac.new([])]
-    cp[3807].call("{[]}").must_equal [@bac.new([])]
-  end
-
   it "should set up conversion procs correctly" do
     cp = @db.conversion_procs
     cp[114].call("{}").must_equal @hc.new({})

data/spec/extensions/pg_loose_count_spec.rb

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

data/spec/extensions/pg_range_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_range, :pg_range_ops
 

data/spec/extensions/pg_range_spec.rb

@@ -1,13 +1,8 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
+require_relative "spec_helper"
 
 describe "pg_range extension" do
   before(:all) do
     Sequel.extension :pg_array, :pg_range
-    @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
@@ -21,26 +16,6 @@ describe "pg_range extension" do
     @db.extension(:pg_array, :pg_range)
   end
 
-  deprecated "should set up conversion procs correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[3904].call("[1,2]").must_equal @R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'int4range')
-    cp[3906].call("[1,2]").must_equal @R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'numrange')
-    cp[3908].call("[2011-01-02 10:20:30,2011-02-03 10:20:30)").must_equal @R.new(Time.local(2011, 1, 2, 10, 20, 30),Time.local(2011, 2, 3, 10, 20, 30), :exclude_begin=>false, :exclude_end=>true, :db_type=>'tsrange')
-    cp[3910].call("[2011-01-02 10:20:30,2011-02-03 10:20:30)").must_equal @R.new(Time.local(2011, 1, 2, 10, 20, 30),Time.local(2011, 2, 3, 10, 20, 30), :exclude_begin=>false, :exclude_end=>true, :db_type=>'tstzrange')
-    cp[3912].call("[2011-01-02,2011-02-03)").must_equal  @R.new(Date.new(2011, 1, 2),Date.new(2011, 2, 3), :exclude_begin=>false, :exclude_end=>true, :db_type=>'daterange')
-    cp[3926].call("[1,2]").must_equal @R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'int8range')
-  end
-
-  deprecated "should set up conversion procs for arrays correctly" do
-    cp = Sequel::Postgres::PG__TYPES
-    cp[3905].call("{\"[1,2]\"}").must_equal [@R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'int4range')]
-    cp[3907].call("{\"[1,2]\"}").must_equal [@R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'numrange')]
-    cp[3909].call("{\"[2011-01-02 10:20:30,2011-02-03 10:20:30)\"}").must_equal [@R.new(Time.local(2011, 1, 2, 10, 20, 30),Time.local(2011, 2, 3, 10, 20, 30), :exclude_begin=>false, :exclude_end=>true, :db_type=>'tsrange')]
-    cp[3911].call("{\"[2011-01-02 10:20:30,2011-02-03 10:20:30)\"}").must_equal [@R.new(Time.local(2011, 1, 2, 10, 20, 30),Time.local(2011, 2, 3, 10, 20, 30), :exclude_begin=>false, :exclude_end=>true, :db_type=>'tstzrange')]
-    cp[3913].call("{\"[2011-01-02,2011-02-03)\"}").must_equal [@R.new(Date.new(2011, 1, 2),Date.new(2011, 2, 3), :exclude_begin=>false, :exclude_end=>true, :db_type=>'daterange')]
-    cp[3927].call("{\"[1,2]\"}").must_equal [@R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'int8range')]
-  end
-
   it "should set up conversion procs correctly" do
     cp = @db.conversion_procs
     cp[3904].call("[1,2]").must_equal @R.new(1,2, :exclude_begin=>false, :exclude_end=>false, :db_type=>'int4range')
@@ -171,50 +146,6 @@ describe "pg_range extension" do
     end
   end
 
-  deprecated "should support registering custom range types" do
-    @R.register('foorange')
-    @db.typecast_value(:foorange, 1..2).must_be_kind_of(@R)
-    @db.fetch = [{:name=>'id', :db_type=>'foorange'}]
-    @db.schema(:items).map{|e| e[1][:type]}.must_equal [:foorange]
-  end
-
-  deprecated "should support using a block as a custom conversion proc given as block" do
-    @R.register('foo2range'){|s| (s*2).to_i}
-    @db.typecast_value(:foo2range, '[1,2]').must_be :==, (11..22)
-  end
-
-  deprecated "should support using a block as a custom conversion proc given as :converter option" do
-    @R.register('foo3range', :converter=>proc{|s| (s*2).to_i})
-    @db.typecast_value(:foo3range, '[1,2]').must_be :==, (11..22)
-  end
-
-  deprecated "should support using an existing scaler conversion proc via the :subtype_oid option" do
-    @R.register('foo4range', :subtype_oid=>16)
-    @db.typecast_value(:foo4range, '[t,f]').must_equal @R.new(true, false, :db_type=>'foo4range')
-  end
-
-  deprecated "should raise an error if using :subtype_oid option with unexisting scalar conversion proc" do
-    proc{@R.register('fooirange', :subtype_oid=>0)}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should raise an error if using :converter option and a block argument" do
-    proc{@R.register('fooirange', :converter=>proc{}){}}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should raise an error if using :subtype_oid option and a block argument" do
-    proc{@R.register('fooirange', :subtype_oid=>16){}}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should support registering custom types with :oid option" do
-    @R.register('foo5range', :oid=>331)
-    Sequel::Postgres::PG__TYPES[331].call('[1,3)').must_be_kind_of(@R)
-  end
-
-  deprecated "should not support registering custom range types on a per-Database basis for frozen databases" do
-    @db.freeze
-    proc{@db.register_range_type('banana', :oid=>7865){|s| s}}.must_raise RuntimeError, TypeError
-  end
-
   it "should support registering custom range types" do
     @db.register_range_type('foorange')
     @db.typecast_value(:foorange, 1..2).must_be_kind_of(@R)
@@ -349,20 +280,6 @@ describe "pg_range extension" do
     end
   end
 
-  deprecated "should set appropriate timestamp range conversion procs when resetting conversion procs" do
-    @db.reset_conversion_procs
-    procs = @db.conversion_procs
-    procs[3908].call('[2011-10-20 11:12:13,2011-10-20 11:12:14]').must_be :==, (Time.local(2011, 10, 20, 11, 12, 13)..(Time.local(2011, 10, 20, 11, 12, 14)))
-    procs[3910].call('[2011-10-20 11:12:13,2011-10-20 11:12:14]').must_be :==, (Time.local(2011, 10, 20, 11, 12, 13)..(Time.local(2011, 10, 20, 11, 12, 14)))
-  end
-
-  deprecated "should set appropriate timestamp range array conversion procs when resetting conversion procs" do
-    @db.reset_conversion_procs
-    procs = @db.conversion_procs
-    procs[3909].call('{"[2011-10-20 11:12:13,2011-10-20 11:12:14]"}').must_be :==, [Time.local(2011, 10, 20, 11, 12, 13)..Time.local(2011, 10, 20, 11, 12, 14)]
-    procs[3911].call('{"[2011-10-20 11:12:13,2011-10-20 11:12:14]"}').must_be :==, [Time.local(2011, 10, 20, 11, 12, 13)..Time.local(2011, 10, 20, 11, 12, 14)]
-  end
-
   describe "a PGRange instance" do
     before do
       @r1 = @R.new(1, 2)
@@ -420,10 +337,8 @@ describe "pg_range extension" do
     it "should quack like a range" do
       @r1.cover?(1.5).must_equal true
       @r1.cover?(2.5).must_equal false
-      if RUBY_VERSION >= '1.9'
-        @r1.first(1).must_equal [1]
-        @r1.last(1).must_equal [2]
-      end
+      @r1.first(1).must_equal [1]
+      @r1.last(1).must_equal [2]
       @r1.to_a.must_equal [1, 2]
       @r1.first.must_equal 1
       @r1.last.must_equal 2

data/spec/extensions/pg_row_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_row, :pg_row_ops
 

data/spec/extensions/pg_row_plugin_spec.rb

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

data/spec/extensions/pg_row_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "pg_row extension" do
   before do
@@ -9,16 +9,6 @@ describe "pg_row extension" do
     @db.sqls
   end
 
-  deprecated "should parse record objects as arrays" do
-    a = Sequel::Postgres::PG__TYPES[2249].call("(a,b,c)")
-    a.class.must_equal(@m::ArrayRow)
-    a.to_a.must_be_kind_of(Array)
-    a[0].must_equal 'a'
-    a.must_equal %w'a b c'
-    a.db_type.must_be_nil
-    @db.literal(a).must_equal "ROW('a', 'b', 'c')"
-  end
-
   it "should parse record objects as arrays" do
     a = @db.conversion_procs[2249].call("(a,b,c)")
     a.class.must_equal(@m::ArrayRow)
@@ -145,30 +135,6 @@ describe "pg_row extension" do
     p.column_converters.must_equal [Array]
   end
 
-  deprecated "should reload registered row types when reseting conversion procs" do
-    db = Sequel.mock(:host=>'postgres')
-    db.extend_datasets{def quote_identifiers?; false end}
-    db.extension(:pg_row)
-    db.conversion_procs[4] = proc{|s| s.to_i}
-    db.conversion_procs[5] = proc{|s| s * 2}
-    db.sqls
-    db.fetch = [[{:oid=>1, :typrelid=>2, :typarray=>3}], [{:attname=>'bar', :atttypid=>4}, {:attname=>'baz', :atttypid=>5}]]
-    db.register_row_type(:foo)
-    db.sqls.must_equal ["SELECT pg_type.oid, typrelid, typarray FROM pg_type WHERE ((typtype = 'c') AND (typname = 'foo')) LIMIT 1",
-      "SELECT attname, (CASE pg_type.typbasetype WHEN 0 THEN atttypid ELSE pg_type.typbasetype END) AS atttypid FROM pg_attribute INNER JOIN pg_type ON (pg_type.oid = pg_attribute.atttypid) WHERE ((attrelid = 2) AND (attnum > 0) AND NOT attisdropped) ORDER BY attnum"]
-
-    begin
-      pgnt = Sequel::Postgres::PG_NAMED_TYPES.dup
-      Sequel::Postgres::PG_NAMED_TYPES.clear
-      db.fetch = [[{:oid=>1, :typrelid=>2, :typarray=>3}], [{:attname=>'bar', :atttypid=>4}, {:attname=>'baz', :atttypid=>5}]]
-      db.reset_conversion_procs
-      db.sqls.must_equal ["SELECT pg_type.oid, typrelid, typarray FROM pg_type WHERE ((typtype = 'c') AND (typname = 'foo')) LIMIT 1",
-        "SELECT attname, (CASE pg_type.typbasetype WHEN 0 THEN atttypid ELSE pg_type.typbasetype END) AS atttypid FROM pg_attribute INNER JOIN pg_type ON (pg_type.oid = pg_attribute.atttypid) WHERE ((attrelid = 2) AND (attnum > 0) AND NOT attisdropped) ORDER BY attnum"]
-    ensure
-      Sequel::Postgres::PG_NAMED_TYPES.replace pgnt
-    end
-  end
-
   it "should handle ArrayRows and HashRows in bound variables" do
     @db.bound_variable_arg(1, nil).must_equal 1
     @db.bound_variable_arg(@m::ArrayRow.call(["1", "abc\\'\","]), nil).must_equal '("1","abc\\\\\'\\",")'
@@ -302,15 +268,6 @@ describe "pg_row extension" do
     @db.typecast_value(:pg_row_foo, 'bar'=>'1', 'baz'=>'b').must_equal(:bar=>1, :baz=>'bb')
   end
 
-  deprecated "should handle conversion procs that aren't added until later" do
-    @db.conversion_procs[5] = proc{|s| s * 2}
-    @db.fetch = [[{:oid=>1, :typrelid=>2, :typarray=>3}], [{:attname=>'bar', :atttypid=>4}, {:attname=>'baz', :atttypid=>5}]]
-    c = proc{|h| [h]}
-    @db.register_row_type(:foo, :converter=>c)
-    @db.conversion_procs[4] = proc{|s| s.to_i}
-    @db.conversion_procs[1].call('(1,b)').must_equal [{:bar=>1, :baz=>'bb'}]
-  end
-
   it "should handle nil values when converting columns" do
     @db.conversion_procs[5] = proc{|s| s * 2}
     @db.fetch = [[{:oid=>1, :typrelid=>2, :typarray=>3}], [{:attname=>'bar', :atttypid=>4}]]

data/spec/extensions/pg_static_cache_updater_spec.rb

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