sequel 4.40.0 → 4.41.0

data/spec/core/expression_filters_spec.rb

@@ -192,6 +192,10 @@ describe "Blockless Ruby Filters" do
     @d.lit(1 + Sequel.lit('?', :x)).must_equal '(1 + x)'
   end
 
+  it "should raise a NoMethodError if coerce is called with a non-Numeric" do
+    proc{Sequel.expr(:x).coerce(:a)}.must_raise NoMethodError
+  end
+
   it "should support AND conditions via &" do
     @d.l(Sequel.expr(:x) & :y).must_equal '(x AND y)'
     @d.l(Sequel.expr(:x).sql_boolean & :y).must_equal '(x AND y)'

data/spec/core/mock_adapter_spec.rb

@@ -9,7 +9,7 @@ describe "Sequel Mock Adapter" do
 
   it "should support registering mock adapter type" do
     begin
-      mod = Module.new do
+      Module.new do
         Sequel::Database.set_shared_adapter_scheme(:foo, self)
         
         def self.mock_adapter_setup(db)

data/spec/core/schema_generator_spec.rb

@@ -198,6 +198,6 @@ describe "Sequel::Schema::Generator generic type methods" do
       File :k
       TrueClass :l
       FalseClass :m
-    end.columns.map{|c| c[:type]}.must_equal [String, Integer, Fixnum, :Bignum, Float, BigDecimal, Date, DateTime, Time, Numeric, File, TrueClass, FalseClass]
+    end.columns.map{|c| c[:type]}.must_equal [String, Integer, Integer, :Bignum, Float, BigDecimal, Date, DateTime, Time, Numeric, File, TrueClass, FalseClass]
   end
 end

data/spec/core/schema_spec.rb

@@ -61,7 +61,7 @@ describe "DB#create_table" do
       File :k
       TrueClass :l
       FalseClass :m
-      column :n, Fixnum
+      column :n, Integer
       primary_key :o, :type=>String
       foreign_key :p, :f, :type=>Date
     end
@@ -93,6 +93,15 @@ describe "DB#create_table" do
     @db.sqls.must_equal ['CREATE TABLE cats (a varchar(50), b text, c char(40), d time, e numeric(11, 2))']
   end
 
+  it "should allow the use of modifiers with ruby class types" do
+    c = Class.new
+    def c.name; 'Fixnum'; end
+    @db.create_table(:cats) do
+      column :a, c
+    end
+    @db.sqls.must_equal ['CREATE TABLE cats (a integer)']
+  end
+
   it "should raise an error if you use a ruby class that isn't handled" do
     proc{@db.create_table(:cats){column :a, Class}}.must_raise(Sequel::Error)
   end

data/spec/core/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require "#{File.dirname(File.dirname(__FILE__))}/sequel_warning.rb"
 
 if ENV['COVERAGE']
   require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")

data/spec/extensions/class_table_inheritance_spec.rb

@@ -57,6 +57,9 @@ describe "class_table_inheritance plugin" do
     @db.sqls.must_equal ["SELECT employees.id, employees.name, employees.kind, managers.num_staff FROM employees INNER JOIN managers ON (managers.id = employees.id) WHERE (managers.id = 1) LIMIT 1"]
     Manager.load(:id=>1, :kind=>'Manager', :num_staff=>2).save
     @db.sqls.must_equal ["UPDATE employees SET kind = 'Manager' WHERE (id = 1)", "UPDATE managers SET num_staff = 2 WHERE (id = 1)"]
+    @db.fetch = {:id=>1, :kind=>'Manager', :num_staff=>2}
+    Manager.load(:id=>1, :kind=>'Manager', :num_staff=>2).refresh
+    @db.sqls.must_equal ["SELECT employees.id, employees.name, employees.kind, managers.num_staff FROM employees INNER JOIN managers ON (managers.id = employees.id) WHERE (managers.id = 1) LIMIT 1"]
   end
 
   it "#cti_base_model should be the model that loaded the plugin" do

data/spec/extensions/connection_expiration_spec.rb

@@ -73,7 +73,7 @@ connection_expiration_specs = shared_description do
     end
 
     it "should not leak connection references during disconnect" do
-      c1, c2 = multiple_connections
+      multiple_connections
       @db.pool.instance_variable_get(:@connection_expiration_timestamps).size.must_equal 2
       @db.disconnect
       @db.pool.instance_variable_get(:@connection_expiration_timestamps).size.must_equal 0

