sequel 3.46.0 → 3.47.0

data/spec/model/base_spec.rb

@@ -33,7 +33,7 @@ describe "Model attribute setters" do
     @o.changed_columns.should == [:x, :y]
   end
 
-  it "should have columns that can't be called like normal ruby methods" do
+  it "should handle columns that can't be called like normal ruby methods" do
     @o.send(:"x y=", 3)
     @o.changed_columns.should == [:"x y"]
     @o.values.should == {:"x y"=>3}
@@ -385,7 +385,7 @@ describe "Model.db" do
     Sequel::Model.db = @model_db
   end
 
-  specify "should be required when create named model classes" do
+  specify "should be required when creating named model classes" do
     begin
       proc{class ModelTest < Sequel::Model; end}.should raise_error(Sequel::Error)
     ensure
@@ -655,7 +655,7 @@ describe Sequel::Model, ".[] optimization" do
     @c.simple_table.should == '"b"."a"'
   end
 
-  it "should simple_pk and simple_table respect dataset's identifier input methods" do
+  it "should have simple_pk and simple_table respect dataset's identifier input methods" do
     ds = @db[:ab]
     ds.identifier_input_method = :reverse
     @c.set_dataset ds
@@ -672,7 +672,7 @@ describe Sequel::Model, ".[] optimization" do
     @c.simple_table.should == nil
   end
 
-  it "should have simple_table superclasses setting if inheriting" do
+  it "should have simple_table inherit superclass's setting" do
     Class.new(@c).simple_table.should == nil
     @c.set_dataset :a
     Class.new(@c).simple_table.should == '"a"'

data/spec/model/eager_loading_spec.rb

@@ -293,13 +293,13 @@ describe Sequel::Model, "#eager" do
   
   it "should correctly handle a :select=>[] option to many_to_many" do
     EagerAlbum.many_to_many :sgenres, :clone=>:genres, :select=>[]
-    a = EagerAlbum.eager(:sgenres).all
+    EagerAlbum.eager(:sgenres).all
     MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT *, 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)))"]
   end
   
   it "should correctly handle an aliased join table in many_to_many" do
     EagerAlbum.many_to_many :sgenres, :clone=>:genres, :join_table=>:ag___ga
-    a = EagerAlbum.eager(:sgenres).all
+    EagerAlbum.eager(:sgenres).all
     MODEL_DB.sqls.should == ['SELECT * FROM albums', "SELECT genres.*, ga.album_id AS x_foreign_key_x FROM genres INNER JOIN ag AS ga ON ((ga.genre_id = genres.id) AND (ga.album_id IN (1)))"]
   end
   
@@ -1469,7 +1469,7 @@ describe Sequel::Model, "#eager_graph" do
   end
 
   it "should eagerly load a many_to_one association with a custom callback" do
-    ds = GraphAlbum.eager_graph(:band => proc {|ds| ds.select(:id).columns(:id)})
+    ds = GraphAlbum.eager_graph(:band => proc {|ds1| ds1.select(:id).columns(:id)})
     ds.sql.should == 'SELECT albums.id, albums.band_id, band.id AS band_id_0 FROM albums LEFT OUTER JOIN (SELECT id FROM bands) AS band ON (band.id = albums.band_id)'
     ds._fetch = {:id=>1, :band_id=>2, :band_id_0=>2}
     a = ds.all
@@ -1479,7 +1479,7 @@ describe Sequel::Model, "#eager_graph" do
 
   it "should eagerly load a one_to_one association with a custom callback" do
     GraphAlbum.one_to_one :track, :class=>'GraphTrack', :key=>:album_id
-    ds = GraphAlbum.eager_graph(:track => proc {|ds| ds.select(:album_id).columns(:album_id)})
+    ds = GraphAlbum.eager_graph(:track => proc {|ds1| ds1.select(:album_id).columns(:album_id)})
     ds.sql.should == 'SELECT albums.id, albums.band_id, track.album_id FROM albums LEFT OUTER JOIN (SELECT album_id FROM tracks) AS track ON (track.album_id = albums.id)'
     ds._fetch = {:id=>1, :band_id=>2, :album_id=>1}
     a = ds.all
@@ -1488,7 +1488,7 @@ describe Sequel::Model, "#eager_graph" do
   end
 
   it "should eagerly load a one_to_many association with a custom callback" do
-    ds = GraphAlbum.eager_graph(:tracks => proc {|ds| ds.select(:album_id).columns(:album_id)})
+    ds = GraphAlbum.eager_graph(:tracks => proc {|ds1| ds1.select(:album_id).columns(:album_id)})
     ds.sql.should == 'SELECT albums.id, albums.band_id, tracks.album_id FROM albums LEFT OUTER JOIN (SELECT album_id FROM tracks) AS tracks ON (tracks.album_id = albums.id)'
     ds._fetch = {:id=>1, :band_id=>2, :album_id=>1}
     a = ds.all
@@ -1497,7 +1497,7 @@ describe Sequel::Model, "#eager_graph" do
   end
 
   it "should eagerly load a many_to_many association with a custom callback" do
-    ds = GraphAlbum.eager_graph(:genres => proc {|ds| ds.select(:id).columns(:id)})
+    ds = GraphAlbum.eager_graph(:genres => proc {|ds1| ds1.select(:id).columns(:id)})
     ds.sql.should == '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 (SELECT id FROM genres) AS genres ON (genres.id = ag.genre_id)'
     ds._fetch = {:id=>1, :band_id=>2, :genres_id=>4}
     a = ds.all
@@ -1506,7 +1506,7 @@ describe Sequel::Model, "#eager_graph" do
   end
 
   it "should allow cascading of eager loading with a custom callback with hash value" do
-    ds = GraphTrack.eager_graph(:album=>{proc{|ds| ds.select(:id, :band_id).columns(:id, :band_id)}=>{:band=>:members}})
+    ds = GraphTrack.eager_graph(:album=>{proc{|ds1| ds1.select(:id, :band_id).columns(:id, :band_id)}=>{:band=>:members}})
     ds.sql.should == 'SELECT tracks.id, tracks.album_id, album.id AS album_id_0, album.band_id, band.id AS band_id_0, band.vocalist_id, members.id AS members_id FROM tracks LEFT OUTER JOIN (SELECT id, band_id FROM albums) AS album ON (album.id = tracks.album_id) LEFT OUTER JOIN bands AS band ON (band.id = album.band_id) LEFT OUTER JOIN bm ON (bm.band_id = band.id) LEFT OUTER JOIN members ON (members.id = bm.member_id)'
     ds._fetch = {:id=>3, :album_id=>1, :album_id_0=>1, :band_id=>2, :members_id=>5, :band_id_0=>2, :vocalist_id=>6}
     a = ds.all
@@ -1518,7 +1518,7 @@ describe Sequel::Model, "#eager_graph" do
   end
   
   it "should allow cascading of eager loading with a custom callback with array value" do
-    ds = GraphTrack.eager_graph(:album=>{proc{|ds| ds.select(:id, :band_id).columns(:id, :band_id)}=>[:band, :tracks]})
+    ds = GraphTrack.eager_graph(:album=>{proc{|ds1| ds1.select(:id, :band_id).columns(:id, :band_id)}=>[:band, :tracks]})
     ds.sql.should == 'SELECT tracks.id, tracks.album_id, album.id AS album_id_0, album.band_id, band.id AS band_id_0, band.vocalist_id, tracks_0.id AS tracks_0_id, tracks_0.album_id AS tracks_0_album_id FROM tracks LEFT OUTER JOIN (SELECT id, band_id FROM albums) AS album ON (album.id = tracks.album_id) LEFT OUTER JOIN bands AS band ON (band.id = album.band_id) LEFT OUTER JOIN tracks AS tracks_0 ON (tracks_0.album_id = album.id)'
     ds._fetch = {:id=>3, :album_id=>1, :album_id_0=>1, :band_id=>2, :band_id_0=>2, :vocalist_id=>6, :tracks_0_id=>3, :tracks_0_album_id=>1}
     a = ds.all

data/spec/model/model_spec.rb

@@ -164,12 +164,12 @@ describe Sequel::Model do
   end
 end
 
-describe Sequel::Model, "dataset & schema" do
+describe Sequel::Model do
   before do
     @model = Class.new(Sequel::Model(:items))
   end
 
-  it "creates dynamic model subclass with set table name" do
+  it "has table_name return name of table" do
     @model.table_name.should == :items
   end
 
@@ -187,31 +187,31 @@ describe Sequel::Model, "dataset & schema" do
     @model.table_name.should == :foo
   end
 
-  it "set_dataset should take a Symbol" do
+  it "allows set_dataset to accept a Symbol" do
     @model.db = MODEL_DB
     @model.set_dataset(:foo)
     @model.table_name.should == :foo
   end
 
-  it "set_dataset should take a LiteralString" do
+  it "allows set_dataset to accept a LiteralString" do
     @model.db = MODEL_DB
     @model.set_dataset(Sequel.lit('foo'))
     @model.table_name.should == Sequel.lit('foo')
   end
 
-  it "set_dataset should take an SQL::Identifier" do
+  it "allows set_dataset to acceptan SQL::Identifier" do
     @model.db = MODEL_DB
     @model.set_dataset(Sequel.identifier(:foo))
     @model.table_name.should == Sequel.identifier(:foo)
   end
 
-  it "set_dataset should take an SQL::QualifiedIdentifier" do
+  it "allows set_dataset to acceptan SQL::QualifiedIdentifier" do
     @model.db = MODEL_DB
     @model.set_dataset(Sequel.qualify(:bar, :foo))
     @model.table_name.should == Sequel.qualify(:bar, :foo)
   end
 
-  it "set_dataset should take an SQL::AliasedExpression" do
+  it "allows set_dataset to acceptan SQL::AliasedExpression" do
     @model.db = MODEL_DB
     @model.set_dataset(Sequel.as(:foo, :bar))
     @model.table_name.should == :bar
@@ -266,6 +266,25 @@ describe Sequel::Model, "dataset & schema" do
     def @model.set_dataset(*) raise Sequel::Error end
     proc{Class.new(@model)}.should_not raise_error
   end
+
+  it "should raise if bad inherited instance variable value is used" do
+    def @model.inherited_instance_variables() super.merge(:@a=>:foo) end
+    @model.instance_eval{@a=1}
+    proc{Class.new(@model)}.should raise_error(Sequel::Error)
+  end
+
+  it "copy inherited instance variables into subclass if set" do
+    def @model.inherited_instance_variables() super.merge(:@a=>nil, :@b=>:dup, :@c=>:hash_dup, :@d=>proc{|v| v * 2}) end
+    @model.instance_eval{@a=1; @b=[2]; @c={3=>[4]}; @d=10}
+    m = Class.new(@model)
+    @model.instance_eval{@a=5; @b << 6; @c[3] << 7; @c[8] = [9]; @d=40}
+    m.instance_eval do
+      @a.should == 1
+      @b.should == [2]
+      @c.should == {3=>[4]}
+      @d.should == 20
+    end
+  end
 end
 
 describe Sequel::Model, "constructors" do
@@ -621,8 +640,7 @@ describe "Model.db_schema" do
     @dataset = @db[:items]
   end
   
-  specify "should use the database's schema_for_table and set the columns and dataset columns" do
-    d = @dataset.db
+  specify "should use the database's schema and set the columns and dataset columns" do
     def @db.schema(table, opts = {})
       [[:x, {:type=>:integer}], [:y, {:type=>:string}]]
     end

data/spec/model/plugins_spec.rb

@@ -245,3 +245,74 @@ describe Sequel::Model, ".plugin" do
     @c.plugins.should include(m)
   end
 end
+
+describe Sequel::Plugins do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+  end
+  
+  it "should have def_dataset_methods define methods that call methods on the dataset" do
+    m = Module.new do
+      module self::ClassMethods
+        Sequel::Plugins.def_dataset_methods(self, :one)
+      end
+      module self::DatasetMethods
+        def one
+          1
+        end
+      end
+    end
+    @c.plugin m
+    @c.one.should == 1
+  end
+  
+  it "should have def_dataset_methods accept an array with multiple methods" do
+    m = Module.new do
+      module self::ClassMethods
+        Sequel::Plugins.def_dataset_methods(self, [:one, :two])
+      end
+      module self::DatasetMethods
+        def one
+          1
+        end
+        def two 
+          2
+        end
+      end
+    end
+    @c.plugin m
+    @c.one.should == 1
+    @c.two.should == 2
+  end
+
+  it "should have inherited_instance_variables add instance variables to copy into the subclass" do
+    m = Module.new do
+      def self.apply(model)
+        model.instance_variable_set(:@one, 1)
+      end
+      module self::ClassMethods
+        attr_reader :one
+        Sequel::Plugins.inherited_instance_variables(self, :@one=>nil)
+      end
+    end
+    @c.plugin m
+    Class.new(@c).one.should == 1
+  end
+  
+  it "should have after_set_dataset add a method to call after set_dataset" do
+    m = Module.new do
+      module self::ClassMethods
+        Sequel::Plugins.after_set_dataset(self, :one)
+        private
+        def one
+          dataset.opts[:foo] = 1
+        end
+      end
+    end
+    @c.plugin m
+    @c.dataset.opts[:foo].should == nil
+    @c.set_dataset :blah
+    @c.dataset.opts[:foo].should == 1
+  end
+end
+  

data/spec/model/record_spec.rb

@@ -367,6 +367,12 @@ describe "Model#freeze" do
     @o.frozen?.should be_true
   end
 
+  it "should freeze the object if the model doesn't have a primary key" do
+    Album.no_primary_key
+    @o = Album.load(:id=>1).freeze
+    @o.frozen?.should be_true
+  end
+
   it "should freeze the object's values, associations, changed_columns, errors, and this" do
     @o.values.frozen?.should be_true
     @o.changed_columns.frozen?.should be_true
@@ -433,7 +439,7 @@ describe "Model#marshallable" do
   end
 end
 
-describe "Model#modified[!?]" do
+describe "Model#modified?" do
   before do
     @c = Class.new(Sequel::Model(:items))
     @c.class_eval do
@@ -483,8 +489,47 @@ describe "Model#modified[!?]" do
     o.x = '2'
     o.modified?.should == true
   end
+
+  it "should be true if given a column argument and the column has been changed" do
+    o = @c.new
+    o.modified?(:id).should be_false
+    o.id = 1
+    o.modified?(:id).should be_true
+  end
 end
 
+describe "Model#modified!" do
+  before do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval do
+      columns :id, :x
+    end
+    MODEL_DB.reset
+  end
+
+  it "should mark the object as modified so that save_changes still runs the callbacks" do
+    o = @c.load(:id=>1, :x=>2)
+    def o.after_save
+      values[:x] = 3
+    end
+    o.update({})
+    o.x.should == 2
+
+    o.modified!
+    o.update({})
+    o.x.should == 3
+    o.db.sqls.should == []
+  end
+
+  it "should mark given column argument as modified" do
+    o = @c.load(:id=>1, :x=>2)
+    o.modified!(:x)
+    o.changed_columns.should == [:x]
+    o.save
+    o.db.sqls.should == ["UPDATE items SET x = 2 WHERE (id = 1)"]
+  end
+end
+  
 describe "Model#save_changes" do
   before do
     @c = Class.new(Sequel::Model(:items)) do
@@ -618,8 +663,8 @@ describe "Model#new?" do
   end
 end
 
-describe Sequel::Model, "w/ primary key" do
-  it "should default to ':id'" do
+describe Sequel::Model, "with a primary key" do
+  it "should default to :id" do
     model_a = Class.new Sequel::Model
     model_a.primary_key.should == :id
   end
@@ -640,7 +685,7 @@ describe Sequel::Model, "w/ primary key" do
   end
 end
 
-describe Sequel::Model, "w/o primary key" do
+describe Sequel::Model, "without a primary key" do
   it "should return nil for primary key" do
     Class.new(Sequel::Model){no_primary_key}.primary_key.should be_nil
   end
@@ -651,7 +696,7 @@ describe Sequel::Model, "w/o primary key" do
   end
 end
 
-describe Sequel::Model, "with this" do
+describe Sequel::Model, "#this" do
   before do
     @example = Class.new(Sequel::Model(:examples))
     @example.columns :id, :a, :x, :y
@@ -682,18 +727,18 @@ describe "Model#pk" do
     @m.columns :id, :x, :y
   end
   
-  it "should be default return the value of the :id column" do
+  it "should by default return the value of the :id column" do
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk.should == 111
   end
 
-  it "should be return the primary key value for custom primary key" do
+  it "should return the primary key value for custom primary key" do
     @m.set_primary_key :x
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk.should == 2
   end
 
-  it "should be return the primary key value for composite primary key" do
+  it "should return the primary key value for composite primary key" do
     @m.set_primary_key [:y, :x]
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk.should == [3, 2]
@@ -716,18 +761,18 @@ describe "Model#pk_hash" do
     @m.columns :id, :x, :y
   end
   
-  it "should be default return the value of the :id column" do
+  it "should by default return a hash with the value of the :id column" do
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_hash.should == {:id => 111}
   end
 
-  it "should be return the primary key value for custom primary key" do
+  it "should return a hash with the primary key value for custom primary key" do
     @m.set_primary_key :x
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_hash.should == {:x => 2}
   end
 
-  it "should be return the primary key value for composite primary key" do
+  it "should return a hash with the primary key values for composite primary key" do
     @m.set_primary_key [:y, :x]
     m = @m.load(:id => 111, :x => 2, :y => 3)
     m.pk_hash.should == {:y => 3, :x => 2}
@@ -918,7 +963,6 @@ describe Sequel::Model, "#set_fields" do
       set_primary_key :id
       columns :x, :y, :z, :id
     end
-    @c.strict_param_setting = true 
     @o1 = @c.new
     MODEL_DB.reset
   end
@@ -967,6 +1011,29 @@ describe Sequel::Model, "#set_fields" do
     MODEL_DB.sqls.should == []
   end
 
+  it "should respect model's default_set_fields_options" do
+    @c.default_set_fields_options = {:missing=>:skip}
+    @o1.set_fields({:x => 3}, [:x, :y])
+    @o1.values.should == {:x => 3}
+    @o1.set_fields({:x => 4}, [:x, :y], {})
+    @o1.values.should == {:x => 4}
+    proc{@o1.set_fields({:x => 3}, [:x, :y], :missing=>:raise)}.should raise_error(Sequel::Error)
+    @c.default_set_fields_options = {:missing=>:raise}
+    proc{@o1.set_fields({:x => 3}, [:x, :y])}.should raise_error(Sequel::Error)
+    proc{@o1.set_fields({:x => 3}, [:x, :y], {})}.should raise_error(Sequel::Error)
+    @o1.set_fields({:x => 5}, [:x, :y], :missing=>:skip)
+    @o1.values.should == {:x => 5}
+    @o1.set_fields({:x => 5}, [:x, :y], :missing=>nil)
+    @o1.values.should == {:x => 5, :y=>nil}
+    MODEL_DB.sqls.should == []
+  end
+
+  it "should respect model's default_set_fields_options in a subclass" do
+    @c.default_set_fields_options = {:missing=>:skip}
+    o = Class.new(@c).new
+    o.set_fields({:x => 3}, [:x, :y])
+    o.values.should == {:x => 3}
+  end
 end
 
 describe Sequel::Model, "#update_fields" do
@@ -1001,6 +1068,17 @@ describe Sequel::Model, "#update_fields" do
   it "should support :missing=>:raise option" do
     proc{@o1.update_fields({:x => 1}, [:x, :y], :missing=>:raise)}.should raise_error(Sequel::Error)
   end
+
+  it "should respect model's default_set_fields_options" do
+    @c.default_set_fields_options = {:missing=>:skip}
+    @o1.update_fields({:x => 3}, [:x, :y])
+    @o1.values.should == {:x => 3, :id=>1}
+    MODEL_DB.sqls.should == ["UPDATE items SET x = 3 WHERE (id = 1)"]
+
+    @c.default_set_fields_options = {:missing=>:raise}
+    proc{@o1.update_fields({:x => 3}, [:x, :y])}.should raise_error(Sequel::Error)
+    MODEL_DB.sqls.should == []
+  end
 end
 
 describe Sequel::Model, "#(set|update)_(all|except|only)" do
@@ -1449,7 +1527,7 @@ describe Sequel::Model, ".create" do
     MODEL_DB.sqls.should == ["INSERT INTO items DEFAULT VALUES", "SELECT * FROM items WHERE (id = 10) LIMIT 1"]
   end
 
-  it "should accept a block and run it" do
+  it "should accept a block and call it" do
     o1, o2, o3 =  nil, nil, nil
     o = @c.create {|o4| o1 = o4; o3 = o4; o2 = :blah; o3.x = 333}
     o.class.should == @c
@@ -1886,3 +1964,11 @@ describe "Model#lock!" do
     MODEL_DB.sqls.should == ["SELECT * FROM items WHERE (id = 1) LIMIT 1 FOR UPDATE"]
   end
 end
+
+describe "Model#schema_type_class" do
+  specify "should return the class or array of classes for the given type symbol" do
+    @c = Class.new(Sequel::Model(:items))
+    @c.class_eval{@db_schema = {:id=>{:type=>:integer}}}
+    @c.new.send(:schema_type_class, :id).should == Integer
+  end
+end