sequel 4.49.0 → 5.0.0

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

data/spec/extensions/prepared_statements_safe_spec.rb

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

data/spec/extensions/prepared_statements_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "prepared_statements plugin" do
   before do
@@ -13,11 +13,11 @@ describe "prepared_statements plugin" do
     @db.sqls
   end
 
-  deprecated "should correctly lookup by primary key for joined dataset" do
+  it "should work with implicit subqueries used for joined datasets" do
     @c.dataset = @c.dataset.from(:people, :people2)
     @db.sqls
     @c[1].must_equal @p
-    @db.sqls.must_equal ["SELECT * FROM people, people2 WHERE (people.id = 1) LIMIT 1 -- read_only"]
+    @db.sqls.must_equal ["SELECT * FROM (SELECT * FROM people, people2) AS people WHERE (id = 1) LIMIT 1 -- read_only"]
   end 
 
   it "should correctly lookup by primary key for dataset using subquery" do
@@ -32,33 +32,12 @@ describe "prepared_statements plugin" do
     @c.set_primary_key [:id, :name]
     @c.send(:use_prepared_statements_for_pk_lookup?).must_equal true
     @c.set_primary_key :id
-    deprecated do
     @c.dataset = @c.dataset.from(:people, :people2)
-    @c.send(:use_prepared_statements_for_pk_lookup?).must_equal false
-    end
+    @c.send(:use_prepared_statements_for_pk_lookup?).must_equal true
     @c.dataset = @db[:people].select(:id, :name, :i)
     @c.send(:use_prepared_statements_for_pk_lookup?).must_equal true
   end
 
-  it "should use prepared statements for refreshes if default is not optimized" do
-    @p.send(:use_prepared_statements_for?, :refresh).must_equal false 
-    @c.set_primary_key [:id, :name]
-    @p.send(:use_prepared_statements_for?, :refresh).must_equal true
-  end
-
-  it "should use prepared statements for deletes if default is not optimized" do
-    @p.send(:use_prepared_statements_for?, :delete).must_equal false 
-    @c.set_primary_key [:id, :name]
-    @p.send(:use_prepared_statements_for?, :delete).must_equal true
-  end
-
-  it "should use prepared statements for deletes if default on Oracle and DB2" do
-    def @db.database_type; :oracle end
-    @p.send(:use_prepared_statements_for?, :delete).must_equal true
-    def @db.database_type; :db2 end
-    @p.send(:use_prepared_statements_for?, :delete).must_equal true
-  end
-
   it "should raise Error for unsupported prepared statement types" do
     proc{@p.send(:use_prepared_statements_for?, :foo)}.must_raise Sequel::Error
   end
@@ -102,22 +81,7 @@ describe "prepared_statements plugin" do
 
     it "should correctly create instance" do
       @c.create(:name=>'foo').must_equal @c.load(:id=>1, :name=>'foo', :i => 2)
-      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo')", "SELECT #{@columns} FROM people WHERE (id = 1) LIMIT 1"]
-    end
-
-    it "should correctly lookup by primary key" do
-      @c[1].must_equal @p
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
-    end 
-
-    it "should correctly delete instance" do
-      @p.destroy.must_equal @p
-      @db.sqls.must_equal ["DELETE FROM people WHERE (id = 1)"]
-    end
-
-    it "should correctly delete instance when specifying server" do
-      @p.set_server(:read_only).destroy.must_equal @p
-      @db.sqls.must_equal ["DELETE FROM people WHERE (id = 1) -- read_only"]
+      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo')", "SELECT * FROM people WHERE id = 1"]
     end
 
     it "should correctly update instance when specifying server" do
@@ -127,7 +91,7 @@ describe "prepared_statements plugin" do
 
     it "should correctly create instance when specifying server" do
       @c.new(:name=>'foo').set_server(:read_only).save.must_equal @c.load(:id=>1, :name=>'foo', :i => 2)
-      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo') -- read_only", "SELECT #{@columns} FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @db.sqls.must_equal ["INSERT INTO people (name) VALUES ('foo') -- read_only", "SELECT * FROM people WHERE id = 1 -- read_only"]
     end
 
     it "should correctly create instance if dataset supports insert_select when specifying server" do
@@ -152,14 +116,15 @@ describe "prepared_statements plugin" do
 
     it "should work correctly when subclassing" do
       c = Class.new(@c)
-      c[1].must_equal c.load(:id=>1, :name=>'foo', :i=>2)
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @db.sqls
+      c.load(:id=>1, :name=>'foo', :i=>2).save
+      @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 2 WHERE (id = 1)"]
     end 
 
     it "should correctly handle without schema type when placeholder type specifiers are required" do
       @c.dataset = @ds.with_extend{def requires_placeholder_type_specifiers?; true end}
-      @c[1].must_equal @p
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @p.save
+      @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 2 WHERE (id = 1)"]
     end
 
     it "should correctly handle with schema type when placeholder type specifiers are required" do
@@ -183,8 +148,8 @@ describe "prepared_statements plugin" do
         end
       end
       @c.db_schema[:id][:type] = :integer
-      @c[1].must_equal @p
-      @db.sqls.must_equal ["SELECT id, name, i FROM people WHERE (id = 1) LIMIT 1 -- read_only"]
+      @p.save
+      @db.sqls.must_equal ["UPDATE people SET name = 'foo', i = 2 WHERE (id = 1)"]
     end 
   end
 

data/spec/extensions/pretty_table_spec.rb

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

data/spec/extensions/query_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Database#query" do
   before do
@@ -87,17 +87,6 @@ describe "Dataset#query" do
     q.sql.must_equal "SELECT * FROM xyz"
   end
   
-  # SEQUEL5: Remove
-  unless Sequel.mock.dataset.frozen?
-    deprecated "should have an appropriate mutation method" do
-      @d.query! do
-        select :a, Sequel[:b].as(:mongo)
-        from :yyy
-      end
-      @d.sql.must_equal "SELECT a, b AS mongo FROM yyy"
-    end
-  end
-
   it "should raise on non-chainable method calls" do
     proc {@d.query {row_proc}}.must_raise(Sequel::Error)
     proc {@d.query {all}}.must_raise(Sequel::Error)

data/spec/extensions/rcte_tree_spec.rb

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

data/spec/extensions/round_timestamps_spec.rb

@@ -1,6 +1,5 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
-if RUBY_VERSION >= '1.9.0'
 describe "Sequel::Dataset::RoundTimestamps" do
   before do
     @dataset = Sequel.mock.dataset.extension(:round_timestamps)
@@ -38,6 +37,3 @@ describe "Sequel::Dataset::RoundTimestamps" do
     @dataset.literal(DateTime.new(2010, 1, 2, 3, 4, Rational(54999999, 10000000))).must_equal "'2010-01-02 03:04:05'"
   end
 end
-else
-  skip_warn "round_timestamps extension: only works on ruby 1.9+"
-end

data/spec/extensions/s_spec.rb

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

data/spec/extensions/schema_caching_spec.rb

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