sequel 5.24.0 → 5.29.0

data/spec/extensions/caller_logging_spec.rb

@@ -42,7 +42,7 @@ describe "caller_logging extension" do
 
   it "should not log caller information if all callers lines are filtered" do
     @db.caller_logging_ignore = /./
-    exec_sql("SELECT * FROM items"); line = __LINE__
+    exec_sql("SELECT * FROM items")
     @log_stream.rewind
     lines = @log_stream.read.split("\n")
     lines.length.must_equal 1

data/spec/extensions/dirty_spec.rb

@@ -162,6 +162,39 @@ describe "Sequel::Plugins::Dirty" do
       @o.save
       @o.column_changes.must_equal({})
     end
+
+    it "should work with the typecast_on_load plugin" do
+      @c.instance_variable_set(:@db_schema, :initial=>{:type=>:integer})
+      @c.plugin :typecast_on_load, :initial
+      
+      @o = @c.call(:initial=>'1')
+      @o.column_changes.must_equal({})
+      @o.save
+      @o.previous_changes.must_equal({})
+    end
+
+    it "should have column_changes work with the typecast_on_load in after hooks" do
+      @c.instance_variable_set(:@db_schema, :initial=>{:type=>:integer})
+      @c.plugin :typecast_on_load, :initial
+      
+      @o = @c.new
+      @o.initial = 1
+      @o.column_changes.must_equal({:initial=>[nil, 1]})
+      column_changes_in_after_save = nil
+      @o.define_singleton_method(:after_save) do
+        column_changes_in_after_save = column_changes
+        super()
+      end
+      @db.fetch = {:initial=>1}
+      @o.save
+      column_changes_in_after_save.must_equal({:initial=>[nil, 1]})
+
+      @o.initial = 2
+      @o.column_changes.must_equal({:initial=>[1, 2]})
+      @o.save
+      column_changes_in_after_save.must_equal({:initial=>[1, 2]})
+      @o.previous_changes.must_equal({:initial=>[1, 2]})
+    end
   end
 
   describe "with existing instance" do

data/spec/extensions/empty_failure_backtraces_spec.rb

@@ -0,0 +1,60 @@
+require_relative "spec_helper"
+
+describe "empty_failure_backtraces plugin" do
+  before do
+    @c = Class.new(Sequel::Model(:items)) do
+      plugin :empty_failure_backtraces
+      columns :x
+      set_primary_key :x
+      unrestrict_primary_key
+      def before_create
+        super
+        cancel_action 'bc' if x == 2
+      end
+      def before_destroy
+        super
+        cancel_action 'bd' if x == 2
+      end
+      def validate
+        super
+        errors.add(:x, "3") if x == 3
+      end
+    end
+    DB.reset
+  end
+  
+  it "should work normally if no exceptions are thrown/raised" do
+    o = @c.create(:x=>1)
+    o.must_be_kind_of @c
+    o.valid?.must_equal true
+    o.destroy.must_equal o
+  end
+
+  it "should work normally when not rescuing exceptions internally when calling save" do
+    @c.new.set(:x => 2).save(:raise_on_failure=>false).must_be_nil
+    @c.raise_on_save_failure = false
+    @c.create(:x => 2).must_be_nil
+    @c.load(:x => 2).destroy(:raise_on_failure=>false).must_be_nil
+  end
+    
+  it "should work normally when not rescuing exceptions internally when calling valid?" do
+    @c.send(:define_method, :before_validation){cancel_action "bv"}
+    @c.new(:x => 2).valid?.must_equal false
+  end
+
+  it "should raise exceptions with empty backtraces" do
+    begin
+      @c.create(:x => 2)
+    rescue Sequel::HookFailed => e 
+      e.backtrace.must_be_empty
+      1
+    end.must_equal 1
+
+    begin
+      @c.create(:x => 3)
+    rescue Sequel::ValidationFailed => e 
+      e.backtrace.must_be_empty
+      1
+    end.must_equal 1
+  end
+end

data/spec/extensions/exclude_or_null_spec.rb

