sequel 3.25.0 → 3.26.0

data/spec/extensions/identity_map_spec.rb

@@ -13,6 +13,11 @@ describe "Sequel::Plugins::IdentityMap" do
         execute(sql)
         yield h
       end
+      def self.waw_identity_map(&block) # with and without
+        with_identity_map(&block)
+        db.reset
+        yield
+      end
     end
     class ::IdentityMapAlbum < ::IdentityMapModel
       columns :artist_id
@@ -216,4 +221,161 @@ describe "Sequel::Plugins::IdentityMap" do
       MODEL_DB.sqls.length.should == 2
     end
   end
+
+  it "should not override custom :eager_loaders for many_to_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    c = @c2
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>:album_id, :right_key=>:artist_id, :join_table=>:aa, :eager_loader=>(proc do |eo|
+       eo[:rows].each{|object| object.associations[:artists] = [c.load(:id=>object.id)]}
+    end)
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1})
+      yield({:id=>2})
+      yield({:id=>3})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 1
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1)], [@c2.load(:id=>2)], [@c2.load(:id=>3)]]
+      MODEL_DB.sqls.length.should == 1
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>:album_id, :right_key=>:artist_id, :join_table=>:aa
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1})
+      yield({:id=>2})
+      yield({:id=>3})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_x=>1})
+      yield({:id=>1, :x_foreign_key_x=>2})
+      yield({:id=>2, :x_foreign_key_x=>1})
+      yield({:id=>2, :x_foreign_key_x=>2})
+      yield({:id=>3, :x_foreign_key_x=>1})
+      yield({:id=>3, :x_foreign_key_x=>1})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations with composite keys" do
+    @c1.columns :id, :id2
+    @c2.columns :id
+    @c1.set_primary_key :id, :id2
+    @c1.many_to_many :artists, :class=>@c2, :left_key=>[:album_id1, :album_id2], :right_key=>:artist_id, :join_table=>:aa
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :id2=>4})
+      yield({:id=>2, :id2=>5})
+      yield({:id=>3, :id2=>6})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1, :id2=>4), @c1.load(:id=>2, :id2=>5), @c1.load(:id=>3, :id2=>6)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should work correctly when eagerly loading many_through_many associations" do
+    @c1.columns :id
+    @c2.columns :id
+    @c1.plugin :many_through_many
+    @c1.many_through_many :artists, [[:aa, :album_id, :artist_id]], :class=>@c2
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1})
+      yield({:id=>2})
+      yield({:id=>3})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_x=>1})
+      yield({:id=>1, :x_foreign_key_x=>2})
+      yield({:id=>2, :x_foreign_key_x=>1})
+      yield({:id=>2, :x_foreign_key_x=>2})
+      yield({:id=>3, :x_foreign_key_x=>1})
+      yield({:id=>3, :x_foreign_key_x=>1})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1), @c1.load(:id=>2), @c1.load(:id=>3)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
+
+  it "should work correctly when eagerly loading many_to_many associations with composite keys" do
+    @c1.columns :id, :id2
+    @c2.columns :id
+    @c1.set_primary_key :id, :id2
+    @c1.plugin :many_through_many
+    @c1.many_through_many :artists, [[:aa, [:album_id1, :album_id2], :artist_id]], :class=>@c2
+    ds = @c1.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :id2=>4})
+      yield({:id=>2, :id2=>5})
+      yield({:id=>3, :id2=>6})
+    end
+    ds = @c2.dataset
+    def ds.fetch_rows(sql)
+      execute(sql)
+      yield({:id=>1, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>1, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>2, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>2, :x_foreign_key_0_x=>2, :x_foreign_key_1_x=>5})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+      yield({:id=>3, :x_foreign_key_0_x=>1, :x_foreign_key_1_x=>4})
+    end
+
+    @c.waw_identity_map do
+      MODEL_DB.sqls.length.should == 0
+      a = @c1.eager(:artists).all
+      MODEL_DB.sqls.length.should == 2
+      a.should == [@c1.load(:id=>1, :id2=>4), @c1.load(:id=>2, :id2=>5), @c1.load(:id=>3, :id2=>6)]
+      a.map{|x| x.artists}.should == [[@c2.load(:id=>1), @c2.load(:id=>2), @c2.load(:id=>3), @c2.load(:id=>3)], [@c2.load(:id=>1), @c2.load(:id=>2)], []]
+      MODEL_DB.sqls.length.should == 2
+    end
+  end
 end

data/spec/extensions/many_through_many_spec.rb

@@ -558,24 +558,8 @@ describe "Sequel::Plugins::ManyThroughMany eager loading methods" do
   end
   
   it "should cascade eagerly loading when the :eager_graph association option is used" do
-    Tag.dataset.extend(Module.new {
-      def columns
-        [:id]
-      end
-      def fetch_rows(sql)
-        @db << sql
-        yield({:id=>2, :tracks_id=>4, :x_foreign_key_x=>1})
-      end
-    })
     @c1.many_through_many :tags, [[:albums_artists, :artist_id, :album_id], [:albums, :id, :id], [:albums_tags, :album_id, :tag_id]], :eager_graph=>:tracks
-    a = @c1.eager(:tags).all
-    a.should == [@c1.load(:id=>1)]
-    MODEL_DB.sqls.should == ['SELECT * FROM artists',
-      'SELECT tags.id, tracks.id AS tracks_id, albums_artists.artist_id AS x_foreign_key_x FROM (SELECT tags.* FROM tags INNER JOIN albums_tags ON (albums_tags.tag_id = tags.id) INNER JOIN albums ON (albums.id = albums_tags.album_id) INNER JOIN albums_artists ON ((albums_artists.album_id = albums.id) AND (albums_artists.artist_id IN (1)))) AS tags LEFT OUTER JOIN albums_tags AS albums_tags_0 ON (albums_tags_0.tag_id = tags.id) LEFT OUTER JOIN albums ON (albums.id = albums_tags_0.album_id) LEFT OUTER JOIN tracks ON (tracks.album_id = albums.id)']
-    a = a.first
-    a.tags.should == [Tag.load(:id=>2)]
-    a.tags.first.tracks.should == [Track.load(:id=>4)]
-    MODEL_DB.sqls.length.should == 2
+    proc{@c1.eager(:tags).all}.should raise_error(Sequel::Error)
   end
   
   it "should respect :eager_graph when lazily loading an association" do
@@ -782,8 +766,8 @@ describe "Sequel::Plugins::ManyThroughMany eager loading methods" do
     MODEL_DB.sqls.length.should == 1
   end
 
-  it "eager graphing should give you a graph of tables when called without .all" do 
-    @c1.eager_graph(:tags, :artists).first.should == {:artists=>@c1.load(:id=>1), :artists_0=>@c1.load(:id=>10), :tags=>Tag.load(:id=>2)}
+  it "eager graphing should give you a plain hash when called without .all" do 
+    @c1.eager_graph(:tags, :artists).first.should == {:albums_0_id=>3, :artists_0_id=>10, :id=>1, :tags_id=>2}
   end
 
   it "should be able to use eager and eager_graph together" do

data/spec/extensions/xml_serializer_spec.rb

@@ -118,13 +118,13 @@ describe "Sequel::Plugins::XmlSerializer" do
   end
 
   it "should support an :encoding option when serializing" do
-    ["<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><id>2</id><name>YJM</name></artist>",
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:encoding=>'utf-8').gsub(/\n */m, ''))
+    ["<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>",
+     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:encoding=>'UTF-8').gsub(/\n */m, ''))
   end
 
   it "should support a :builder_opts option when serializing" do
-    ["<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><id>2</id><name>YJM</name></artist>",
-     "<?xml version=\"1.0\" encoding=\"utf-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:builder_opts=>{:encoding=>'utf-8'}).gsub(/\n */m, ''))
+    ["<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><id>2</id><name>YJM</name></artist>",
+     "<?xml version=\"1.0\" encoding=\"UTF-8\"?><artist><name>YJM</name><id>2</id></artist>"].should include(@artist.to_xml(:builder_opts=>{:encoding=>'UTF-8'}).gsub(/\n */m, ''))
   end
 
   it "should support an :types option when serializing" do

data/spec/model/eager_loading_spec.rb

@@ -106,6 +106,9 @@ describe Sequel::Model, "#eager" do
       end
     })
   end
+  after do
+    [:EagerAlbum, :EagerBand, :EagerTrack, :EagerGenre, :EagerBandMember].each{|x| Object.send(:remove_const, x)}
+  end
   
   it "should raise an error if called without a symbol or hash" do
     proc{EagerAlbum.eager(Object.new)}.should raise_error(Sequel::Error)
@@ -315,25 +318,8 @@ describe Sequel::Model, "#eager" do
     MODEL_DB.sqls.length.should == 2
   end
   
-  it "should cascade eagerly loading when the :eager_graph association option is used with a many_to_many association" do
-    EagerBandMember.dataset.extend(Module.new {
-      def columns
-        [:id]
-      end
-      def fetch_rows(sql)
-        @db << sql
-        yield({:id=>5, :bands_id=>2, :p_k=>6, :x_foreign_key_x=>2})
-        yield({:id=>5, :bands_id=>3, :p_k=>6, :x_foreign_key_x=>2})
-      end
-    })
-    a = EagerBand.eager(:graph_members).all
-    a.should == [EagerBand.load(:id=>2)]
-    MODEL_DB.sqls.should == ['SELECT * FROM bands', 
-                             'SELECT members.id, bands.id AS bands_id, bands.p_k, bm.band_id AS x_foreign_key_x FROM (SELECT members.* FROM members INNER JOIN bm ON ((bm.member_id = members.id) AND (bm.band_id IN (2)))) AS members LEFT OUTER JOIN bm AS bm_0 ON (bm_0.member_id = members.id) LEFT OUTER JOIN bands ON (bands.id = bm_0.band_id) ORDER BY bands.id']
-    a = a.first
-    a.graph_members.should == [EagerBandMember.load(:id=>5)]
-    a.graph_members.first.bands.should == [EagerBand.load(:id=>2, :p_k=>6), EagerBand.load(:id=>3, :p_k=>6)]
-    MODEL_DB.sqls.length.should == 2
+  it "should raise an Error when eager loading a many_to_many association with the :eager_graph option" do
+    proc{EagerBand.eager(:graph_members).all}.should raise_error(Sequel::Error)
   end
   
   it "should respect :eager_graph when lazily loading an association" do
@@ -1077,13 +1063,13 @@ describe Sequel::Model, "#eager_graph" do
     a.members.first.values.should == {:id => 5}
   end
 
-  it "should give you a graph of tables when called without .all" do 
+  it "should give you a plain hash when called without .all" do 
     ds = GraphAlbum.eager_graph(:band)
     ds.sql.should == 'SELECT albums.id, albums.band_id, band.id AS band_id_0, band.vocalist_id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id)'
     def ds.fetch_rows(sql, &block)
       yield({:id=>1, :band_id=>2, :band_id_0=>2, :vocalist_id=>3})
     end
-    ds.first.should == {:albums=>GraphAlbum.load(:id => 1, :band_id => 2), :band=>GraphBand.load(:id => 2, :vocalist_id=>3)}
+    ds.first.should == {:id=>1, :band_id=>2, :band_id_0=>2, :vocalist_id=>3}
   end
 
   it "should not drop any associated objects if the graph could not be a cartesian product" do

data/spec/model/record_spec.rb

@@ -723,6 +723,29 @@ describe Sequel::Model, "#set" do
     MODEL_DB.sqls.should == []
   end
 