data/spec/extensions/graph_each_spec.rb

@@ -116,4 +116,10 @@ describe Sequel::Dataset, " graphing" do
     @db.fetch = {:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7}
     @ds1.graph(@ds2, :x=>:id).all.must_equal [{:points=>{:id=>2, :x=>4, :y=>6}, :lines=>{:id=>12, :x=>15, :y=>18, :graph_id=>21}}]
   end
+
+  it "#with_sql_each should work normally if the dataset is not graphed" do
+    @db.fetch = {:x=>1}
+    @db.dataset.with_sql_each('SELECT 1 AS x'){|r| r.must_equal(:x=>1)}
+    @db.sqls.must_equal ['SELECT 1 AS x']
+  end
 end

data/spec/extensions/hook_class_methods_spec.rb

@@ -361,6 +361,52 @@ 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
+  
+  it "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
+  
+  it "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))

data/spec/extensions/json_serializer_spec.rb

@@ -66,12 +66,12 @@ describe "Sequel::Plugins::JsonSerializer" do
   end
 
   it "should raise an error if attempting to parse json when providing array to non-array association or vice-versa" do
-    proc{Artist.from_json('{"albums":{"id":1,"name":"RF","artist_id":2,"json_class":"Album"},"id":2,"name":"YJM"}', :associations=>:albums)}.must_raise(Sequel::Error)
-    proc{Album.from_json('{"artist":[{"id":2,"name":"YJM","json_class":"Artist"}],"id":1,"name":"RF","artist_id":2}', :associations=>:artist)}.must_raise(Sequel::Error)
+    proc{Artist.from_json('{"albums":{"id":1,"name":"RF","artist_id":2},"id":2,"name":"YJM"}', :associations=>:albums)}.must_raise(Sequel::Error)
+    proc{Album.from_json('{"artist":[{"id":2,"name":"YJM"}],"id":1,"name":"RF","artist_id":2}', :associations=>:artist)}.must_raise(Sequel::Error)
   end
 
   it "should raise an error if attempting to parse an array containing non-hashes" do
-    proc{Artist.from_json('[{"id":2,"name":"YJM","json_class":"Artist"}, 2]')}.must_raise(Sequel::Error)
+    proc{Artist.from_json('[{"id":2,"name":"YJM"}, 2]')}.must_raise(Sequel::Error)
   end
 
   it "should raise an error if attempting to parse invalid JSON" do
@@ -260,6 +260,11 @@ describe "Sequel::Plugins::JsonSerializer" do
     Album.dataset.to_json(:root=>"bars", :only => :id).to_s.must_equal '{"bars":[{"id":1},{"id":1}]}'
   end
 
+  it "should use an alias for an included asscociation to qualify an association" do
+    JSON.parse(@album.to_json(:include=>Sequel.as(:artist, :singer)).to_s).must_equal JSON.parse('{"id":1,"name":"RF","artist_id":2,"singer":{"id":2,"name":"YJM"}}')
+    JSON.parse(@album.to_json(:include=>{Sequel.as(:artist, :singer)=>{:only=>:name}}).to_s).must_equal JSON.parse('{"id":1,"name":"RF","artist_id":2,"singer":{"name":"YJM"}}')
+  end
+
   it "should store the default options in json_serializer_opts" do
     Album.json_serializer_opts.must_equal(:naked=>true)
     c = Class.new(Album)

data/spec/extensions/set_overrides_spec.rb

@@ -58,4 +58,8 @@ describe "Sequel::Dataset #set_overrides" do
     @ds.set_overrides!(:x=>1)
     @ds.insert_sql.must_equal "INSERT INTO items (x) VALUES (1)"
   end
+
+  it "should consider dataset with select overrides and default a simple select all" do
+    @ds.send(:simple_select_all?).must_equal true
+  end
 end

data/spec/extensions/single_table_inheritance_spec.rb

@@ -30,7 +30,7 @@ describe Sequel::Model, "single table inheritance plugin" do
     Object.send(:remove_const, :StiTestSub2)
     class ::StiTestSub1 < StiTest; end 
     class ::StiTestSub2 < StiTest; end 
-    @ds._fetch = [{:blah=>'StiTest'}, {:blah=>'StiTestSub1'}, {:blah=>'StiTestSub2'}]
+    StiTest.dataset._fetch = [{:blah=>'StiTest'}, {:blah=>'StiTestSub1'}, {:blah=>'StiTestSub2'}]
     StiTest.all.collect{|x| x.class}.must_equal [StiTest, StiTestSub1, StiTestSub2]
     StiTest.dataset.sql.must_equal "SELECT * FROM sti_tests"
     StiTestSub1.dataset.sql.must_equal "SELECT * FROM sti_tests WHERE (sti_tests.blah IN ('StiTestSub1'))"
@@ -65,7 +65,7 @@ describe Sequel::Model, "single table inheritance plugin" do
       Object
     end
     StiTest.plugin :single_table_inheritance, :kind
-    @ds._fetch = [{:kind=>''}, {:kind=>nil}]
+    StiTest.dataset._fetch = [{:kind=>''}, {:kind=>nil}]
     StiTest.all.collect{|x| x.class}.must_equal [StiTest, StiTest]
     called.must_equal false
   end

data/spec/extensions/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require "#{File.dirname(File.dirname(__FILE__))}/sequel_warning.rb"
 
 if ENV['COVERAGE']
   require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")

data/spec/extensions/string_agg_spec.rb

@@ -66,6 +66,10 @@ describe "string_agg extension" do
     end
   end
 
+  it "should raise Sequel::Error on unsupported database" do
+    proc{dbf.call(:foo).literal(@sa1)}.must_raise Sequel::Error
+  end
+
   it "should handle order without arguments" do
     db = dbf.call(:postgres)
     db.literal(@sa1.order).must_equal "string_agg(c, ',')"

data/spec/extensions/uuid_spec.rb

@@ -4,7 +4,6 @@ describe "Sequel::Plugins::Uuid" do
   before do
     uuid = @uuid = '57308544-4e83-47b8-b87f-6f68b987f4f9'
     @alt_uuid = 'd5d1ec46-5e8e-4a7b-adc9-50e76b819e19'
-    dc = Object.new
     @c = Class.new(Sequel::Model(:t))
     @c.class_eval do
       columns :id, :uuid
@@ -49,7 +48,7 @@ describe "Sequel::Plugins::Uuid" do
       end
       o = c.create
       c.db.sqls.first.must_match(/INSERT INTO t \(u\) VALUES \('[-0-9a-f]+'\)/)
-      o.u.must_match /[-0-9a-f]+/
+      o.u.must_match(/[-0-9a-f]+/)
     end
   end
 

data/spec/integration/associations_test.rb

@@ -1496,13 +1496,20 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
 
   it "should return no objects if none are associated" do
     @album.artist.must_equal nil
+    @album.artist_dataset.first.must_equal nil
     @artist.first_album.must_equal nil
+    @artist.first_album_dataset.first.must_equal nil
     @artist.albums.must_equal []
+    @artist.albums_dataset.all.must_equal []
     @album.tags.must_equal []
+    @album.tags_dataset.all.must_equal []
     @album.alias_tags.must_equal []
+    @album.alias_tags_dataset.all.must_equal []
     @tag.albums.must_equal []
+    @tag.albums_dataset.all.must_equal []
     unless @no_many_through_many
       @album.first_tag.must_equal nil
+      @album.first_tag_dataset.first.must_equal nil
     end
   end
 
@@ -2245,6 +2252,13 @@ describe "Sequel::Model Composite Key Associations" do
     proc{@artist.remove_album([@album.id1, @album.id2])}.must_raise(Sequel::Error)
     proc{@artist.remove_album(@album)}.must_raise(Sequel::Error)
   end
+
+  it "should not have association method or dataset method return rows with NULL keys" do
+    Album.one_to_many :other_albums, :class=>Album, :key=>[:artist_id1, :artist_id2], :primary_key=>[:artist_id1, :artist_id2]
+    @album.update(:artist_id1=>1)
+    @album.other_albums.must_equal []
+    @album.other_albums_dataset.all.must_equal []
+  end
 end
 
 describe "Sequel::Model pg_array_to_many" do

data/spec/integration/dataset_test.rb

@@ -108,7 +108,7 @@ describe "Simple Dataset operations" do
     @ds.all.must_equal [{:id=>1, :number=>11}]
   end
   
-  cspecify "should have update return the number of matched rows", [:do, :mysql], [:ado] do
+  cspecify "should have update return the number of matched rows", [:do, :mysql] do
     @ds.update(:number=>:number).must_equal 1
     @ds.filter(:id=>1).update(:number=>:number).must_equal 1
     @ds.filter(:id=>2).update(:number=>:number).must_equal 0
@@ -494,7 +494,7 @@ describe Sequel::Database do
   end
 
   cspecify "should properly escape identifiers", :db2, :oracle, :sqlanywhere do
-    DB.create_table(:"\\'\"[]"){Integer :id}
+    DB.create_table!(:"\\'\"[]"){Integer :id}
     DB.drop_table(:"\\'\"[]")
   end
 
@@ -559,7 +559,7 @@ describe "Simple Dataset operations" do
     @ds.insert(:number=>1, :flag=>true)
     @ds.insert(:number=>2, :flag=>false)
     @ds.insert(:number=>3, :flag=>nil)
-    @ds.order!(:number)
+    @ds = @ds.order(:number)
     @ds.filter(:flag=>true).map(:number).must_equal [1]
     @ds.filter(:flag=>false).map(:number).must_equal [2]
     @ds.filter(:flag=>nil).map(:number).must_equal [3]
@@ -899,7 +899,7 @@ describe Sequel::SQL::Constants do
     d.to_s.must_equal Date.today.to_s
   end
 
-  cspecify "should have working CURRENT_TIME", [:jdbc, :sqlite], [:mysql2], [:tinytds] do
+  cspecify "should have working CURRENT_TIME", [:jdbc, :sqlite], [:mysql2], [:tinytds], [:ado] do
     @db.create_table!(:constants){Time :t, :only_time=>true}
     @ds.insert(:t=>Sequel::CURRENT_TIME)
     (Time.now - @c[@ds.get(:t)]).must_be_close_to 0, 60
@@ -1134,7 +1134,7 @@ describe "Sequel::Dataset main SQL methods" do
   end
 
   it "#select_group should work correctly" do
-    @ds.unordered!
+    @ds = @ds.unordered
     @ds.select_group(:a).all.must_equal []
     @ds.insert(20, 30)
     @ds.select_group(:a).all.must_equal [{:a=>20}]
@@ -1145,13 +1145,13 @@ describe "Sequel::Dataset main SQL methods" do
   end
 
   it "#select_group should work correctly when aliasing" do
-    @ds.unordered!
+    @ds = @ds.unordered
     @ds.insert(20, 30)
     @ds.select_group(Sequel[:b].as(:c)).all.must_equal [{:c=>30}]
   end
   
   it "#having should work correctly" do
-    @ds.unordered!
+    @ds = @ds.unordered
     @ds.select{[b, max(a).as(c)]}.group(:b).having{max(a) > 30}.all.must_equal []
     @ds.insert(20, 30)
     @ds.select{[b, max(a).as(c)]}.group(:b).having{max(a) > 30}.all.must_equal []
@@ -1160,7 +1160,7 @@ describe "Sequel::Dataset main SQL methods" do
   end
   
   cspecify "#having should work without a previous group", :sqlite do
-    @ds.unordered!
+    @ds = @ds.unordered
     @ds.select{max(a).as(c)}.having{max(a) > 30}.all.must_equal []
     @ds.insert(20, 30)
     @ds.select{max(a).as(c)}.having{max(a) > 30}.all.must_equal []
@@ -1435,7 +1435,7 @@ describe "Sequel::Dataset DSL support" do
   
   it "should work with multiple value arrays" do
     @ds.insert(20, 10)
-    @ds.quote_identifiers = false
+    @ds = @ds.with_quote_identifiers(false)
     @ds.filter([:a, :b]=>[[20, 10]]).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter([:a, :b]=>[[10, 20]]).all.must_equal []
     @ds.filter([:a, :b]=>[[20, 10], [1, 2]]).all.must_equal [{:a=>20, :b=>10}]
@@ -1449,8 +1449,7 @@ describe "Sequel::Dataset DSL support" do
 
   it "should work with IN/NOT in with datasets" do
     @ds.insert(20, 10)
-    ds = @ds.unordered
-    @ds.quote_identifiers = false
+    ds = @ds.unordered.with_quote_identifiers(false)
 
     @ds.filter(:a=>ds.select(:a)).all.must_equal [{:a=>20, :b=>10}]
     @ds.filter(:a=>ds.select(:a).where(:a=>15)).all.must_equal []
@@ -1474,7 +1473,7 @@ describe "Sequel::Dataset DSL support" do
     @ds.exclude([:a, :b]=>[]).all.must_equal [{:a=>20, :b=>10}]
   end
   
-  it "should work empty arrays with nulls" do
+  it "should work empty arrays with nulls when using empty_array_consider_nulls extension" do
     @ds = @ds.extension(:empty_array_consider_nulls)
     @ds.insert(nil, nil)
     @ds.filter(:a=>[]).all.must_equal []
@@ -1492,7 +1491,7 @@ describe "Sequel::Dataset DSL support" do
     end
   end
   
-  it "should work empty arrays with nulls and the empty_array_ignore_nulls extension" do
+  it "should work empty arrays with nulls" do
     ds = @ds
     ds.insert(nil, nil)
     ds.filter(:a=>[]).all.must_equal []
@@ -1532,7 +1531,7 @@ describe "SQL Extract Function" do
   
   it "should return the part of the datetime asked for" do
     t = Time.now
-    def @ds.supports_timestamp_timezones?() false end
+    @ds = @ds.with_extend(Module.new do def supports_timestamp_timezones?() false end end)
     @ds.insert(t)
     @ds.get{a.extract(:year)}.must_equal t.year
     @ds.get{a.extract(:month)}.must_equal t.month
@@ -1715,20 +1714,16 @@ describe "Dataset identifier methods" do
   end
   
   it "#identifier_output_method should change how identifiers are output" do
-    @ds.identifier_output_method = :upcase
-    @ds.first.must_equal(:AB=>1)
-    @ds.identifier_output_method = :uprev
-    @ds.first.must_equal(:BA=>1)
+    @ds.with_identifier_output_method(:upcase).first.must_equal(:AB=>1)
+    @ds.with_identifier_output_method(:uprev).first.must_equal(:BA=>1)
   end
   
   it "should work with a nil identifier_output_method" do
-    @ds.identifier_output_method = nil
-    [{:ab=>1}, {:AB=>1}].must_include(@ds.first)
+    [{:ab=>1}, {:AB=>1}].must_include(@ds.with_identifier_output_method(nil).first)
   end
 
   it "should work when not quoting identifiers" do
-    @ds.quote_identifiers = false
-    @ds.first.must_equal(:ab=>1)
+    @ds.with_quote_identifiers(false).first.must_equal(:ab=>1)
   end
 end
 

data/spec/integration/schema_test.rb

@@ -33,9 +33,9 @@ describe "Database schema parser" do
     DB.create_table!(:items){Integer :number}
     DB.identifier_output_method = @iom
     DB.identifier_input_method = @iim
-    ds = DB[:items]
-    ds.identifier_output_method = :reverse
-    ds.identifier_input_method = :reverse
+    ds = DB[:items].
+      with_identifier_output_method(:reverse).
+      with_identifier_input_method(:reverse)
     begin
       DB.schema(ds, :reload=>true).must_be_kind_of(Array)
       DB.schema(ds, :reload=>true).first.first.must_equal :number

data/spec/integration/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'logger'
+require "#{File.dirname(File.dirname(__FILE__))}/sequel_warning.rb"
 
 if ENV['COVERAGE']
   require File.join(File.dirname(File.expand_path(__FILE__)), "../sequel_coverage")

data/spec/integration/type_test.rb

@@ -31,12 +31,6 @@ describe "Supported types" do
     ds.all.must_equal [{:number=>2}]
   end
   
-  it "should support generic fixnum type" do
-    ds = create_items_table_with_column(:number, Fixnum)
-    ds.insert(:number => 2)
-    ds.all.must_equal [{:number=>2}]
-  end
-  
   it "should support generic bignum type" do
     ds = create_items_table_with_column(:number, :Bignum)
     ds.insert(:number => 2**34)
@@ -81,7 +75,7 @@ describe "Supported types" do
     ds.first[:dat].to_s.must_equal d.to_s
   end
   
-  cspecify "should support generic time type", [:do], [:swift], [:odbc], [:jdbc, :mssql], [:jdbc, :sqlite], [:mysql2], [:tinytds], :oracle do
+  cspecify "should support generic time type", [:do], [:swift], [:odbc], [:jdbc, :mssql], [:jdbc, :sqlite], [:mysql2], [:tinytds], :oracle, [:ado] do
     ds = create_items_table_with_column(:tim, Time, :only_time=>true)
     t = Sequel::SQLTime.now
     ds.insert(:tim => t)