@@ -0,0 +1,15 @@
+require_relative "spec_helper"
+
+describe "exclude_or_null extension" do
+  before do
+    @ds = Sequel.mock[:t].extension(:exclude_or_null)
+  end
+
+  it "should add condition where a is false or NULL" do
+    @ds.exclude_or_null(:a).sql.must_equal "SELECT * FROM t WHERE NOT coalesce(a, 'f')"
+  end
+
+  it "should not effect normal exclude" do
+    @ds.exclude(:a).sql.must_equal "SELECT * FROM t WHERE NOT a"
+  end
+end

data/spec/extensions/json_serializer_spec.rb

@@ -187,6 +187,16 @@ describe "Sequel::Plugins::JsonSerializer" do
     Album.array_from_json(Album.dataset.to_json(:only=>:name)).must_equal [Album.load(:name=>@album.name)]
   end
 
+  it "should support setting json_serializer_opts for datasets" do
+    Album.dataset = Album.dataset.with_fetch(:id=>1, :name=>'RF', :artist_id=>2)
+    Album.array_from_json(Album.dataset.json_serializer_opts(:only=>:name).to_json).must_equal [Album.load(:name=>@album.name)]
+    Album.plugin :json_serializer, :only=>:id
+    Album.array_from_json(Album.dataset.json_serializer_opts(:only=>:name).to_json).must_equal [Album.load(:name=>@album.name)]
+    Album.array_from_json(Album.dataset.json_serializer_opts(:only=>:name).to_json(:only=>:artist_id)).must_equal [Album.load(:artist_id=>2)]
+    json = Album.dataset.json_serializer_opts(:only=>:name, :root=>true).to_json(:only=>:artist_id)
+    Album.array_from_json(JSON.parse(json)['albums'].to_json).must_equal [Album.load(:artist_id=>2)]
+  end
+
   it "should have dataset to_json method work with eager_graph datasets" do
     ds = Album.dataset.eager_graph(:artist).with_fetch(:id=>1, :name=>'RF', :artist_id=>2, :artist_id_0=>2, :artist_name=>'YM')
     Sequel.parse_json(ds.to_json(:only=>:name, :include=>{:artist=>{:only=>:name}})).must_equal [{"name"=>"RF", "artist"=>{"name"=>"YM"}}]

data/spec/extensions/named_timezones_spec.rb

@@ -158,12 +158,12 @@ describe "Sequel named_timezones extension with Time class" do
     dt = Sequel.database_to_application_timestamp('2009-06-01 06:20:30-0400')
     dt.must_be_instance_of Time
     dt.must_equal Time.new(2009,6,1,3,20,30,-25200)
-    dt.utc_offset.must_equal -25200
+    dt.utc_offset.must_equal(-25200)
     
     dt = Sequel.database_to_application_timestamp('2009-06-01 10:20:30+0000')
     dt.must_be_instance_of Time
     dt.must_equal Time.new(2009,6,1,3,20,30,-25200)
-    dt.utc_offset.must_equal -25200
+    dt.utc_offset.must_equal(-25200)
   end
     
   it "should raise an error for ambiguous timezones by default" do
@@ -175,19 +175,19 @@ describe "Sequel named_timezones extension with Time class" do
     Sequel.database_to_application_timestamp('2004-10-31T01:30:00').must_equal Time.new(2004, 10, 30, 22, 30, 0, -25200)
     dt = Sequel.database_to_application_timestamp('2004-10-31T01:30:00')
     dt.must_equal Time.new(2004, 10, 30, 22, 30, 0, -25200)
-    dt.utc_offset.must_equal -25200
+    dt.utc_offset.must_equal(-25200)
   end
 
   it "should assume datetimes coming out of the database that don't have an offset as coming from database_timezone" do
     dt = Sequel.database_to_application_timestamp('2009-06-01 06:20:30')
     dt.must_be_instance_of Time
     dt.must_equal Time.new(2009,6,1,3,20,30, -25200)
-    dt.utc_offset.must_equal -25200
+    dt.utc_offset.must_equal(-25200)
     
     dt = Sequel.database_to_application_timestamp('2009-06-01 10:20:30')
     dt.must_be_instance_of Time
     dt.must_equal Time.new(2009,6,1,7,20,30, -25200)