+  it "should raise error if strict_param_setting is true and method does not exist" do
+    @o1.strict_param_setting = true
+    proc{@o1.set('foo' => 1)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise error if strict_param_setting is true and column is a primary key" do
+    @o1.strict_param_setting = true
+    proc{@o1.set('id' => 1)}.should raise_error(Sequel::Error)
+  end
+
+  it "should raise error if strict_param_setting is true and column is restricted" do
+    @o1.strict_param_setting = true
+    @c.set_restricted_columns :x
+    proc{@o1.set('x' => 1)}.should raise_error(Sequel::Error)
+  end
+
+  it "should not create a symbol if strict_param_setting is true and string is given" do
+    @o1.strict_param_setting = true
+    l = Symbol.all_symbols.length
+    proc{@o1.set('sadojafdso' => 1)}.should raise_error(Sequel::Error)
+    Symbol.all_symbols.length.should == l
+  end
+
   it "#set should correctly handle cases where an instance method is added to the class" do
     @o1.set(:x => 1)
     @o1.values.should == {:x => 1}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  hash: 99
+  hash: 111
   prerelease: false
   segments: 
   - 3
-  - 25
+  - 26
   - 0
-  version: 3.25.0
+  version: 3.26.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -07:00
+date: 2011-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,22 +29,22 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - MIT-LICENSE
+- doc/active_record.rdoc
 - doc/advanced_associations.rdoc
+- doc/association_basics.rdoc
 - doc/cheat_sheet.rdoc
+- doc/dataset_basics.rdoc
 - doc/dataset_filtering.rdoc
+- doc/migration.rdoc
+- doc/model_hooks.rdoc
 - doc/opening_databases.rdoc
 - doc/prepared_statements.rdoc
+- doc/querying.rdoc
 - doc/reflection.rdoc
 - doc/sharding.rdoc
 - doc/sql.rdoc
-- doc/virtual_rows.rdoc
-- doc/dataset_basics.rdoc
-- doc/association_basics.rdoc
-- doc/querying.rdoc
-- doc/migration.rdoc
 - doc/validations.rdoc
-- doc/model_hooks.rdoc
-- doc/active_record.rdoc
+- doc/virtual_rows.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -65,14 +65,6 @@ extra_rdoc_files:
 - doc/release_notes/2.9.0.txt
 - doc/release_notes/3.0.0.txt
 - doc/release_notes/3.1.0.txt
-- doc/release_notes/3.2.0.txt
-- doc/release_notes/3.3.0.txt
-- doc/release_notes/3.4.0.txt
-- doc/release_notes/3.5.0.txt
-- doc/release_notes/3.6.0.txt
-- doc/release_notes/3.7.0.txt
-- doc/release_notes/3.8.0.txt
-- doc/release_notes/3.9.0.txt
 - doc/release_notes/3.10.0.txt
 - doc/release_notes/3.11.0.txt
 - doc/release_notes/3.12.0.txt
@@ -83,23 +75,38 @@ extra_rdoc_files:
 - doc/release_notes/3.17.0.txt
 - doc/release_notes/3.18.0.txt
 - doc/release_notes/3.19.0.txt
+- doc/release_notes/3.2.0.txt
 - doc/release_notes/3.20.0.txt
 - doc/release_notes/3.21.0.txt
 - doc/release_notes/3.22.0.txt
 - doc/release_notes/3.23.0.txt
 - doc/release_notes/3.24.0.txt
 - doc/release_notes/3.25.0.txt
+- doc/release_notes/3.3.0.txt
+- doc/release_notes/3.4.0.txt
+- doc/release_notes/3.5.0.txt
+- doc/release_notes/3.6.0.txt
+- doc/release_notes/3.7.0.txt
+- doc/release_notes/3.8.0.txt
+- doc/release_notes/3.9.0.txt
+- doc/release_notes/3.26.0.txt
 files: 
 - MIT-LICENSE
 - CHANGELOG
 - README.rdoc
 - Rakefile
 - bin/sequel
+- doc/active_record.rdoc
 - doc/advanced_associations.rdoc
+- doc/association_basics.rdoc
 - doc/cheat_sheet.rdoc
+- doc/dataset_basics.rdoc
 - doc/dataset_filtering.rdoc
+- doc/migration.rdoc
+- doc/model_hooks.rdoc
 - doc/opening_databases.rdoc
 - doc/prepared_statements.rdoc
+- doc/querying.rdoc
 - doc/reflection.rdoc
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
@@ -121,14 +128,6 @@ files:
 - doc/release_notes/2.9.0.txt
 - doc/release_notes/3.0.0.txt
 - doc/release_notes/3.1.0.txt
-- doc/release_notes/3.2.0.txt
-- doc/release_notes/3.3.0.txt
-- doc/release_notes/3.4.0.txt
-- doc/release_notes/3.5.0.txt
-- doc/release_notes/3.6.0.txt
-- doc/release_notes/3.7.0.txt
-- doc/release_notes/3.8.0.txt
-- doc/release_notes/3.9.0.txt
 - doc/release_notes/3.10.0.txt
 - doc/release_notes/3.11.0.txt
 - doc/release_notes/3.12.0.txt
@@ -139,22 +138,25 @@ files:
 - doc/release_notes/3.17.0.txt
 - doc/release_notes/3.18.0.txt
 - doc/release_notes/3.19.0.txt
+- doc/release_notes/3.2.0.txt
 - doc/release_notes/3.20.0.txt
 - doc/release_notes/3.21.0.txt
 - doc/release_notes/3.22.0.txt
 - doc/release_notes/3.23.0.txt
 - doc/release_notes/3.24.0.txt
 - doc/release_notes/3.25.0.txt
+- doc/release_notes/3.3.0.txt
+- doc/release_notes/3.4.0.txt
+- doc/release_notes/3.5.0.txt
+- doc/release_notes/3.6.0.txt
+- doc/release_notes/3.7.0.txt
+- doc/release_notes/3.8.0.txt
+- doc/release_notes/3.9.0.txt
+- doc/release_notes/3.26.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
-- doc/virtual_rows.rdoc
-- doc/dataset_basics.rdoc
-- doc/association_basics.rdoc
-- doc/querying.rdoc
-- doc/migration.rdoc
 - doc/validations.rdoc
-- doc/model_hooks.rdoc
-- doc/active_record.rdoc
+- doc/virtual_rows.rdoc
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb