sequel 5.22.0 → 5.26.0

data/spec/extensions/pg_json_spec.rb

@@ -241,6 +241,18 @@ describe "pg_json extension" do
     Sequel.pg_json_wrap(false).must_equal false
     Sequel.pg_json_wrap(nil).class.must_equal Sequel::Postgres::JSONNull
     Sequel.pg_json_wrap(nil).must_be_nil
+
+    c = Class.new(Hash).new
+    Sequel.pg_json_wrap(c).class.must_equal Sequel::Postgres::JSONHash
+    Sequel.pg_json_wrap(c).must_equal(c)
+
+    c = Class.new(Array).new
+    Sequel.pg_json_wrap(c).class.must_equal Sequel::Postgres::JSONArray
+    Sequel.pg_json_wrap(c).must_equal c
+
+    c = Class.new(String).new('a')
+    Sequel.pg_json_wrap(c).class.must_equal Sequel::Postgres::JSONString
+    Sequel.pg_json_wrap(c).must_equal c
   end
 
   it "Sequel.pg_json_wrap should fail when passed an unsupported object" do

data/spec/extensions/pg_range_spec.rb

@@ -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')
@@ -429,12 +443,12 @@ describe "pg_range extension" do
       @R.new(nil, nil).wont_equal @R.new(nil, nil, :empty=>true)
     end
 
-    it "should only consider empty PGRanges equal if they have the same bounds" do
+    it "should only consider PGRanges equal if they have the same bounds" do
       @R.new(1, 2).must_equal @R.new(1, 2)
       @R.new(1, 2).wont_equal @R.new(1, 3)
     end
 
-    it "should only consider empty PGRanges equal if they have the same bound exclusions" do
+    it "should only consider PGRanges equal if they have the same bound exclusions" do
       @R.new(1, 2, :exclude_begin=>true).must_equal @R.new(1, 2, :exclude_begin=>true)
       @R.new(1, 2, :exclude_end=>true).must_equal @R.new(1, 2, :exclude_end=>true)
       @R.new(1, 2, :exclude_begin=>true).wont_equal @R.new(1, 2, :exclude_end=>true)
@@ -450,6 +464,9 @@ describe "pg_range extension" do
 
     it "should not consider a PGRange equal with a Range if it can't be expressed as a range" do
       @R.new(nil, nil).wont_be :==, (1..2)
+      if startless_range_support
+        @R.new(nil, nil, :exclude_begin=>true).wont_be :==, eval('nil..nil')
+      end
     end
 
     it "should consider PGRanges equal with a 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'
 
@@ -16,6 +16,11 @@ require_relative "../../lib/sequel"
 
 require_relative '../deprecation_helper'
 
+if ENV['SEQUEL_TZINFO_VERSION']
+  # Allow forcing specific TZInfo versions, useful when testing
+  gem 'tzinfo', ENV['SEQUEL_TZINFO_VERSION']
+end
+
 begin
   # Attempt to load ActiveSupport blank extension and inflector first, so Sequel
   # can override them.
@@ -26,7 +31,9 @@ rescue LoadError
   nil
 end
 
-Sequel.extension :core_refinements if RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby'
+if (RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby') || (RUBY_ENGINE == 'jruby' && (JRUBY_VERSION >= '9.3' || (JRUBY_VERSION.match(/\A9\.2\.(\d+)/) && $1.to_i >= 7)))
+  Sequel.extension :core_refinements
+end
 
 class << Sequel::Model
   attr_writer :db_schema

data/spec/extensions/static_cache_cache_spec.rb

@@ -0,0 +1,35 @@
+require_relative "spec_helper"
+
+describe "static_cache_cache plugin" do
+  before do
+    @db = Sequel.mock
+    @db.fetch = [{:id=>1, :name=>'A'}, {:id=>2, :name=>'B'}]
+    @c = Class.new(Sequel::Model(@db[:t]))
+    def @c.name; 'Foo' end
+    @c.columns :id, :name
+    @file = "spec/files/static_cache_cache-spec-#{$$}.cache"
+  end
+  after do
+    File.delete(@file) if File.file?(@file)
+  end
+
+  it "should allow dumping and loading static cache rows from a cache file" do
+    @c.plugin :static_cache_cache, @file
+    @db.sqls
+    @c.plugin :static_cache
+    @db.sqls.must_equal ['SELECT * FROM t']
+    @c.all.must_equal [@c.load(:id=>1, :name=>'A'), @c.load(:id=>2, :name=>'B')]
+
+    @c.dump_static_cache_cache
+
+    @db.fetch = []
+    c = Class.new(Sequel::Model(@db[:t]))
+    def c.name; 'Foo' end
+    c.columns :id, :name
+    @c.plugin :static_cache_cache, @file
+    @db.sqls
+    @c.plugin :static_cache
+    @db.sqls.must_be_empty
+    @c.all.must_equal [@c.load(:id=>1, :name=>'A'), @c.load(:id=>2, :name=>'B')]
+  end
+end

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'
 

data/spec/integration/plugin_test.rb

@@ -2394,3 +2394,30 @@ describe "string_agg extension" do
     @ds.select_group(:id).select_append(Sequel.string_agg(:s).order(:s).distinct.as(:v)).map([:id, :v]).must_equal [[1, 'a,b,c'], [2, 'aa,bb']]
   end
 end
+
+describe "insert_conflict plugin" do
+  before(:all) do
+    @db = DB
+    @db.create_table!(:ic_test) do
+      primary_key :id
+      String :s, :unique=>true
+      Integer :o
+    end
+    @model = Class.new(Sequel::Model)
+    @model.set_dataset @db[:ic_test]
+    @model.plugin :insert_conflict
+  end
+  after(:all) do
+    @db.drop_table?(:ic_test)
+  end
+
+  it "should allow Model#insert_conflict to work" do
+    ic_opts = {:target=>:s, :update => {:o => Sequel[:excluded][:o]}}
+    @model.new(:s=>'A', :o=>1).insert_conflict(ic_opts).save
+    @model.select_order_map([:s, :o]).must_equal [['A', 1]]
+    @model.new(:s=>'A', :o=>2).insert_conflict(ic_opts).save
+    @model.select_order_map([:s, :o]).must_equal [['A', 2]]
+    @model.new(:s=>'B', :o=>3).insert_conflict(ic_opts).save
+    @model.select_order_map([:s, :o]).must_equal [['A', 2], ['B', 3]]
+  end
+end if (DB.database_type == :postgres && DB.server_version >= 90500) || (DB.database_type == :sqlite && DB.sqlite_version >= 32400)

data/spec/integration/schema_test.rb

@@ -634,6 +634,15 @@ describe "Database schema modifiers" do
     @ds.all.must_equal [{:id=>10}, {:id=>20}]
   end
 
+  it "should set column defaults correctly if column has existing default" do
+    @db.create_table!(:items){Integer :id, :default=>10}
+    @ds.insert
+    @ds.all.must_equal [{:id=>10}]
+    @db.alter_table(:items){set_column_default :id, 20}
+    @ds.insert
+    @ds.all.must_equal [{:id=>10}, {:id=>20}]
+  end
+
   it "should set column defaults to nil correctly" do
     @db.create_table!(:items){Integer :id}
     @ds.insert(:id=>10)
@@ -750,10 +759,15 @@ describe "Database schema modifiers" do
     @db.create_table!(:items) do
       primary_key :id
       Integer :i, :default=>20
+      Integer :j, :default=>10
+      String :s, :default=>'a'
     end
-    @ds.insert(:i=>10)
+    @ds.insert(:i=>10, :j=>20, :s=>'b')
     @db.drop_column(:items, :i)
-    @db.schema(:items, :reload=>true).map{|x| x.first}.must_equal [:id]
+    @db.schema(:items, :reload=>true).map{|x| x.first}.must_equal [:id, :j, :s]
+    @ds.first.must_equal(:id=>1, :j=>20, :s=>'b')
+    @ds.insert
+    @ds.first(:id=>2).must_equal(:id=>2, :j=>10, :s=>'a')
   end
 
   it "should remove foreign key columns from tables correctly" do

data/spec/model/spec_helper.rb

@@ -7,7 +7,7 @@ Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line
 
 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_relative '../deprecation_helper'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.22.0
+  version: 5.26.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-global_expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-shared_description
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,10 @@ extra_rdoc_files:
 - doc/release_notes/5.20.0.txt
 - doc/release_notes/5.21.0.txt
 - doc/release_notes/5.22.0.txt
+- doc/release_notes/5.23.0.txt
+- doc/release_notes/5.24.0.txt
+- doc/release_notes/5.25.0.txt
+- doc/release_notes/5.26.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -299,6 +317,10 @@ files:
 - doc/release_notes/5.20.0.txt
 - doc/release_notes/5.21.0.txt
 - doc/release_notes/5.22.0.txt
+- doc/release_notes/5.23.0.txt
+- doc/release_notes/5.24.0.txt
+- doc/release_notes/5.25.0.txt
+- doc/release_notes/5.26.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt
 - doc/release_notes/5.5.0.txt
@@ -486,6 +508,7 @@ files:
 - lib/sequel/plugins/active_model.rb
 - lib/sequel/plugins/after_initialize.rb
 - lib/sequel/plugins/association_dependencies.rb
+- lib/sequel/plugins/association_multi_add_remove.rb
 - lib/sequel/plugins/association_pks.rb
 - lib/sequel/plugins/association_proxies.rb
 - lib/sequel/plugins/auto_validations.rb
@@ -513,6 +536,7 @@ files:
 - lib/sequel/plugins/force_encoding.rb
 - lib/sequel/plugins/hook_class_methods.rb
 - lib/sequel/plugins/input_transformer.rb
+- lib/sequel/plugins/insert_conflict.rb
 - lib/sequel/plugins/insert_returning_select.rb
 - lib/sequel/plugins/instance_filters.rb
 - lib/sequel/plugins/instance_hooks.rb
@@ -539,6 +563,7 @@ files:
 - lib/sequel/plugins/skip_create_refresh.rb
 - lib/sequel/plugins/split_values.rb
 - lib/sequel/plugins/static_cache.rb
+- lib/sequel/plugins/static_cache_cache.rb
 - lib/sequel/plugins/string_stripper.rb
 - lib/sequel/plugins/subclasses.rb
 - lib/sequel/plugins/subset_conditions.rb
@@ -594,6 +619,7 @@ files:
 - spec/extensions/after_initialize_spec.rb
 - spec/extensions/arbitrary_servers_spec.rb
 - spec/extensions/association_dependencies_spec.rb
+- spec/extensions/association_multi_add_remove_spec.rb
 - spec/extensions/association_pks_spec.rb
 - spec/extensions/association_proxies_spec.rb
 - spec/extensions/auto_literal_strings_spec.rb
@@ -644,6 +670,7 @@ files:
 - spec/extensions/index_caching_spec.rb
 - spec/extensions/inflector_spec.rb
 - spec/extensions/input_transformer_spec.rb
+- spec/extensions/insert_conflict_spec.rb
 - spec/extensions/insert_returning_select_spec.rb
 - spec/extensions/instance_filters_spec.rb
 - spec/extensions/instance_hooks_spec.rb
@@ -708,6 +735,7 @@ files:
 - spec/extensions/split_values_spec.rb
 - spec/extensions/sql_comments_spec.rb
 - spec/extensions/sql_expr_spec.rb
+- spec/extensions/static_cache_cache_spec.rb
 - spec/extensions/static_cache_spec.rb
 - spec/extensions/string_agg_spec.rb
 - spec/extensions/string_date_time_spec.rb