sequel 5.9.0 → 5.10.0

data/spec/extensions/spec_helper.rb

@@ -5,6 +5,7 @@ if ENV['COVERAGE']
   SimpleCov.sequel_coverage(:filter=>%r{lib/sequel/(extensions|plugins)/\w+\.rb\z})
 end
 
+ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'

data/spec/extensions/tree_spec.rb

@@ -115,6 +115,46 @@ describe Sequel::Model, "tree plugin" do
       "SELECT * FROM nodes WHERE (nodes.parent_id = 1)"]
   end
 
+  it "should have methods work correctly with custom association names" do
+    o = klass(:primary_key=>:i, :key=>:pi, :order=>:name, :children=>{:name=>:cs}, :parent=>{:name=>:p}).load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
+    
+    o.model.parent_association_name.must_equal :p
+    o.model.children_association_name.must_equal :cs
+    o.model.dataset = o.model.dataset.with_fetch(lambda do |sql|
+      case sql
+      when "SELECT * FROM nodes WHERE (nodes.i = 4) ORDER BY name LIMIT 1"
+        {:id=>7, :parent_id=>8, :name=>'r2', :i=>4, :pi=>5}
+      when "SELECT * FROM nodes WHERE (nodes.i = 5) ORDER BY name LIMIT 1"
+        {:id=>10, :parent_id=>11, :name=>'r3', :i=>5, :pi=>nil}
+      when 'SELECT * FROM nodes WHERE (nodes.pi = 3) ORDER BY name'
+        {:id=>12, :parent_id=>13, :name=>'r4', :i=>7, :pi=>3}
+      when 'SELECT * FROM nodes WHERE (nodes.pi = 7) ORDER BY name'
+        {:id=>14, :parent_id=>15, :name=>'r5', :i=>8, :pi=>7}
+      when 'SELECT * FROM nodes WHERE (nodes.pi = 8) ORDER BY name'
+        []
+      when 'SELECT * FROM nodes WHERE (nodes.pi = 4) ORDER BY name'
+        [{:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4}, {:id=>20, :parent_id=>21, :name=>'r6', :i=>9, :pi=>4}]
+      else
+        raise sql
+      end
+    end)
+    o.db.sqls.must_equal []
+
+    o.ancestors.must_equal [o.model.load(:id=>7, :parent_id=>8, :name=>'r2', :i=>4, :pi=>5),
+      o.model.load(:id=>10, :parent_id=>11, :name=>'r3', :i=>5, :pi=>nil)]
+    o.db.sqls.must_equal ["SELECT * FROM nodes WHERE (nodes.i = 4) ORDER BY name LIMIT 1",
+      "SELECT * FROM nodes WHERE (nodes.i = 5) ORDER BY name LIMIT 1"]
+
+    o.descendants.must_equal [o.model.load(:id=>12, :parent_id=>13, :name=>'r4', :i=>7, :pi=>3),
+      o.model.load(:id=>14, :parent_id=>15, :name=>'r5', :i=>8, :pi=>7)]
+    o.db.sqls.must_equal ["SELECT * FROM nodes WHERE (nodes.pi = 3) ORDER BY name",
+      "SELECT * FROM nodes WHERE (nodes.pi = 7) ORDER BY name",
+      "SELECT * FROM nodes WHERE (nodes.pi = 8) ORDER BY name"]
+
+    o.siblings.must_equal [o.model.load(:id=>20, :parent_id=>21, :name=>'r6', :i=>9, :pi=>4)] 
+    o.db.sqls.must_equal ["SELECT * FROM nodes WHERE (nodes.pi = 4) ORDER BY name"]
+  end
+
   describe ":single_root option" do
     before do
       @c = klass(:single_root => true)

data/spec/guards_helper.rb

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

data/spec/model/associations_spec.rb

@@ -4149,6 +4149,11 @@ describe "Sequel::Model Associations with clashing column names" do
     @db.sqls.must_equal ["SELECT foos.id, foos.object_id, mtmbars.id AS mtmbars_id, mtmbars.object_id AS mtmbars_object_id FROM foos LEFT OUTER JOIN bars_foos ON (bars_foos.foo_id = foos.object_id) LEFT OUTER JOIN bars AS mtmbars ON (mtmbars.object_id = bars_foos.object_id)"]
   end
 
+  it "should not have filter by associations code break if using IN/NOT in with a set-returning function" do
+    @Bar.where(Sequel::SQL::BooleanExpression.new(:IN, :foo, Sequel.function(:srf))).sql.must_equal 'SELECT * FROM bars WHERE (foo IN srf())'
+    @Bar.exclude(Sequel::SQL::BooleanExpression.new(:IN, :foo, Sequel.function(:srf))).sql.must_equal 'SELECT * FROM bars WHERE (foo NOT IN srf())'
+  end
+
   it "should have working filter by associations with model instances" do
     @Bar.first(:foo=>@foo).must_equal @bar
     @db.sqls.must_equal ["SELECT * FROM bars WHERE (bars.object_id = 2) LIMIT 1"]
@@ -4435,6 +4440,22 @@ describe "association autoreloading" do
     DB.reset
   end
 
+  it "should not reload many_to_one association when foreign key is not modified" do
+    album = @Album.load(:id => 1, :name=>'Al', :artist_id=>1)
+    album.artist
+    DB.sqls.must_equal ['SELECT * FROM artists WHERE id = 1']
+    album.artist_id = 1
+    album.artist
+    DB.sqls.must_equal []
+
+    album = @Album.new(:name=>'Al', :artist_id=>1)
+    album.artist
+    DB.sqls.must_equal ['SELECT * FROM artists WHERE id = 1']
+    album.artist_id = 1
+    album.artist
+    DB.sqls.must_equal []
+  end
+
   it "should reload many_to_one association when foreign key is modified" do
     album = @Album.load(:id => 1, :name=>'Al', :artist_id=>2)
     album.artist

data/spec/model/spec_helper.rb

@@ -5,6 +5,7 @@ require_relative "../../lib/sequel"
 
 Sequel::Deprecation.backtrace_filter = lambda{|line, lineno| lineno < 4 || line =~ /_spec\.rb/}
 
+ENV['MT_NO_PLUGINS'] = '1' # Work around stupid autoloading of plugins
 gem 'minitest'
 require 'minitest/autorun'
 require 'minitest/hooks/default'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.9.0
+  version: 5.10.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-01 00:00:00.000000000 Z
+date: 2018-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -193,6 +193,7 @@ extra_rdoc_files:
 - doc/release_notes/5.8.0.txt
 - doc/release_notes/5.7.0.txt
 - doc/release_notes/5.9.0.txt
+- doc/release_notes/5.10.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -272,6 +273,7 @@ files:
 - doc/release_notes/4.9.0.txt
 - doc/release_notes/5.0.0.txt
 - doc/release_notes/5.1.0.txt
+- doc/release_notes/5.10.0.txt
 - doc/release_notes/5.2.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt