sequel 5.24.0 → 5.29.0

data/spec/integration/associations_test.rb

@@ -2131,7 +2131,7 @@ describe "Sequel::Model Simple Associations" do
     a.must_equal [@album, album2]
     a.map(&:artist).must_equal [@artist, @artist]
     a.map(&:artist).map(&:albums).must_equal [[@album, album2], [@album, album2]]
-    a.map(&:artist).map{|a| a.associations[:tags]}.must_equal [[], []]
+    a.map(&:artist).map{|artist| artist.associations[:tags]}.must_equal [[], []]
   end
 
   it "should have remove method raise an error for one_to_many records if the object isn't already associated" do

data/spec/integration/dataset_test.rb

@@ -92,6 +92,17 @@ describe "Simple Dataset operations" do
     @ds.from_self(:alias=>:items).graph(@ds.from_self, {:id=>:id}, :table_alias=>:b).extension(:graph_each).all.must_equal [{:items=>{:id=>1, :number=>10}, :b=>{:id=>1, :number=>10}}]
   end
 
+  cspecify "should have insert and update work with Sequel::DEFAULT", :sqlite do
+    @db.create_table!(:items) do
+      Integer :number, :default=>10
+    end
+    @ds.insert(:number=>Sequel::DEFAULT)
+    @ds.select_map(:number).must_equal [10]
+    @ds.insert(:number=>20)
+    @ds.update(:number=>Sequel::DEFAULT)
+    @ds.select_map(:number).must_equal [10, 10]
+  end
+
   cspecify "should have insert work correctly when inserting a row with all NULL values", :hsqldb do
     @db.create_table!(:items) do
       String :name
@@ -443,6 +454,20 @@ describe Sequel::Dataset do
     @d.extension(:sequel_4_dataset_methods).interval(:value).to_i.must_equal 6
   end
 
+  it "should support or emulate filtered aggregate functions" do
+    @d.insert(:name => 'abc', :value => 123)
+    @d.insert(:name => 'abc', :value => 456)
+    @d.insert(:name => 'def', :value => 324)
+    @d.get{count.function.*.filter{value > 100}}.must_equal 3
+    @d.get{count.function.*.filter{value > 200}}.must_equal 2
+    @d.get{count.function.*.filter{value > 400}}.must_equal 1
+    @d.get{count.function.*.filter{value > 500}}.must_equal 0
+    @d.get{count(:value).filter{value > 100}}.must_equal 3
+    @d.get{count(:value).filter{value > 200}}.must_equal 2
+    @d.get{count(:value).filter{value > 400}}.must_equal 1
+    @d.get{count(:value).filter{value > 500}}.must_equal 0
+  end
+
   it "should return the correct records" do
     @d.to_a.must_equal []
     @d.insert(:name => 'abc', :value => 123)
@@ -568,22 +593,21 @@ describe Sequel::Dataset do
 end
 
 describe "Simple Dataset operations" do
-  before do
+  before(:all) do
     DB.create_table!(:items) do
       Integer :number
       TrueClass :flag
     end
-    @ds = DB[:items]
+    @ds = DB[:items].order(:number)
+    @ds.insert(:number=>1, :flag=>true)
+    @ds.insert(:number=>2, :flag=>false)
+    @ds.insert(:number=>3, :flag=>nil)
   end
-  after do
+  after(:all) do
     DB.drop_table?(:items)
   end
 
   it "should deal with boolean conditions correctly" do
-    @ds.insert(:number=>1, :flag=>true)
-    @ds.insert(:number=>2, :flag=>false)
-    @ds.insert(:number=>3, :flag=>nil)
-    @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]
@@ -591,6 +615,22 @@ describe "Simple Dataset operations" do
     @ds.exclude(:flag=>false).map(:number).must_equal [1, 3]
     @ds.exclude(:flag=>nil).map(:number).must_equal [1, 2]
   end
