sequel 3.5.0 → 3.6.0

data/spec/model/eager_loading_spec.rb

@@ -610,6 +610,29 @@ describe Sequel::Model, "#eager" do
     a.al_tracks.should == [EagerTrack.load(:id=>6, :album_id=>1)]
     a.al_genres.should == [EagerGenre.load(:id=>8)]
   end
+  
+  it "should respect :uniq option when eagerly loading many_to_many associations" do
+    EagerAlbum.many_to_many :al_genres, :class=>'EagerGenre', :left_key=>:album_id, :right_key=>:genre_id, :join_table=>:ag, :uniq=>true
+    EagerGenre.dataset.extend(Module.new {
+      def fetch_rows(sql)
+        MODEL_DB.sqls << sql
+        yield({:x_foreign_key_x=>1, :id=>8})
+        yield({:x_foreign_key_x=>1, :id=>8})
+      end
+    })
+    a = EagerAlbum.eager(:al_genres).all.first
+    MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT genres.*, ag.album_id AS x_foreign_key_x FROM genres INNER JOIN ag ON ((ag.genre_id = genres.id) AND (ag.album_id IN (1)))"]
+    a.should == EagerAlbum.load(:id => 1, :band_id => 2)
+    a.al_genres.should == [EagerGenre.load(:id=>8)]
+  end
+  
+  it "should respect :distinct option when eagerly loading many_to_many associations" do
+    EagerAlbum.many_to_many :al_genres, :class=>'EagerGenre', :left_key=>:album_id, :right_key=>:genre_id, :join_table=>:ag, :distinct=>true
+    a = EagerAlbum.eager(:al_genres).all.first
+    MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT DISTINCT genres.*, ag.album_id AS x_foreign_key_x FROM genres INNER JOIN ag ON ((ag.genre_id = genres.id) AND (ag.album_id IN (1)))"]
+    a.should == EagerAlbum.load(:id => 1, :band_id => 2)
+    a.al_genres.should == [EagerGenre.load(:id=>4)]
+  end
 end
 
 describe Sequel::Model, "#eager_graph" do

data/spec/model/model_spec.rb

@@ -4,18 +4,21 @@ describe "Sequel::Model()" do
   before do
     @db = Sequel::Model.db
   end
+
   it "should return a model subclass with the given dataset if given a dataset" do
     ds = @db[:blah]
     c = Sequel::Model(ds)
     c.superclass.should == Sequel::Model
     c.dataset.should == ds
   end
+
   it "should return a model subclass with a dataset with the default database and given table name if given a symbol" do
     c = Sequel::Model(:blah)
     c.superclass.should == Sequel::Model
     c.db.should == @db
     c.table_name.should == :blah
   end
+
   it "should return a model subclass associated to the given database if given a database" do
     db = Sequel::Database.new
     c = Sequel::Model(db)
@@ -82,6 +85,11 @@ describe Sequel::Model, "dataset & schema" do
     @model.table_name.should == :foo
   end
 
+  it "table_name should respect table aliases" do
+    @model.set_dataset(:foo___x)
+    @model.table_name.should == :x
+  end
+  
   it "set_dataset should raise an error unless given a Symbol or Dataset" do
     proc{@model.set_dataset(Object.new)}.should raise_error(Sequel::Error)
   end

data/spec/model/record_spec.rb

@@ -112,6 +112,23 @@ describe "Model#save" do
     o.save(:y)
     o.changed_columns.should == []
   end
+  
+  it "should mark all columns as not changed if this is a new record" do
+    o = @c.new(:x => 1, :y => nil)
+    o.x = 4
+    o.changed_columns.should == [:x]
+    o.save
+    o.changed_columns.should == []
+  end
+  
+  it "should mark all columns as not changed if this is a new record and insert_select was used" do
+    @c.dataset.meta_def(:insert_select){|h| h.merge(:id=>1)}
+    o = @c.new(:x => 1, :y => nil)
+    o.x = 4
+    o.changed_columns.should == [:x]
+    o.save
+    o.changed_columns.should == []
+  end
 
   it "should store previous value of @new in @was_new and as well as the hash used for updating in @columns_updated until after hooks finish running" do
     res = nil
@@ -192,7 +209,41 @@ describe "Model#save" do
   end
 end
 
-describe "Model#modified?" do
+describe "Model#marshallable" do
+  before do
+    class ::Album < Sequel::Model
+      columns :id, :x
+    end
+    Album.dataset.meta_def(:insert){|h| super(h); 1}
+  end
+  after do
+    Object.send(:remove_const, :Album)
+  end
+
+  it "should make an object marshallable" do
+    i = Album.new(:x=>2)
+    s = nil
+    i2 = nil
+    i.marshallable!
+    proc{s = Marshal.dump(i)}.should_not raise_error
+    proc{i2 = Marshal.load(s)}.should_not raise_error
+    i2.should == i
+
+    i.save
+    i.marshallable!
+    proc{s = Marshal.dump(i)}.should_not raise_error
+    proc{i2 = Marshal.load(s)}.should_not raise_error
+    i2.should == i
+
+    i.save
+    i.marshallable!
+    proc{s = Marshal.dump(i)}.should_not raise_error
+    proc{i2 = Marshal.load(s)}.should_not raise_error
+    i2.should == i
+  end
+end
+
+describe "Model#modified[!?]" do
   before do
     @c = Class.new(Sequel::Model(:items))
     @c.class_eval do
@@ -216,6 +267,21 @@ describe "Model#modified?" do
     o.modified?.should == true
   end
   
+  it "should be true if the object is marked modified!" do
+    o = @c.load(:id=>1, :x=>2)
+    o.modified!
+    o.modified?.should == true
+  end
+  
+  it "should be false if the object is marked modified! after saving until modified! again" do
+    o = @c.load(:id=>1, :x=>2)
+    o.modified!
+    o.save
+    o.modified?.should == false
+    o.modified!
+    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'
@@ -245,6 +311,15 @@ describe "Model#save_changes" do
     MODEL_DB.sqls.first.should == "INSERT INTO items (x) VALUES (1)"
   end
 
+  it "should take options passed to save" do
+    o = @c.new(:x => 1)
+    def o.valid?; false; end
+    proc{o.save_changes}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+    o.save_changes(:validate=>false)
+    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
@@ -295,6 +370,14 @@ describe "Model#save_changes" do
     o.save_changes
     MODEL_DB.sqls.should == ["UPDATE items SET y = 4 WHERE (id = 3)"]
   end
+  
+  it "should clear changed_columns" do
+    o = @c.load(:id => 3, :x => 1, :y => nil)
+    o.x = 4
+    o.changed_columns.should == [:x]
+    o.save_changes
+    o.changed_columns.should == []
+  end
 
   it "should update columns changed in a before_update hook" do
     o = @c.load(:id => 3, :x => 1, :y => nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequel
 version: !ruby/object:Gem::Version 
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -07:00
+date: 2009-11-02 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -56,6 +56,7 @@ extra_rdoc_files:
 - 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
 files: 
 - COPYING
 - CHANGELOG
@@ -92,6 +93,7 @@ files:
 - 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/schema.rdoc
 - doc/sharding.rdoc
 - doc/virtual_rows.rdoc
@@ -159,6 +161,8 @@ files:
 - spec/integration/type_test.rb
 - spec/integration/timezone_test.rb
 - spec/integration/plugin_test.rb
+- spec/integration/associations_test.rb
+- spec/integration/model_test.rb
 - spec/model/association_reflection_spec.rb
 - spec/model/associations_spec.rb
 - spec/model/base_spec.rb
@@ -220,6 +224,9 @@ files:
 - lib/sequel/dataset/graph.rb
 - lib/sequel/dataset/prepared_statements.rb
 - lib/sequel/dataset/sql.rb
+- lib/sequel/dataset/actions.rb
+- lib/sequel/dataset/features.rb
+- lib/sequel/dataset/query.rb
 - lib/sequel/exceptions.rb
 - lib/sequel/extensions/blank.rb
 - lib/sequel/extensions/inflector.rb