sequel 5.11.0 → 5.12.0

data/spec/integration/associations_test.rb

@@ -1688,6 +1688,40 @@ BasicRegularAndCompositeKeyAssociations = shared_description do
     a.first.albums.must_equal [@album]
     a.first.albums.first.artist.must_equal @artist
   end
+
+  it "should be able to eager_graph dependent eager associations using eager callback" do
+    @album.update(:artist => @artist)
+    @album.add_tag(@tag)
+    
+    a = Artist.eager(:albums=>proc{|ds| ds.eager_graph(:tags, :alias_tags).unordered}).eager(:first_album).all
+    a.must_equal [@artist]
+    a.first.albums.must_equal [@album]
+    a.first.first_album.must_equal @album
+    a.first.albums.first.tags.must_equal [@tag]
+    a.first.albums.first.alias_tags.must_equal [@tag]
+    
+    a = Tag.eager(:albums=>proc{|ds| ds.eager_graph(:artist).unordered}).all
+    a.must_equal [@tag]
+    a.first.albums.must_equal [@album]
+    a.first.albums.first.artist.must_equal @artist
+  end
+
+  it "should be able to eager dependent eager_graph associations using eager_graph_eager" do
+    @album.update(:artist => @artist)
+    @album.add_tag(@tag)
+    
+    a = Artist.eager_graph(:albums, :first_album).eager_graph_eager([:albums], :tags, :alias_tags).all
+    a.must_equal [@artist]
+    a.first.albums.must_equal [@album]
+    a.first.first_album.must_equal @album
+    a.first.albums.first.tags.must_equal [@tag]
+    a.first.albums.first.alias_tags.must_equal [@tag]
+    
+    a = Tag.eager_graph(:albums).eager_graph_eager([:albums], :artist).all
+    a.must_equal [@tag]
+    a.first.albums.must_equal [@album]
+    a.first.albums.first.artist.must_equal @artist
+  end
 end
 
 RegularAndCompositeKeyAssociations = shared_description do
@@ -1766,10 +1800,20 @@ RegularAndCompositeKeyAssociations = shared_description do
     a.first.artist.must_equal @artist
     a.first.artist.tags.must_equal [@tag]
     
+    a = Album.eager(:artist=>proc{|ds| ds.eager_graph(:tags)}).all
+    a.must_equal [@album]
+    a.first.artist.must_equal @artist
+    a.first.artist.tags.must_equal [@tag]
+    
     a = Album.eager_graph(:artist=>:tags).all
     a.must_equal [@album]
     a.first.artist.must_equal @artist
     a.first.artist.tags.must_equal [@tag]
+
+    a = Album.eager_graph(:artist).eager_graph_eager([:artist], :tags).all
+    a.must_equal [@album]
+    a.first.artist.must_equal @artist
+    a.first.artist.tags.must_equal [@tag]
   end
 
   it "should work with a one_through_many association" do
@@ -1795,10 +1839,20 @@ RegularAndCompositeKeyAssociations = shared_description do
     a.first.artist.must_equal @artist
     a.first.artist.first_tag.must_equal @tag
     
+    a = Album.eager(:artist=>proc{|ds| ds.eager_graph(:first_tag)}).all
+    a.must_equal [@album]
+    a.first.artist.must_equal @artist
+    a.first.artist.first_tag.must_equal @tag
+    
     a = Album.eager_graph(:artist=>:first_tag).all
     a.must_equal [@album]
     a.first.artist.must_equal @artist
     a.first.artist.first_tag.must_equal @tag
+    
+    a = Album.eager_graph(:artist).eager_graph_eager([:artist], :first_tag).all
+    a.must_equal [@album]
+    a.first.artist.must_equal @artist
+    a.first.artist.first_tag.must_equal @tag
   end
 end
 
@@ -1828,6 +1882,7 @@ describe "Sequel::Model Simple Associations" do
     [:albums_tags, :tags, :albums, :artists].each{|t| @db[t].delete}
     class ::Artist < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       one_to_many :albums, :order=>:name
       one_to_one :first_album, :clone=>:albums
       one_to_one :second_album, :clone=>:albums, :limit=>[nil, 1]