+
+  cspecify "should deal with boolean equality conditions correctly", :derby do
+    @ds.filter(true=>:flag).map(:number).must_equal [1]
+    @ds.filter(false=>:flag).map(:number).must_equal [2]
+    @ds.filter(nil=>:flag).map(:number).must_equal []
+    @ds.exclude(true=>:flag).map(:number).must_equal [2]
+    @ds.exclude(false=>:flag).map(:number).must_equal [1]
+    @ds.exclude(nil=>:flag).map(:number).must_equal []
+  end
+
+  cspecify "should have exclude_or_null work correctly", :mssql, :derby, :oracle, :db2, :sqlanywhere do
+    @ds = @ds.extension(:exclude_or_null)
+    @ds.exclude_or_null(true=>:flag).map(:number).must_equal [2, 3]
+    @ds.exclude_or_null(false=>:flag).map(:number).must_equal [1, 3]
+    @ds.exclude_or_null(nil=>:flag).map(:number).must_equal [1, 2, 3]
+  end
 end
 
 describe "Simple Dataset operations in transactions" do
@@ -1553,20 +1593,20 @@ describe "Sequel::Dataset DSL support" do
   
   it "should work with endless ranges as hash values" do
     @ds.insert(20, 10)
-    @ds.filter(:a=>eval('30..')).all.must_equal []
-    @ds.filter(:a=>eval('20...')).all.must_equal [{:a=>20, :b=>10}]
-    @ds.filter(:a=>eval('20..')).all.must_equal [{:a=>20, :b=>10}]
-    @ds.filter(:a=>eval('10..')).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(:a=>eval('(30..)')).all.must_equal []
+    @ds.filter(:a=>eval('(20...)')).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(:a=>eval('(20..)')).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(:a=>eval('(10..)')).all.must_equal [{:a=>20, :b=>10}]
   end if RUBY_VERSION >= '2.6'
   
   it "should work with startless ranges as hash values" do
     @ds.insert(20, 10)
-    @ds.filter(:a=>eval('..30')).all.must_equal [{:a=>20, :b=>10}]
-    @ds.filter(:a=>eval('...30')).all.must_equal [{:a=>20, :b=>10}]
-    @ds.filter(:a=>eval('..20')).all.must_equal [{:a=>20, :b=>10}]
-    @ds.filter(:a=>eval('...20')).all.must_equal []
-    @ds.filter(:a=>eval('..10')).all.must_equal []
-    @ds.filter(:a=>eval('...10')).all.must_equal []
+    @ds.filter(:a=>eval('(..30)')).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(:a=>eval('(...30)')).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(:a=>eval('(..20)')).all.must_equal [{:a=>20, :b=>10}]
+    @ds.filter(:a=>eval('(...20)')).all.must_equal []
+    @ds.filter(:a=>eval('(..10)')).all.must_equal []
+    @ds.filter(:a=>eval('(...10)')).all.must_equal []
 
     @ds.filter(:a=>eval('nil..nil')).all.must_equal [{:a=>20, :b=>10}]
   end if RUBY_VERSION >= '2.7'

data/spec/integration/plugin_test.rb

@@ -2393,7 +2393,7 @@ describe "string_agg extension" do
   cspecify "should have string_agg return aggregated concatenation for distinct values", :mssql, :sqlite, :oracle, :db2, :derby 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
+end if (DB.database_type != :postgres || DB.server_version >= 90000)
 
 describe "insert_conflict plugin" do
   before(:all) do

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)

data/spec/integration/spec_helper.rb

@@ -62,4 +62,10 @@ if ENV['SEQUEL_FREEZE_DATABASE']
   DB.freeze
 end
 
-puts "running #{defined?(SEQUEL_ADAPTER_TEST) ? SEQUEL_ADAPTER_TEST : "integration (database type: #{DB.database_type})"} specs on #{RUBY_ENGINE} #{defined?(JRUBY_VERSION) ? JRUBY_VERSION : RUBY_VERSION} with #{DB.adapter_scheme} adapter"
+version = if DB.respond_to?(:server_version)
+  DB.server_version
+elsif DB.respond_to?(:sqlite_version)
+  DB.sqlite_version
+end
+
+puts "running #{defined?(SEQUEL_ADAPTER_TEST) ? SEQUEL_ADAPTER_TEST : "integration (database type: #{DB.database_type})"} specs on #{RUBY_ENGINE} #{defined?(JRUBY_VERSION) ? JRUBY_VERSION : RUBY_VERSION} with #{DB.adapter_scheme} adapter#{" (database version: #{version})" if version}"

data/spec/model/plugins_spec.rb

@@ -326,12 +326,12 @@ describe "Sequel::Plugins.def_sequel_method" do
   it "should define methods using block" do
     m0 = Sequel::Plugins.def_sequel_method(@m, "x", 0){1}
     m0.must_be_kind_of Symbol
-    m0.must_match /\A_sequel_x_\d+\z/
+    m0.must_match(/\A_sequel_x_\d+\z/)
     @scope.send(m0).must_equal 1
 
     m1 = Sequel::Plugins.def_sequel_method(@m, "x", 1){|x| [x, 2]}
     m1.must_be_kind_of Symbol
-    m1.must_match /\A_sequel_x_\d+\z/
+    m1.must_match(/\A_sequel_x_\d+\z/)
     @scope.send(m1, 3).must_equal [3, 2]
   end
 

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'

data/spec/sequel_warning.rb

@@ -1,4 +1,5 @@
 if ENV['WARNING']
   require 'warning'
   Warning.ignore([:missing_ivar, :method_redefined, :not_reached], File.dirname(File.dirname(__FILE__)))
+  Warning.dedup if Warning.respond_to?(:dedup)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.24.0
+  version: 5.29.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2020-02-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
@@ -208,6 +222,11 @@ extra_rdoc_files:
 - 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.27.0.txt
+- doc/release_notes/5.28.0.txt
+- doc/release_notes/5.29.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -303,6 +322,11 @@ files:
 - 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.27.0.txt
+- doc/release_notes/5.28.0.txt
+- doc/release_notes/5.29.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt
 - doc/release_notes/5.5.0.txt
@@ -401,6 +425,7 @@ files:
 - lib/sequel/extensions/_model_constraint_validations.rb
 - lib/sequel/extensions/_model_pg_row.rb
 - lib/sequel/extensions/_pretty_table.rb
+- lib/sequel/extensions/any_not_empty.rb
 - lib/sequel/extensions/arbitrary_servers.rb
 - lib/sequel/extensions/auto_literal_strings.rb
 - lib/sequel/extensions/blank.rb
@@ -421,6 +446,7 @@ files:
 - lib/sequel/extensions/error_sql.rb
 - lib/sequel/extensions/escaped_like.rb
 - lib/sequel/extensions/eval_inspect.rb
+- lib/sequel/extensions/exclude_or_null.rb
 - lib/sequel/extensions/freeze_datasets.rb
 - lib/sequel/extensions/from_block.rb
 - lib/sequel/extensions/graph_each.rb
@@ -490,6 +516,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
@@ -512,6 +539,7 @@ files:
 - lib/sequel/plugins/dirty.rb
 - lib/sequel/plugins/eager_each.rb
 - lib/sequel/plugins/eager_graph_eager.rb
+- lib/sequel/plugins/empty_failure_backtraces.rb
 - lib/sequel/plugins/error_splitter.rb
 - lib/sequel/plugins/finder.rb
 - lib/sequel/plugins/force_encoding.rb
@@ -598,8 +626,10 @@ files:
 - spec/extensions/accessed_columns_spec.rb
 - spec/extensions/active_model_spec.rb
 - spec/extensions/after_initialize_spec.rb
+- spec/extensions/any_not_empty_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
@@ -636,10 +666,12 @@ files:
 - spec/extensions/eager_each_spec.rb
 - spec/extensions/eager_graph_eager_spec.rb
 - spec/extensions/empty_array_consider_nulls_spec.rb
+- spec/extensions/empty_failure_backtraces_spec.rb
 - spec/extensions/error_splitter_spec.rb
 - spec/extensions/error_sql_spec.rb
 - spec/extensions/escaped_like_spec.rb
 - spec/extensions/eval_inspect_spec.rb
+- spec/extensions/exclude_or_null_spec.rb
 - spec/extensions/finder_spec.rb
 - spec/extensions/force_encoding_spec.rb
 - spec/extensions/freeze_datasets_spec.rb
@@ -861,7 +893,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby