sequel 4.13.0 → 4.14.0

data/spec/extensions/pg_array_associations_spec.rb

@@ -399,6 +399,11 @@ describe Sequel::Model, "pg_array_associations" do
     @c2.association_join(:artists).sql.should == "SELECT * FROM tags INNER JOIN artists ON (artists.tag_ids @> ARRAY[tags.id])"
   end
 
+  it "should support custom selects when using association_join" do
+    @c1.select{a(b)}.association_join(:tags).sql.should == "SELECT a(b) FROM artists INNER JOIN tags ON (artists.tag_ids @> ARRAY[tags.id])"
+    @c2.select{a(b)}.association_join(:artists).sql.should == "SELECT a(b) FROM tags INNER JOIN artists ON (artists.tag_ids @> ARRAY[tags.id])"
+  end
+
   it "should eagerly graph associations" do
     @c2.dataset._fetch = {:id=>2, :artists_id=>1, :tag_ids=>Sequel.pg_array([1,2,3])}
     @c1.dataset._fetch = {:id=>1, :tags_id=>2, :tag_ids=>Sequel.pg_array([1,2,3])}

data/spec/extensions/single_table_inheritance_spec.rb

@@ -120,6 +120,29 @@ describe Sequel::Model, "single table inheritance plugin" do
     StiTestSub1A.dataset.sql.should == "SELECT * FROM sti_tests WHERE (sti_tests.kind IN ('StiTestSub1A', 'StiTestSub1B'))"
     StiTestSub1B.dataset.sql.should == "SELECT * FROM sti_tests WHERE (sti_tests.kind IN ('StiTestSub1B'))"
   end
+  
+  it "should work correctly with the :caching plugin" do
+    cache_class = Class.new(Hash) do
+      attr_accessor :ttl
+      def set(k, v, ttl); self[k] = v; @ttl = ttl; end
+      def get(k); self[k]; end
+    end
+    cache = cache_class.new
+
+    StiTest.plugin :caching, cache
+    def StiTest.cache_key_prefix; "stitest" end
+    c2 = Class.new StiTest
+    c2.cache_key(:id).should == StiTest.cache_key(:id)
+
+    obj2 = c2.new
+    obj2.values[:x] = 2
+    obj2.save
+    c2[obj2.id]
+    c2.cache_get_pk(obj2.id).values.should == StiTest.cache_get_pk(obj2.id).values
+    obj2.save
+    c2.cache_get_pk(obj2.id).should == nil
+    StiTest.cache_get_pk(obj2.id).should == nil
+  end
 
   describe "with custom options" do
     before do
@@ -249,6 +272,5 @@ describe Sequel::Model, "single table inheritance plugin" do
       StiTest3.create.kind.should == 'stitest3'
       StiTest4.create.kind.should == 'stitest4'
     end
-
   end
 end

data/spec/integration/plugin_test.rb

@@ -63,9 +63,26 @@ describe "Class Table Inheritance Plugin" do
   end
   
   specify "should lazily load columns in subclass tables" do
+    Employee[@i2][:manager_id].should == nil
+    Employee[@i2].manager_id.should == @i4
+    Employee[@i3][:num_staff].should == nil
+    Employee[@i3].num_staff.should == 7
+    Employee[@i4][:num_staff].should == nil
+    Employee[@i4].num_staff.should == 5
+    Employee[@i4][:num_managers].should == nil
+    Employee[@i4].num_managers.should == 6
+  end
+  
+  specify "should eagerly load columns in subclass tables when retrieving multiple objects" do
     a = Employee.order(:id).all
     a[1][:manager_id].should == nil
     a[1].manager_id.should == @i4
+    a[2][:num_staff].should == nil
+    a[2].num_staff.should == 7
+    a[3][:num_staff].should == 5 # eagerly loaded by previous call
+    a[3].num_staff.should == 5
+    a[3][:num_managers].should == nil
+    a[3].num_managers.should == 6
   end
   
   specify "should include schema for columns for tables for ancestor classes" do

data/spec/model/eager_loading_spec.rb

@@ -1166,6 +1166,14 @@ describe Sequel::Model, "#eager_graph" do
     GraphAlbum.association_join(:genre).sql.should == 'SELECT * FROM albums INNER JOIN ag ON (ag.album_id = albums.id) INNER JOIN genres AS genre ON (genre.id = ag.genre_id)'
   end
   
+  it "should handle custom selects when using association_join" do
+    GraphAlbum.select{a(b)}.association_join(:band).sql.should == 'SELECT a(b) FROM albums INNER JOIN bands AS band ON (band.id = albums.band_id)'
+    GraphAlbum.select{a(b)}.association_join(:track).sql.should == 'SELECT a(b) FROM albums INNER JOIN tracks AS track ON (track.album_id = albums.id)'
+    GraphAlbum.select{a(b)}.association_join(:tracks).sql.should == 'SELECT a(b) FROM albums INNER JOIN tracks ON (tracks.album_id = albums.id)'
+    GraphAlbum.select{a(b)}.association_join(:genres).sql.should == 'SELECT a(b) FROM albums INNER JOIN ag ON (ag.album_id = albums.id) INNER JOIN genres ON (genres.id = ag.genre_id)'
+    GraphAlbum.select{a(b)}.association_join(:genre).sql.should == 'SELECT a(b) FROM albums INNER JOIN ag ON (ag.album_id = albums.id) INNER JOIN genres AS genre ON (genre.id = ag.genre_id)'
+  end
+  
   it "should set up correct join types when using association_*_join" do
     GraphAlbum.association_inner_join(:band).sql.should == 'SELECT * FROM albums INNER JOIN bands AS band ON (band.id = albums.band_id)'
     GraphAlbum.association_left_join(:track).sql.should == 'SELECT * FROM albums LEFT JOIN tracks AS track ON (track.album_id = albums.id)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.14.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -130,6 +130,7 @@ extra_rdoc_files:
 - doc/release_notes/4.11.0.txt
 - doc/release_notes/4.12.0.txt
 - doc/release_notes/4.13.0.txt
+- doc/release_notes/4.14.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -230,6 +231,7 @@ files:
 - doc/release_notes/4.11.0.txt
 - doc/release_notes/4.12.0.txt
 - doc/release_notes/4.13.0.txt
+- doc/release_notes/4.14.0.txt
 - doc/release_notes/4.2.0.txt
 - doc/release_notes/4.3.0.txt
 - doc/release_notes/4.4.0.txt