@@ -1852,6 +1907,7 @@ describe "Sequel::Model Simple Associations" do
     end
     class ::Album < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       many_to_one :artist, :reciprocal=>nil
       many_to_one :a_artist, :clone=>:artist, :conditions=>{:name=>'Ar'}, :key=>:artist_id
       many_to_many :tags, :right_key=>:tag_id
@@ -1872,6 +1928,7 @@ describe "Sequel::Model Simple Associations" do
     end
     class ::Tag < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       many_to_many :albums
       plugin :many_through_many
       many_through_many :tags, [[:albums_tags, :tag_id, :album_id], [:albums, :id, :artist_id], [:albums, :artist_id, :id], [:albums_tags, :album_id, :tag_id]], :class=>:Tag
@@ -2069,6 +2126,12 @@ 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 = Album.eager_graph(:artist=>:albums).eager_graph_eager([:artist], :tags).order{[albums[:id], albums_0[:id]]}.all
+    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 [[], []]
   end
 
   it "should have remove method raise an error for one_to_many records if the object isn't already associated" do
@@ -2129,6 +2192,7 @@ describe "Sequel::Model Composite Key Associations" do
     [:albums_tags, :tags, :albums, :artists].each{|t| @db[t].delete}
     class ::Artist < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       set_primary_key [:id1, :id2]
       unrestrict_primary_key
       one_to_many :albums, :key=>[:artist_id1, :artist_id2], :order=>:name
@@ -2155,6 +2219,7 @@ describe "Sequel::Model Composite Key Associations" do
     end
     class ::Album < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       set_primary_key [:id1, :id2]
       unrestrict_primary_key
       many_to_one :artist, :key=>[:artist_id1, :artist_id2], :reciprocal=>nil
@@ -2177,6 +2242,7 @@ describe "Sequel::Model Composite Key Associations" do
     end
     class ::Tag < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       set_primary_key [:id1, :id2]
       unrestrict_primary_key
       many_to_many :albums, :right_key=>[:album_id1, :album_id2], :left_key=>[:tag_id1, :tag_id2]
@@ -2286,6 +2352,7 @@ describe "Sequel::Model pg_array_to_many" do
     [:tags, :albums, :artists].each{|t| @db[t].delete}
     class ::Artist < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       one_to_many :albums, :order=>:name
       one_to_one :first_album, :clone=>:albums
       one_to_many :a_albums, :clone=>:albums do |ds| ds.where(:name=>'Al') end
@@ -2294,6 +2361,7 @@ describe "Sequel::Model pg_array_to_many" do
     class ::Album < Sequel::Model(@db)
       plugin :dataset_associations
       plugin :pg_array_associations
+      plugin :eager_graph_eager
       many_to_one :artist, :reciprocal=>nil
       many_to_one :a_artist, :clone=>:artist, :key=>:artist_id do |ds| ds.where(:name=>'Ar') end
       pg_array_to_many :tags, :key=>:tag_ids, :save_after_modify=>true
@@ -2308,6 +2376,7 @@ describe "Sequel::Model pg_array_to_many" do
     class ::Tag < Sequel::Model(@db)
       plugin :dataset_associations
       plugin :pg_array_associations
+      plugin :eager_graph_eager
       many_to_pg_array :albums
     end
     @album = Album.create(:name=>'Al')
@@ -2367,6 +2436,7 @@ describe "Sequel::Model many_to_pg_array" do
     [:tags, :albums, :artists].each{|t| @db[t].delete}
     class ::Artist < Sequel::Model(@db)
       plugin :dataset_associations
+      plugin :eager_graph_eager
       one_to_many :albums, :order=>:name
       one_to_one :first_album, :class=>:Album, :order=>:name
       one_to_many :a_albums, :clone=>:albums do |ds| ds.where(:name=>'Al') end
@@ -2375,6 +2445,7 @@ describe "Sequel::Model many_to_pg_array" do
     class ::Album < Sequel::Model(@db)
       plugin :dataset_associations
       plugin :pg_array_associations
+      plugin :eager_graph_eager
       many_to_one :artist, :reciprocal=>nil
       many_to_one :a_artist, :clone=>:artist, :key=>:artist_id do |ds| ds.where(:name=>'Ar') end
       many_to_pg_array :tags
@@ -2389,6 +2460,7 @@ describe "Sequel::Model many_to_pg_array" do
     class ::Tag < Sequel::Model(@db)
       plugin :dataset_associations
       plugin :pg_array_associations
+      plugin :eager_graph_eager
       pg_array_to_many :albums, :save_after_modify=>true
     end
     @album = Album.create(:name=>'Al')

data/spec/integration/dataset_test.rb

@@ -928,11 +928,11 @@ if DB.dataset.supports_window_functions?
     it "should give correct results for aggregate window functions with groups" do
       @ds.select(:id){sum(:amount).over(:partition=>:group_id, :order=>:id, :frame=>:groups).as(:sum)}.all.
         must_equal [{:sum=>1, :id=>1}, {:sum=>11, :id=>2}, {:sum=>111, :id=>3}, {:sum=>1000, :id=>4}, {:sum=>11000, :id=>5}, {:sum=>111000, :id=>6}]
-      @ds.select(:id){sum(:amount).over(:partition=>:group_id, :frame=>:groups).as(:sum)}.all.
-        must_equal [{:sum=>111, :id=>1}, {:sum=>111, :id=>2}, {:sum=>111, :id=>3}, {:sum=>111000, :id=>4}, {:sum=>111000, :id=>5}, {:sum=>111000, :id=>6}]
+      @ds.select(:id){sum(:amount).over(:order=>:group_id, :frame=>:groups).as(:sum)}.all.
+        must_equal [{:sum=>111, :id=>1}, {:sum=>111, :id=>2}, {:sum=>111, :id=>3}, {:sum=>111111, :id=>4}, {:sum=>111111, :id=>5}, {:sum=>111111, :id=>6}]
     end if DB.dataset.supports_window_function_frame_option?(:groups)
 
-   if DB.dataset.supports_window_function_frame_option?(:offset)
+    if DB.dataset.supports_window_function_frame_option?(:offset)
       it "should give correct results for aggregate window functions with offsets for ROWS" do
         @ds.select(:id){sum(:amount).over(:order=>:id, :frame=>{:type=>:rows, :start=>1}).as(:sum)}.all.
           must_equal [{:sum=>1, :id=>1}, {:sum=>11, :id=>2}, {:sum=>110, :id=>3}, {:sum=>1100, :id=>4}, {:sum=>11000, :id=>5}, {:sum=>110000, :id=>6}]

data/spec/model/eager_loading_spec.rb

@@ -1225,6 +1225,96 @@ describe Sequel::Model, "#eager" do
     DB.sqls.must_equal []
   end
 