-    dt.utc_offset.must_equal -25200
+    dt.utc_offset.must_equal(-25200)
   end
   
   it "should work with the thread_local_timezones extension" do

data/spec/extensions/nested_attributes_spec.rb

@@ -492,6 +492,54 @@ describe "NestedAttributes plugin" do
     @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 10)"]
   end
 
+  it "should raise a NoExistingObject error if object to be updated no longer exists, if the :require_modification=>true option is used" do
+    @Artist.nested_attributes :albums, :require_modification=>true, :destroy=>true
+    al = @Album.load(:id=>10, :name=>'Al')
+    ar = @Artist.load(:id=>20, :name=>'Ar')
+    ar.associations[:albums] = [al]
+    ar.set(:albums_attributes=>[{:id=>10, :name=>'L'}])
+    @db.sqls.must_equal []
+    @db.numrows = [1, 0]
+    proc{ar.save}.must_raise Sequel::NoExistingObject
+    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 20)", "UPDATE albums SET name = 'L' WHERE (id = 10)"]
+  end
+
+  it "should not raise an Error if object to be updated no longer exists, if the :require_modification=>false option is used" do
+    @Artist.nested_attributes :albums, :require_modification=>false, :destroy=>true
+    al = @Album.load(:id=>10, :name=>'Al')
+    ar = @Artist.load(:id=>20, :name=>'Ar')
+    ar.associations[:albums] = [al]
+    ar.set(:albums_attributes=>[{:id=>10, :name=>'L'}])
+    @db.sqls.must_equal []
+    @db.numrows = [1, 0]
+    ar.save
+    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 20)", "UPDATE albums SET name = 'L' WHERE (id = 10)"]
+  end
+
+  it "should raise a NoExistingObject error if object to be deleted no longer exists, if the :require_modification=>true option is used" do
+    @Artist.nested_attributes :albums, :require_modification=>true, :destroy=>true
+    al = @Album.load(:id=>10, :name=>'Al')
+    ar = @Artist.load(:id=>20, :name=>'Ar')
+    ar.associations[:albums] = [al]
+    ar.set(:albums_attributes=>[{:id=>10, :_delete=>'t'}])
+    @db.sqls.must_equal []
+    @db.numrows = [1, 0]
+    proc{ar.save}.must_raise Sequel::NoExistingObject
+    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 20)", "DELETE FROM albums WHERE (id = 10)"]
+  end
+
+  it "should not raise an Error if object to be deleted no longer exists, if the :require_modification=>false option is used" do
+    @Artist.nested_attributes :albums, :require_modification=>false, :destroy=>true
+    al = @Album.load(:id=>10, :name=>'Al')
+    ar = @Artist.load(:id=>20, :name=>'Ar')
+    ar.associations[:albums] = [al]
+    ar.set(:albums_attributes=>[{:id=>10, :_delete=>'t'}])
+    @db.sqls.must_equal []
+    @db.numrows = [1, 0]
+    ar.save
+    @db.sqls.must_equal ["UPDATE artists SET name = 'Ar' WHERE (id = 20)", "DELETE FROM albums WHERE (id = 10)"]
+  end
+
   it "should not attempt to validate nested attributes twice for one_to_many associations when creating them" do
     @Artist.nested_attributes :albums
     validated = []

data/spec/extensions/pg_array_ops_spec.rb

@@ -83,9 +83,9 @@ describe "Sequel::Postgres::ArrayOp" do
   end
 
   it "#to_string/join should use the array_to_string function" do
-    @db.literal(@a.to_string).must_equal "array_to_string(a, '', NULL)"
-    @db.literal(@a.join).must_equal "array_to_string(a, '', NULL)"
-    @db.literal(@a.join(':')).must_equal "array_to_string(a, ':', NULL)"
+    @db.literal(@a.to_string).must_equal "array_to_string(a, '')"
+    @db.literal(@a.join).must_equal "array_to_string(a, '')"
+    @db.literal(@a.join(':')).must_equal "array_to_string(a, ':')"
     @db.literal(@a.join(':', '*')).must_equal "array_to_string(a, ':', '*')"
   end
 

data/spec/extensions/pg_json_ops_spec.rb

@@ -286,4 +286,71 @@ describe "Sequel::Postgres::JSONOp" do
   it "should allow transforming JSONBHash instances into ArrayOp instances" do
     @db.literal(Sequel.pg_jsonb('a'=>1).op['a']).must_equal "('{\"a\":1}'::jsonb -> 'a')"
   end
+
+  it "#path_exists should use the @? operator" do
+    @l[@jb.path_exists('$')].must_equal "(j @? '$')"
+  end
+
+  it "#path_exists result should be a boolean expression" do
+    @jb.path_exists('$').must_be_kind_of Sequel::SQL::BooleanExpression
+  end
+
+  it "#path_match should use the @@ operator" do
+    @l[@jb.path_match('$')].must_equal "(j @@ '$')"
+  end
+
+  it "#path_match result should be a boolean expression" do
+    @jb.path_match('$').must_be_kind_of Sequel::SQL::BooleanExpression
+  end
+
+  it "#path_exists! should use the jsonb_path_exists function" do
+    @l[@jb.path_exists!('$')].must_equal "jsonb_path_exists(j, '$')"
+    @l[@jb.path_exists!('$', '{"x":2}')].must_equal "jsonb_path_exists(j, '$', '{\"x\":2}')"
+    @l[@jb.path_exists!('$', x: 2)].must_equal "jsonb_path_exists(j, '$', '{\"x\":2}')"
+    @l[@jb.path_exists!('$', {x: 2}, true)].must_equal "jsonb_path_exists(j, '$', '{\"x\":2}', true)"
+  end
+
+  it "#path_exists! result should be a boolean expression" do
+    @jb.path_exists!('$').must_be_kind_of Sequel::SQL::BooleanExpression
+  end
+
+  it "#path_match! should use the jsonb_path_match function" do
+    @l[@jb.path_match!('$')].must_equal "jsonb_path_match(j, '$')"
+    @l[@jb.path_match!('$', '{"x":2}')].must_equal "jsonb_path_match(j, '$', '{\"x\":2}')"
+    @l[@jb.path_match!('$', x: 2)].must_equal "jsonb_path_match(j, '$', '{\"x\":2}')"
+    @l[@jb.path_match!('$', {x: 2}, true)].must_equal "jsonb_path_match(j, '$', '{\"x\":2}', true)"
+  end
+
+  it "#path_match! result should be a boolean expression" do
+    @jb.path_match!('$').must_be_kind_of Sequel::SQL::BooleanExpression
+  end
+
+  it "#path_query should use the jsonb_path_query function" do
+    @l[@jb.path_query('$')].must_equal "jsonb_path_query(j, '$')"
+    @l[@jb.path_query('$', '{"x":2}')].must_equal "jsonb_path_query(j, '$', '{\"x\":2}')"
+    @l[@jb.path_query('$', x: 2)].must_equal "jsonb_path_query(j, '$', '{\"x\":2}')"
+    @l[@jb.path_query('$', {x: 2}, true)].must_equal "jsonb_path_query(j, '$', '{\"x\":2}', true)"
+  end
+
+  it "#path_query_array should use the jsonb_path_query_array function" do
+    @l[@jb.path_query_array('$')].must_equal "jsonb_path_query_array(j, '$')"
+    @l[@jb.path_query_array('$', '{"x":2}')].must_equal "jsonb_path_query_array(j, '$', '{\"x\":2}')"
+    @l[@jb.path_query_array('$', x: 2)].must_equal "jsonb_path_query_array(j, '$', '{\"x\":2}')"
+    @l[@jb.path_query_array('$', {x: 2}, true)].must_equal "jsonb_path_query_array(j, '$', '{\"x\":2}', true)"
+  end
+
+  it "#path_query_array result should be a JSONBOp" do
+    @l[@jb.path_query_array('$').path_query_array('$')].must_equal "jsonb_path_query_array(jsonb_path_query_array(j, '$'), '$')"
+  end
+
+  it "#path_query_first should use the jsonb_path_query_first function" do
+    @l[@jb.path_query_first('$')].must_equal "jsonb_path_query_first(j, '$')"
+    @l[@jb.path_query_first('$', '{"x":2}')].must_equal "jsonb_path_query_first(j, '$', '{\"x\":2}')"
+    @l[@jb.path_query_first('$', x: 2)].must_equal "jsonb_path_query_first(j, '$', '{\"x\":2}')"
+    @l[@jb.path_query_first('$', {x: 2}, true)].must_equal "jsonb_path_query_first(j, '$', '{\"x\":2}', true)"
+  end
+
+  it "#path_query_first result should be a JSONBOp" do
+    @l[@jb.path_query_first('$').path_query_first('$')].must_equal "jsonb_path_query_first(jsonb_path_query_first(j, '$'), '$')"
+  end
 end

data/spec/extensions/pg_range_spec.rb

@@ -52,13 +52,13 @@ describe "pg_range extension" do
   end
 
   it "should literalize endless Range instances to strings correctly" do
-    @db.literal(eval('1..')).must_equal "'[1,]'"
-    @db.literal(eval('1...')).must_equal "'[1,)'"
+    @db.literal(eval('(1..)')).must_equal "'[1,]'"
+    @db.literal(eval('(1...)')).must_equal "'[1,)'"
   end if endless_range_support
 
   it "should literalize startless Range instances to strings correctly" do
-    @db.literal(eval('..1')).must_equal "'[,1]'"
-    @db.literal(eval('...1')).must_equal "'[,1)'"
+    @db.literal(eval('(..1)')).must_equal "'[,1]'"
+    @db.literal(eval('(...1)')).must_equal "'[,1)'"
   end if startless_range_support
 
   it "should literalize startless, endless Range instances to strings correctly" do
@@ -90,13 +90,13 @@ describe "pg_range extension" do
   end
 
   it "should support using endless Range instances as bound variables" do
-    @db.bound_variable_arg(eval('1..'), nil).must_equal "[1,]"
-    @db.bound_variable_arg(eval('1...'), nil).must_equal "[1,)"
+    @db.bound_variable_arg(eval('(1..)'), nil).must_equal "[1,]"
+    @db.bound_variable_arg(eval('(1...)'), nil).must_equal "[1,)"
   end if endless_range_support
 
   it "should support using startless Range instances as bound variables" do
-    @db.bound_variable_arg(eval('..1'), nil).must_equal "[,1]"
-    @db.bound_variable_arg(eval('...1'), nil).must_equal "[,1)"
+    @db.bound_variable_arg(eval('(..1)'), nil).must_equal "[,1]"
+    @db.bound_variable_arg(eval('(...1)'), nil).must_equal "[,1)"
   end if startless_range_support
 
   it "should support using startless, endless Range instances as bound variables" do
@@ -113,7 +113,7 @@ describe "pg_range extension" do
   end
 
   it "should support using arrays of endless Range instances as bound variables" do
-    @db.bound_variable_arg([eval('1..'), eval('2..')], nil).must_equal '{"[1,]","[2,]"}'
+    @db.bound_variable_arg([eval('(1..)'), eval('(2..)')], nil).must_equal '{"[1,]","[2,]"}'
   end if endless_range_support
 
   it "should support using PGRange instances as bound variables" do
@@ -136,6 +136,20 @@ describe "pg_range extension" do
     s[1][1][:ruby_default].must_equal Sequel::Postgres::PGRange.new(1, 5, :exclude_end=>true, :db_type=>'int4range')
   end
 
+  it "should work correctly in hashes" do
+    h = Hash.new(1)
+    h[@R.new(1, 2)] = 2
+    h[@R.new(nil, nil, :empty => true)] = 3
+    h[@R.new(1, 2)].must_equal 2
+    h[@R.new(1, 3)].must_equal 1
+    h[@R.new(2, 2)].must_equal 1
+    h[@R.new(1, 2, :exclude_begin => true)].must_equal 1
+    h[@R.new(1, 2, :exclude_end => true)].must_equal 1
+    h[@R.new(1, 2, :db_type => :int)].must_equal 1
+    h[@R.new(nil, nil, :empty => true)].must_equal 3
+    h[@R.new(nil, nil, :empty => true, :db_type => :int)].must_equal 1
+  end
+
   describe "database typecasting" do
     before do
       @o = @R.new(1, 2, :db_type=>'int4range')
@@ -456,21 +470,21 @@ describe "pg_range extension" do
     end
 
     it "should consider PGRanges equal with a endless Range they represent" do
-      @R.new(1, nil).must_be :==, eval('1..')
-      @R.new(1, nil, :exclude_end=>true).must_be :==, eval('1...')
-      @R.new(1, nil).wont_be :==, eval('1...')
-      @R.new(1, nil, :exclude_end=>true).wont_be :==, eval('1..')
-      @R.new(1, nil).wont_be :==, eval('2..')
-      @R.new(1, nil, :exclude_end=>true).wont_be :==, eval('2...')
+      @R.new(1, nil).must_be :==, eval('(1..)')
+      @R.new(1, nil, :exclude_end=>true).must_be :==, eval('(1...)')
+      @R.new(1, nil).wont_be :==, eval('(1...)')
+      @R.new(1, nil, :exclude_end=>true).wont_be :==, eval('(1..)')
+      @R.new(1, nil).wont_be :==, eval('(2..)')
+      @R.new(1, nil, :exclude_end=>true).wont_be :==, eval('(2...)')
     end if endless_range_support
 
     it "should consider PGRanges equal with a startless Range they represent" do
-      @R.new(nil, 1).must_be :==, eval('..1')
-      @R.new(nil, 1, :exclude_end=>true).must_be :==, eval('...1')
-      @R.new(nil, 1).wont_be :==, eval('...1')
-      @R.new(nil, 1, :exclude_end=>true).wont_be :==, eval('..1')
-      @R.new(nil, 1).wont_be :==, eval('..2')
-      @R.new(nil, 1, :exclude_end=>true).wont_be :==, eval('...2')
+      @R.new(nil, 1).must_be :==, eval('(..1)')
+      @R.new(nil, 1, :exclude_end=>true).must_be :==, eval('(...1)')
+      @R.new(nil, 1).wont_be :==, eval('(...1)')
+      @R.new(nil, 1, :exclude_end=>true).wont_be :==, eval('(..1)')
+      @R.new(nil, 1).wont_be :==, eval('(..2)')
+      @R.new(nil, 1, :exclude_end=>true).wont_be :==, eval('(...2)')
     end if startless_range_support
 
     it "should consider PGRanges equal with a startless, endless Range they represent" do

data/spec/extensions/sharding_spec.rb

@@ -186,4 +186,12 @@ describe "sharding plugin" do
     ["UPDATE albums SET artist_id = 2, name = 'RF' WHERE (id = 1) -- s1", "UPDATE albums SET name = 'RF', artist_id = 2 WHERE (id = 1) -- s1"].must_include(sqls.slice!(2))
     sqls.must_equal ["SELECT * FROM albums LIMIT 1 -- s2", "BEGIN -- s1", "COMMIT -- s1"]
   end 
+
+  it "should have objects retrieved from a specific shard using with_server from server_block extension" do
+    album = @db.extension(:server_block).with_server(:s1) do
+      @Album.first
+    end
+    album.update(:name=>'MO')
+    @db.sqls.must_equal ["SELECT * FROM albums LIMIT 1 -- s1", "UPDATE albums SET name = 'MO' WHERE (id = 1) -- s1"]
+  end 
 end

data/spec/extensions/spec_helper.rb

@@ -7,7 +7,7 @@ end
 
 ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
 gem 'minitest'
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'minitest/hooks/default'
 require 'minitest/shared_description'
 

data/spec/guards_helper.rb

@@ -1,6 +1,6 @@
 ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
 gem 'minitest'
-require 'minitest/autorun'
+require 'minitest/global_expectations/autorun'
 require 'minitest/hooks/default'
 require 'minitest/shared_description'