sequel 3.4.0 → 3.5.0

data/spec/model/base_spec.rb

@@ -350,6 +350,8 @@ describe Sequel::Model, ".[] optimization" do
     @c.simple_pk.should == nil
     @c.set_primary_key :b, :a
     @c.simple_pk.should == nil
+    @c.set_primary_key [:b, :a]
+    @c.simple_pk.should == nil
   end
 
   it "should have simple table set if passed a Symbol to set_dataset" do

data/spec/model/eager_loading_spec.rb

@@ -314,7 +314,7 @@ describe Sequel::Model, "#eager" do
     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 members INNER JOIN bm ON ((bm.member_id = members.id) AND (bm.band_id IN (2))) 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']
+                             '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)]
@@ -363,7 +363,7 @@ describe Sequel::Model, "#eager" do
     })
     a = EagerBand.load(:id=>2)
     a.graph_members.should == [EagerBandMember.load(:id=>5)]
-    MODEL_DB.sqls.should == ['SELECT members.id, bands.id AS bands_id, bands.p_k FROM members INNER JOIN bm ON ((bm.member_id = members.id) AND (bm.band_id = 2)) 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']
+    MODEL_DB.sqls.should == ['SELECT members.id, bands.id AS bands_id, bands.p_k FROM (SELECT members.* FROM members INNER JOIN bm ON ((bm.member_id = members.id) AND (bm.band_id = 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.graph_members.first.bands.should == [EagerBand.load(:id=>2, :p_k=>6), EagerBand.load(:id=>3, :p_k=>6)]
     MODEL_DB.sqls.length.should == 1
   end
@@ -504,7 +504,50 @@ describe Sequel::Model, "#eager" do
     as.length.should == 1
     as.first.special_tracks.should == [EagerTrack.load(:album_id=>2, :id=>1)]
   end
+  
+  it "should respect the many_to_one association's composite keys" do
+    EagerAlbum.many_to_one :special_band, :class=>:EagerBand, :primary_key=>[:id, :p_k], :key=>[:band_id, :id]
+    EagerBand.dataset.extend(Module.new {
+      def fetch_rows(sql)
+        MODEL_DB.sqls << sql
+        yield({:p_k=>1, :id=>2})
+      end
+    })
+    as = EagerAlbum.eager(:special_band).all
+    MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT * FROM bands WHERE ((bands.id, bands.p_k) IN ((2, 1)))"]
+    as.length.should == 1
+    as.first.special_band.should == EagerBand.load(:p_k=>1, :id=>2)
+  end
+  
+  it "should respect the one_to_many association's composite keys" do
+    EagerAlbum.one_to_many :special_tracks, :class=>:EagerTrack, :primary_key=>[:band_id, :id], :key=>[:id, :album_id]
+    EagerTrack.dataset.extend(Module.new {
+      def fetch_rows(sql)
+        MODEL_DB.sqls << sql
+        yield({:album_id=>1, :id=>2})
+      end
+    })
+    as = EagerAlbum.eager(:special_tracks).all
+    MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT * FROM tracks WHERE ((tracks.id, tracks.album_id) IN ((2, 1)))"]
+    as.length.should == 1
+    as.first.special_tracks.should == [EagerTrack.load(:album_id=>1, :id=>2)]
+  end
 
+  it "should respect many_to_many association's composite keys" do
+    EagerAlbum.many_to_many :special_genres, :class=>:EagerGenre, :left_primary_key=>[:band_id, :id], :left_key=>[:l1, :l2], :right_primary_key=>[:xxx, :id], :right_key=>[:r1, :r2], :join_table=>:ag
+    EagerGenre.dataset.extend(Module.new {
+      def fetch_rows(sql)
+        MODEL_DB.sqls << sql
+        yield({:x_foreign_key_0_x=>2, :x_foreign_key_1_x=>1, :id=>5})
+        yield({:x_foreign_key_0_x=>2, :x_foreign_key_1_x=>1, :id=>6})
+      end
+    })
+    as = EagerAlbum.eager(:special_genres).all
+    MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT genres.*, ag.l1 AS x_foreign_key_0_x, ag.l2 AS x_foreign_key_1_x FROM genres INNER JOIN ag ON ((ag.r1 = genres.xxx) AND (ag.r2 = genres.id) AND ((ag.l1, ag.l2) IN ((2, 1))))"]
+    as.length.should == 1
+    as.first.special_genres.should == [EagerGenre.load(:id=>5), EagerGenre.load(:id=>6)]
+  end
+  
   it "should respect many_to_many association's :left_primary_key and :right_primary_key options" do
     EagerAlbum.many_to_many :special_genres, :class=>:EagerGenre, :left_primary_key=>:band_id, :left_key=>:album_id, :right_primary_key=>:xxx, :right_key=>:genre_id, :join_table=>:ag
     EagerGenre.dataset.extend(Module.new {
@@ -1059,6 +1102,43 @@ describe Sequel::Model, "#eager_graph" do
     as.should == [GraphAlbum.load(:id=>3, :band_id=>2)]
     as.first.right_tracks.should == [GraphTrack.load(:id=>5, :album_id=>2), GraphTrack.load(:id=>6, :album_id=>2)]
   end
+  
+  it "should respect many_to_one association's composite keys" do 
+    GraphAlbum.many_to_one :inner_band, :class=>'GraphBand', :key=>[:band_id, :id], :primary_key=>[:vocalist_id, :id]
+    ds = GraphAlbum.eager_graph(:inner_band)
+    ds.sql.should == 'SELECT albums.id, albums.band_id, inner_band.id AS inner_band_id, inner_band.vocalist_id FROM albums LEFT OUTER JOIN bands AS inner_band ON ((inner_band.vocalist_id = albums.band_id) AND (inner_band.id = albums.id))'
+    def ds.fetch_rows(sql, &block)
+      yield({:id=>3, :band_id=>2, :inner_band_id=>3, :vocalist_id=>2})
+    end
+    as = ds.all
+    as.should == [GraphAlbum.load(:id=>3, :band_id=>2)]
+    as.first.inner_band.should == GraphBand.load(:id=>3, :vocalist_id=>2)
+  end
+
+  it "should respect one_to_many association's composite keys" do 
+    GraphAlbum.one_to_many :right_tracks, :class=>'GraphTrack', :key=>[:album_id, :id], :primary_key=>[:band_id, :id]
+    ds = GraphAlbum.eager_graph(:right_tracks)
+    ds.sql.should == 'SELECT albums.id, albums.band_id, right_tracks.id AS right_tracks_id, right_tracks.album_id FROM albums LEFT OUTER JOIN tracks AS right_tracks ON ((right_tracks.album_id = albums.band_id) AND (right_tracks.id = albums.id))'
+    def ds.fetch_rows(sql, &block)
+      yield({:id=>3, :band_id=>2, :right_tracks_id=>3, :album_id=>2})
+    end
+    as = ds.all
+    as.should == [GraphAlbum.load(:id=>3, :band_id=>2)]
+    as.first.right_tracks.should == [GraphTrack.load(:id=>3, :album_id=>2)]
+  end
+  
+  it "should respect many_to_many association's composite keys" do 
+    GraphAlbum.many_to_many :sbands, :class=>'GraphBand', :left_key=>[:l1, :l2], :left_primary_key=>[:band_id, :id], :right_key=>[:r1, :r2], :right_primary_key=>[:vocalist_id, :id], :join_table=>:b
+    ds = GraphAlbum.eager_graph(:sbands)
+    ds.sql.should == 'SELECT albums.id, albums.band_id, sbands.id AS sbands_id, sbands.vocalist_id FROM albums LEFT OUTER JOIN b ON ((b.l1 = albums.band_id) AND (b.l2 = albums.id)) LEFT OUTER JOIN bands AS sbands ON ((sbands.vocalist_id = b.r1) AND (sbands.id = b.r2))'
+    def ds.fetch_rows(sql, &block)
+      yield({:id=>3, :band_id=>2, :sbands_id=>5, :vocalist_id=>6})
+      yield({:id=>3, :band_id=>2, :sbands_id=>6, :vocalist_id=>22})
+    end
+    as = ds.all
+    as.should == [GraphAlbum.load(:id=>3, :band_id=>2)]
+    as.first.sbands.should == [GraphBand.load(:id=>5, :vocalist_id=>6), GraphBand.load(:id=>6, :vocalist_id=>22)]
+  end
 
   it "should respect many_to_many association's :left_primary_key and :right_primary_key options" do 
     GraphAlbum.many_to_many :inner_genres, :class=>'GraphGenre', :left_key=>:album_id, :left_primary_key=>:band_id, :right_key=>:genre_id, :right_primary_key=>:xxx, :join_table=>:ag

data/spec/model/model_spec.rb

@@ -436,12 +436,19 @@ describe Sequel::Model, ".[]" do
     $sqls.last.should == "SELECT * FROM items WHERE (name = 'sharon') LIMIT 1"
   end
 
-  it "should work correctly for composite primary key" do
+  it "should work correctly for composite primary key specified as array" do
     @c.set_primary_key [:node_id, :kind]
     @c[3921, 201].should be_a_kind_of(@c)
     $sqls.last.should =~ \
     /^SELECT \* FROM items WHERE \((\(node_id = 3921\) AND \(kind = 201\))|(\(kind = 201\) AND \(node_id = 3921\))\) LIMIT 1$/
   end
+  
+  it "should work correctly for composite primary key specified as separate arguments" do
+    @c.set_primary_key :node_id, :kind
+    @c[3921, 201].should be_a_kind_of(@c)
+    $sqls.last.should =~ \
+    /^SELECT \* FROM items WHERE \((\(node_id = 3921\) AND \(kind = 201\))|(\(kind = 201\) AND \(node_id = 3921\))\) LIMIT 1$/
+  end
 end
 
 context "Model#inspect" do

data/spec/model/record_spec.rb

@@ -192,27 +192,70 @@ describe "Model#save" do
   end
 end
 
-describe "Model#save_changes" do
-  
-  before(:each) do
+describe "Model#modified?" do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
+      columns :id, :x
+      @db_schema = {:x => {:type => :integer}}
+    end
     MODEL_DB.reset
+  end
+  
+  it "should be true if the object is new" do
+    @c.new.modified?.should == true
+  end
+  
+  it "should be false if the object has not been modified" do
+    @c.load(:id=>1).modified?.should == false
+  end
+  
+  it "should be true if the object has been modified" do
+    o = @c.load(:id=>1, :x=>2)
+    o.x = 3
+    o.modified?.should == true
+  end
+  
+  it "should be false if a column value is set that is the same as the current value after typecasting" do
+    o = @c.load(:id=>1, :x=>2)
+    o.x = '2'
+    o.modified?.should == false
+  end
+  
+  it "should be true if a column value is set that is the different as the current value after typecasting" do
+    o = @c.load(:id=>1, :x=>'2')
+    o.x = '2'
+    o.modified?.should == true
+  end
+end
 
+describe "Model#save_changes" do
+  
+  before do
     @c = Class.new(Sequel::Model(:items)) do
       unrestrict_primary_key
       columns :id, :x, :y
     end
+    MODEL_DB.reset
   end
   
-  it "should do nothing if no changed columns" do
-    o = @c.new(:id => 3, :x => 1, :y => nil)
+  it "should always save if the object is new" do
+    o = @c.new(:x => 1)
     o.save_changes
-    
-    MODEL_DB.sqls.should be_empty
+    MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
+  end
 
+  it "should do nothing if no changed columns" do
     o = @c.load(:id => 3, :x => 1, :y => nil)
     o.save_changes
-    
-    MODEL_DB.sqls.should be_empty
+    MODEL_DB.sqls.should == []
+  end
+  
+  it "should do nothing if modified? is false" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    def o.modified?; false; end
+    o.save_changes
+    MODEL_DB.sqls.should == []
   end
   
   it "should update only changed columns" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-02 00:00:00 -07:00
+date: 2009-10-01 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -55,6 +55,7 @@ extra_rdoc_files:
 - 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
 files: 
 - COPYING
 - CHANGELOG
@@ -67,7 +68,6 @@ files:
 - doc/opening_databases.rdoc
 - doc/prepared_statements.rdoc
 - doc/reflection.rdoc
-- doc/release_notes
 - doc/release_notes/1.0.txt
 - doc/release_notes/1.1.txt
 - doc/release_notes/1.3.txt
@@ -91,10 +91,10 @@ files:
 - 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/schema.rdoc
 - doc/sharding.rdoc
 - doc/virtual_rows.rdoc
-- spec/adapters
 - spec/adapters/firebird_spec.rb
 - spec/adapters/informix_spec.rb
 - spec/adapters/mysql_spec.rb
@@ -102,7 +102,7 @@ files:
 - spec/adapters/postgres_spec.rb
 - spec/adapters/spec_helper.rb
 - spec/adapters/sqlite_spec.rb
-- spec/core
+- spec/adapters/mssql_spec.rb
 - spec/core/connection_pool_spec.rb
 - spec/core/core_sql_spec.rb
 - spec/core/database_spec.rb
@@ -113,7 +113,6 @@ files:
 - spec/core/schema_spec.rb
 - spec/core/spec_helper.rb
 - spec/core/version_spec.rb
-- spec/extensions
 - spec/extensions/blank_spec.rb
 - spec/extensions/caching_spec.rb
 - spec/extensions/hook_class_methods_spec.rb
@@ -139,7 +138,17 @@ files:
 - spec/extensions/instance_hooks_spec.rb
 - spec/extensions/boolean_readers_spec.rb
 - spec/extensions/nested_attributes_spec.rb
-- spec/integration
+- spec/extensions/looser_typecasting_spec.rb
+- spec/extensions/typecast_on_load_spec.rb
+- spec/extensions/subclasses_spec.rb
+- spec/extensions/active_model_spec.rb
+- spec/extensions/association_dependencies_spec.rb
+- spec/extensions/sql_expr_spec.rb
+- spec/extensions/touch_spec.rb
+- spec/extensions/named_timezones_spec.rb
+- spec/extensions/thread_local_timezones_spec.rb
+- spec/extensions/force_encoding_spec.rb
+- spec/extensions/class_table_inheritance_spec.rb
 - spec/integration/database_test.rb
 - spec/integration/dataset_test.rb
 - spec/integration/eager_loader_test.rb
@@ -149,7 +158,7 @@ files:
 - spec/integration/transaction_test.rb
 - spec/integration/type_test.rb
 - spec/integration/timezone_test.rb
-- spec/model
+- spec/integration/plugin_test.rb
 - spec/model/association_reflection_spec.rb
 - spec/model/associations_spec.rb
 - spec/model/base_spec.rb
@@ -167,21 +176,17 @@ files:
 - spec/spec_config.rb
 - spec/spec_config.rb.example
 - lib/sequel.rb
-- lib/sequel
-- lib/sequel/adapters
 - lib/sequel/adapters/ado.rb
 - lib/sequel/adapters/amalgalite.rb
 - lib/sequel/adapters/db2.rb
 - lib/sequel/adapters/dbi.rb
 - lib/sequel/adapters/do.rb
-- lib/sequel/adapters/do
 - lib/sequel/adapters/do/mysql.rb
 - lib/sequel/adapters/do/postgres.rb
 - lib/sequel/adapters/do/sqlite.rb
 - lib/sequel/adapters/firebird.rb
 - lib/sequel/adapters/informix.rb
 - lib/sequel/adapters/jdbc.rb
-- lib/sequel/adapters/jdbc
 - lib/sequel/adapters/jdbc/h2.rb
 - lib/sequel/adapters/jdbc/mysql.rb
 - lib/sequel/adapters/jdbc/oracle.rb
@@ -193,7 +198,6 @@ files:
 - lib/sequel/adapters/openbase.rb
 - lib/sequel/adapters/oracle.rb
 - lib/sequel/adapters/postgres.rb
-- lib/sequel/adapters/shared
 - lib/sequel/adapters/shared/mssql.rb
 - lib/sequel/adapters/shared/mysql.rb
 - lib/sequel/adapters/shared/oracle.rb
@@ -201,28 +205,22 @@ files:
 - lib/sequel/adapters/shared/progress.rb
 - lib/sequel/adapters/shared/sqlite.rb
 - lib/sequel/adapters/sqlite.rb
-- lib/sequel/adapters/utils
 - lib/sequel/adapters/utils/stored_procedures.rb
-- lib/sequel/adapters/ado
 - lib/sequel/adapters/ado/mssql.rb
-- lib/sequel/adapters/odbc
 - lib/sequel/adapters/odbc/mssql.rb
 - lib/sequel/connection_pool.rb
 - lib/sequel/core.rb
 - lib/sequel/core_sql.rb
 - lib/sequel/database.rb
-- lib/sequel/database
 - lib/sequel/database/schema_generator.rb
 - lib/sequel/database/schema_methods.rb
 - lib/sequel/database/schema_sql.rb
 - lib/sequel/dataset.rb
-- lib/sequel/dataset
 - lib/sequel/dataset/convenience.rb
 - lib/sequel/dataset/graph.rb
 - lib/sequel/dataset/prepared_statements.rb
 - lib/sequel/dataset/sql.rb
 - lib/sequel/exceptions.rb
-- lib/sequel/extensions
 - lib/sequel/extensions/blank.rb
 - lib/sequel/extensions/inflector.rb
 - lib/sequel/extensions/migration.rb
@@ -231,9 +229,12 @@ files:
 - lib/sequel/extensions/query.rb
 - lib/sequel/extensions/schema_dumper.rb
 - lib/sequel/extensions/string_date_time.rb
+- lib/sequel/extensions/looser_typecasting.rb
+- lib/sequel/extensions/sql_expr.rb
+- lib/sequel/extensions/named_timezones.rb
+- lib/sequel/extensions/thread_local_timezones.rb
 - lib/sequel/metaprogramming.rb
 - lib/sequel/model.rb
-- lib/sequel/model
 - lib/sequel/model/associations.rb
 - lib/sequel/model/base.rb
 - lib/sequel/model/errors.rb
@@ -241,7 +242,6 @@ files:
 - lib/sequel/model/inflections.rb
 - lib/sequel/model/plugins.rb
 - lib/sequel/model/default_inflections.rb
-- lib/sequel/plugins
 - lib/sequel/plugins/caching.rb
 - lib/sequel/plugins/hook_class_methods.rb
 - lib/sequel/plugins/identity_map.rb
@@ -258,12 +258,22 @@ files:
 - lib/sequel/plugins/boolean_readers.rb
 - lib/sequel/plugins/instance_hooks.rb
 - lib/sequel/plugins/nested_attributes.rb
+- lib/sequel/plugins/touch.rb
+- lib/sequel/plugins/typecast_on_load.rb
+- lib/sequel/plugins/subclasses.rb
+- lib/sequel/plugins/active_model.rb
+- lib/sequel/plugins/association_dependencies.rb
+- lib/sequel/plugins/force_encoding.rb
+- lib/sequel/plugins/class_table_inheritance.rb
 - lib/sequel/sql.rb
 - lib/sequel/version.rb
+- lib/sequel/timezones.rb
 - lib/sequel_core.rb
 - lib/sequel_model.rb
 has_rdoc: true
 homepage: http://sequel.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --quiet
@@ -290,9 +300,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sequel
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: The Database Toolkit for Ruby
 test_files: []