+  it "should support eager load of many_to_one with eager_graph of many_to_one in custom callback" do
+    a = EagerTrack.eager(:album=>proc{|ds| ds.eager_graph(:band).with_fetch(:id=>1, :band_id=>2, :band_id_0=>2)}).all
+    a.must_equal [EagerTrack.load(:id => 3, :album_id => 1)]
+    DB.sqls.must_equal ["SELECT * FROM tracks",
+      "SELECT albums.id, albums.band_id, band.id AS band_id_0 FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id) WHERE (albums.id IN (1))"]
+    a = a.first
+    a.album.must_equal EagerAlbum.load(:id => 1, :band_id => 2)
+    a.album.band.must_equal EagerBand.load(:id => 2)
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager load of many_to_one with eager_graph of one_to_many in custom callback" do
+    a = EagerTrack.eager(:album=>proc{|ds| ds.eager_graph(:tracks).with_fetch(:id=>1, :band_id=>2, :tracks_id=>3)}).all
+    a.must_equal [EagerTrack.load(:id => 3, :album_id => 1)]
+    DB.sqls.must_equal ["SELECT * FROM tracks",
+      "SELECT albums.id, albums.band_id, tracks.id AS tracks_id FROM albums LEFT OUTER JOIN tracks ON (tracks.album_id = albums.id) WHERE (albums.id IN (1))"]
+    a = a.first
+    a.album.must_equal EagerAlbum.load(:id => 1, :band_id => 2)
+    a.album.tracks.must_equal [EagerTrack.load(:id=>3)]
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager load of many_to_one with eager_graph of many_to_many in custom callback" do
+    a = EagerTrack.eager(:album=>proc{|ds| ds.eager_graph(:genres).with_fetch(:id=>1, :band_id=>2, :genres_id=>4)}).all
+    a.must_equal [EagerTrack.load(:id => 3, :album_id => 1)]
+    DB.sqls.must_equal ["SELECT * FROM tracks",
+      "SELECT albums.id, albums.band_id, genres.id AS genres_id FROM albums LEFT OUTER JOIN ag ON (ag.album_id = albums.id) LEFT OUTER JOIN genres ON (genres.id = ag.genre_id) WHERE (albums.id IN (1))"]
+    a = a.first
+    a.album.must_equal EagerAlbum.load(:id => 1, :band_id => 2)
+    a.album.genres.must_equal [EagerGenre.load(:id=>4)]
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager load of many_to_many with eager_graph of many_to_one in custom callback" do
+    a = EagerGenre.eager(:albums=>proc{|ds| ds.columns(:id, :band_id, :x_foreign_key_x).eager_graph(:band).with_fetch(:id=>1, :band_id=>2, :x_foreign_key_x=>4, :band_id_0=>2)}).all
+    a.must_equal [EagerGenre.load(:id => 4)]
+    DB.sqls.must_equal ["SELECT * FROM genres",
+      "SELECT albums.id, albums.band_id, albums.x_foreign_key_x, band.id AS band_id_0 FROM (SELECT albums.*, ag.genre_id AS x_foreign_key_x FROM albums INNER JOIN ag ON (ag.album_id = albums.id) WHERE (ag.genre_id IN (4))) AS albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id)"]
+    a = a.first
+    a.albums.must_equal [EagerAlbum.load(:id => 1, :band_id => 2)]
+    a.albums.first.band.must_equal EagerBand.load(:id=>2)
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager load of many_to_many with eager_graph of one_to_many in custom callback" do
+    a = EagerGenre.eager(:albums=>proc{|ds| ds.columns(:id, :band_id, :x_foreign_key_x).eager_graph(:tracks).with_fetch(:id=>1, :band_id=>2, :x_foreign_key_x=>4, :tracks_id=>5)}).all
+    a.must_equal [EagerGenre.load(:id => 4)]
+    DB.sqls.must_equal ["SELECT * FROM genres",
+      "SELECT albums.id, albums.band_id, albums.x_foreign_key_x, tracks.id AS tracks_id FROM (SELECT albums.*, ag.genre_id AS x_foreign_key_x FROM albums INNER JOIN ag ON (ag.album_id = albums.id) WHERE (ag.genre_id IN (4))) AS albums LEFT OUTER JOIN tracks ON (tracks.album_id = albums.id)"]
+    a = a.first
+    a.albums.must_equal [EagerAlbum.load(:id => 1, :band_id => 2)]
+    a.albums.first.tracks.must_equal [EagerTrack.load(:id=>5)]
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager load of many_to_many with eager_graph of many_to_many in custom callback" do
+    a = EagerGenre.eager(:albums=>proc{|ds| ds.columns(:id, :band_id, :x_foreign_key_x).eager_graph(:genres).with_fetch(:id=>1, :band_id=>2, :x_foreign_key_x=>4, :genres_id=>4)}).all
+    a.must_equal [EagerGenre.load(:id => 4)]
+    DB.sqls.must_equal ["SELECT * FROM genres",
+      "SELECT albums.id, albums.band_id, albums.x_foreign_key_x, genres.id AS genres_id FROM (SELECT albums.*, ag.genre_id AS x_foreign_key_x FROM albums INNER JOIN ag ON (ag.album_id = albums.id) WHERE (ag.genre_id IN (4))) AS albums LEFT OUTER JOIN ag AS ag_0 ON (ag_0.album_id = albums.id) LEFT OUTER JOIN genres ON (genres.id = ag_0.genre_id)"]
+    a = a.first
+    a.albums.must_equal [EagerAlbum.load(:id => 1, :band_id => 2)]
+    a.albums.first.genres.must_equal [EagerGenre.load(:id=>4)]
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager_graph usage with cascaded associations in custom callback" do
+    a = EagerTrack.eager(:album=>proc{|ds| ds.eager_graph(:band=>:members).with_fetch(:id=>1, :band_id=>2, :band_id_0=>2, :members_id=>5)}).all
+    a.must_equal [EagerTrack.load(:id => 3, :album_id => 1)]
+    DB.sqls.must_equal ["SELECT * FROM tracks",
+      "SELECT albums.id, albums.band_id, band.id AS band_id_0, members.id AS members_id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id) LEFT OUTER JOIN bm ON (bm.band_id = band.id) LEFT OUTER JOIN members ON (members.id = bm.member_id) WHERE (albums.id IN (1))"]
+    a = a.first
+    a.album.must_equal EagerAlbum.load(:id => 1, :band_id => 2)
+    a.album.band.must_equal EagerBand.load(:id => 2)
+    a.album.band.members.must_equal [EagerBandMember.load(:id => 5)]
+    DB.sqls.must_equal []
+  end
+
+  it "should support eager_graph usage in custom callback with dependencies" do
+    a = EagerTrack.eager(:album=>{proc{|ds| ds.eager_graph(:band).with_fetch(:id=>1, :band_id=>2, :band_id_0=>2)}=>:genre}).all
+    a.must_equal [EagerTrack.load(:id => 3, :album_id => 1)]
+    DB.sqls.must_equal ["SELECT * FROM tracks",
+      "SELECT albums.id, albums.band_id, band.id AS band_id_0 FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id) WHERE (albums.id IN (1))",
+      "SELECT genres.*, ag.album_id AS x_foreign_key_x FROM genres INNER JOIN ag ON (ag.genre_id = genres.id) WHERE (ag.album_id IN (1))"]
+    a = a.first
+    a.album.must_equal EagerAlbum.load(:id => 1, :band_id => 2)
+    a.album.band.must_equal EagerBand.load(:id => 2)
+    a.album.genre.must_equal EagerGenre.load(:id => 4)
+    DB.sqls.must_equal []
+  end
 end
 
 describe Sequel::Model, "#eager_graph" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.11.0
+  version: 5.12.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -195,6 +195,7 @@ extra_rdoc_files:
 - doc/release_notes/5.9.0.txt
 - doc/release_notes/5.10.0.txt
 - doc/release_notes/5.11.0.txt
+- doc/release_notes/5.12.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -276,6 +277,7 @@ files:
 - doc/release_notes/5.1.0.txt
 - doc/release_notes/5.10.0.txt
 - doc/release_notes/5.11.0.txt
+- doc/release_notes/5.12.0.txt
 - doc/release_notes/5.2.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt
@@ -378,6 +380,7 @@ files:
 - lib/sequel/extensions/arbitrary_servers.rb
 - lib/sequel/extensions/auto_literal_strings.rb
 - lib/sequel/extensions/blank.rb
+- lib/sequel/extensions/caller_logging.rb
 - lib/sequel/extensions/columns_introspection.rb
 - lib/sequel/extensions/connection_expiration.rb
 - lib/sequel/extensions/connection_validator.rb
@@ -483,6 +486,7 @@ files:
 - lib/sequel/plugins/delay_add_association.rb
 - lib/sequel/plugins/dirty.rb
 - lib/sequel/plugins/eager_each.rb
+- lib/sequel/plugins/eager_graph_eager.rb
 - lib/sequel/plugins/error_splitter.rb
 - lib/sequel/plugins/finder.rb
 - lib/sequel/plugins/force_encoding.rb
@@ -577,6 +581,7 @@ files:
 - spec/extensions/boolean_readers_spec.rb
 - spec/extensions/boolean_subsets_spec.rb
 - spec/extensions/caching_spec.rb
+- spec/extensions/caller_logging_spec.rb
 - spec/extensions/class_table_inheritance_spec.rb
 - spec/extensions/column_conflicts_spec.rb
 - spec/extensions/column_select_spec.rb
@@ -600,6 +605,7 @@ files:
 - spec/extensions/dirty_spec.rb
 - spec/extensions/duplicate_columns_handler_spec.rb
 - spec/extensions/eager_each_spec.rb
+- spec/extensions/eager_graph_eager_spec.rb
 - spec/extensions/empty_array_consider_nulls_spec.rb
 - spec/extensions/error_splitter_spec.rb
 - spec/extensions/error_sql_spec.rb