sequel 3.46.0 → 3.47.0

data/spec/extensions/pg_typecast_on_load_spec.rb

@@ -18,12 +18,17 @@ describe Sequel::Model, "PgTypecastOnLoad plugin" do
     @c.first.refresh.values.should == {:id=>1, :b=>true, :y=>0}
   end
 
+  specify "should not fail if schema oid does not have a related conversion proc" do
+    @c.db_schema[:b][:oid] = 0
+    @c.first.refresh.values.should == {:id=>1, :b=>"t", :y=>0}
+  end
+
   specify "should call the database conversion proc with value when automatically reloading the object on creation via insert_select" do
     @c.dataset.meta_def(:insert_select){|h| insert(h); first}
     @c.create.values.should == {:id=>1, :b=>true, :y=>0}
   end
 
-  specify "should allowing setting columns separately via add_typecast_on_load_columns" do
+  specify "should allowing setting columns separately via add_pg_typecast_on_load_columns" do
     @c = Class.new(Sequel::Model(@db[:items]))
     @c.plugin :pg_typecast_on_load
     @c.first.values.should == {:id=>1, :b=>"t", :y=>"0"}

data/spec/extensions/prepared_statements_associations_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-describe "Sequel::Plugins::AssociationPks" do
+describe "Sequel::Plugins::PreparedStatementsAssociations" do
   before do
     @db = Sequel.mock
     @db.extend_datasets do

data/spec/extensions/query_literals_spec.rb

@@ -34,7 +34,7 @@ describe "query_literals extension" do
       @ds.select_more('a, b, c').sql.should == 'SELECT d, a, b, c FROM t'
     end
 
-    it "should have #select_ use placeholder literal string if given a string and additional arguments" do
+    it "should have #select_more use placeholder literal string if given a string and additional arguments" do
       @ds.select_more('a, b, ?', 1).sql.should == 'SELECT d, a, b, 1 FROM t'
     end
 

data/spec/extensions/rcte_tree_spec.rb

@@ -144,7 +144,7 @@ describe Sequel::Model, "rcte_tree" do
       [{:id=>2, :name=>'AA', :parent_id=>1, :x_root_x=>2},
        {:id=>1, :name=>'00', :parent_id=>8, :x_root_x=>1}, {:id=>1, :name=>'00', :parent_id=>8, :x_root_x=>2},
        {:id=>8, :name=>'?', :parent_id=>nil, :x_root_x=>2}, {:id=>8, :name=>'?', :parent_id=>nil, :x_root_x=>1}]]
-    os = @ds.eager(:ancestors).all
+    @ds.eager(:ancestors).all
     sqls = MODEL_DB.sqls
     sqls.first.should == "SELECT * FROM nodes"
     sqls.last.should =~ /WITH t AS \(SELECT id AS x_root_x, nodes\.\* FROM nodes WHERE \(\(id IN \([12], [12]\)\) AND \(i = 1\)\) UNION ALL SELECT t\.x_root_x, nodes\.\* FROM nodes INNER JOIN t ON \(t\.parent_id = nodes\.id\) WHERE \(i = 1\)\) SELECT \* FROM t AS nodes WHERE \(i = 1\)/
@@ -236,7 +236,7 @@ describe Sequel::Model, "rcte_tree" do
       [{:id=>6, :parent_id=>2, :name=>'C', :x_root_x=>2}, {:id=>9, :parent_id=>2, :name=>'E', :x_root_x=>2},
        {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>6}, {:id=>3, :name=>'00', :parent_id=>6, :x_root_x=>2},
        {:id=>4, :name=>'?', :parent_id=>7, :x_root_x=>7}, {:id=>5, :name=>'?', :parent_id=>4, :x_root_x=>7}]]
-    os = @ds.eager(:descendants).all
+    @ds.eager(:descendants).all
     sqls = MODEL_DB.sqls
     sqls.first.should == "SELECT * FROM nodes"
     sqls.last.should =~ /WITH t AS \(SELECT parent_id AS x_root_x, nodes\.\* FROM nodes WHERE \(\(parent_id IN \([267], [267], [267]\)\) AND \(i = 1\)\) UNION ALL SELECT t\.x_root_x, nodes\.\* FROM nodes INNER JOIN t ON \(t\.id = nodes\.parent_id\) WHERE \(i = 1\)\) SELECT \* FROM t AS nodes WHERE \(i = 1\)/

data/spec/extensions/schema_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-describe Sequel::Model, "dataset & schema" do
+describe Sequel::Model, "set_schema" do
   before do
     @model = Class.new(Sequel::Model(:items))
     @model.plugin :schema
@@ -8,7 +8,7 @@ describe Sequel::Model, "dataset & schema" do
 
   specify "sets schema with implicit table name" do
     @model.set_schema do
-      primary_key :ssn, :string
+      primary_key :ssn, :type=>:string
     end
     @model.primary_key.should == :ssn
     @model.table_name.should == :items

data/spec/extensions/serialization_modification_detection_spec.rb

@@ -69,4 +69,12 @@ describe "serialization_modification_detection plugin" do
     @o4.save
     @o4.changed_columns.should == []
   end
+
+  it "should work with frozen objects" do
+    @o1.changed_columns.should == []
+    @o1.h.should == {}
+    @o1.freeze
+    @o1.h[1] = 2
+    @o1.changed_columns.should == [:h]
+  end
 end

data/spec/extensions/serialization_spec.rb

@@ -76,7 +76,6 @@ describe "Serialization plugin" do
   it "should translate values to and from yaml serialization format using accessor methods" do
     @c.set_primary_key :id
     @c.plugin :serialization, :yaml, :abc, :def
-    vals = nil
     @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
 
     o = @c.first
@@ -290,4 +289,19 @@ describe "Serialization plugin" do
     o = @c.load(:abc => 3)
     o.abc.should == 9
   end
+
+  it "should work correctly with frozen instances" do
+    @c.set_primary_key :id
+    @c.plugin :serialization, :yaml, :abc, :def
+    @c.dataset._fetch = {:id => 1, :abc => "--- 1\n", :def => "--- hello\n"}
+
+    o = @c.first
+    o.freeze
+    o.abc.should == 1
+    o.abc.should == 1
+    o.def.should == "hello"
+    o.def.should == "hello"
+    proc{o.abc = 2}.should raise_error
+    proc{o.def = 'h'}.should raise_error
+  end
 end

data/spec/extensions/sharding_spec.rb

@@ -161,7 +161,7 @@ describe "sharding plugin" do
   end 
 
   specify "should not override a server already set on an associated object" do
-    album = @Album.server(:s1).first
+    @Album.server(:s1).first
     artist = @Artist.server(:s2).first
     @db.sqls.should == ["SELECT * FROM albums LIMIT 1 -- s1", "SELECT * FROM artists LIMIT 1 -- s2"]
 

data/spec/extensions/single_table_inheritance_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
-describe Sequel::Model, "#sti_key" do
+describe Sequel::Model, "single table inheritance plugin" do
   before do
     class ::StiTest < Sequel::Model
       columns :id, :kind, :blah

data/spec/extensions/static_cache_spec.rb

@@ -67,13 +67,27 @@ describe "Sequel::Plugins::StaticCache" do
     @db.sqls.should == []
   end
 
-  it "should have map send a query if given an argument" do
+  it "should have count with no argument or block not issue a query" do
+    @c.count.should == 2
+    @db.sqls.should == []
+  end
+
+  it "should have count with argument or block not issue a query" do
+    @db.fetch = [[{:count=>1}], [{:count=>2}]]
+    @c.count(:a).should == 1
+    @c.count{b}.should == 2
+    @db.sqls.should == ["SELECT COUNT(a) AS count FROM t LIMIT 1", "SELECT COUNT(b) AS count FROM t LIMIT 1"]
+  end
+
+  it "should have map not send a query if given an argument" do
     @c.map(:id).sort.should == [1, 2]
-    @db.sqls.should == ["SELECT * FROM t"]
+    @db.sqls.should == []
+    @c.map([:id,:id]).sort.should == [[1,1], [2,2]]
+    @db.sqls.should == []
   end
 
   it "should have map without a block or argument not raise an exception or issue a query" do
-    @c.map
+    @c.map.to_a.should == @c.all
     @db.sqls.should == []
   end
 
@@ -81,6 +95,10 @@ describe "Sequel::Plugins::StaticCache" do
     @c.map.frozen?.should be_false
   end
 
+  it "should have map with a block and argument raise" do
+    proc{@c.map(:id){}}.should raise_error(Sequel::Error)
+  end
+
   it "should have other enumerable methods work without sending a query" do
     a = @c.sort_by{|o| o.id}
     a.first.should equal(@c1)
@@ -88,7 +106,7 @@ describe "Sequel::Plugins::StaticCache" do
     @db.sqls.should == []
   end
 
-  it "should have all just return the hashes' values" do
+  it "should have all just return the cached values" do
     a = @c.all.sort_by{|o| o.id}
     a.first.should equal(@c1)
     a.last.should equal(@c2)
@@ -105,22 +123,54 @@ describe "Sequel::Plugins::StaticCache" do
 
   it "should have to_hash without arguments return the cached objects without a query" do
     a = @c.to_hash
+    a.should == {1=>@c1, 2=>@c2}
     a[1].should equal(@c1)
     a[2].should equal(@c2)
     @db.sqls.should == []
   end
 
-  it "should have to_hash with any arguments use a query" do
-    @c.to_hash(:id).should == {1=>@c1, 2=>@c2}
-    @db.sqls.should == ['SELECT * FROM t']
+  it "should have to_hash with arguments return the cached objects without a query" do
+    a = @c.to_hash(:id)
+    a.should == {1=>@c1, 2=>@c2}
+    a[1].should equal(@c1)
+    a[2].should equal(@c2)
+
+    a = @c.to_hash([:id])
+    a.should == {[1]=>@c1, [2]=>@c2}
+    a[[1]].should equal(@c1)
+    a[[2]].should equal(@c2)
+
     @c.to_hash(:id, :id).should == {1=>1, 2=>2}
-    @db.sqls.should == ['SELECT * FROM t']
+    @c.to_hash([:id], :id).should == {[1]=>1, [2]=>2}
+    @c.to_hash(:id, [:id]).should == {1=>[1], 2=>[2]}
+    @c.to_hash([:id], [:id]).should == {[1]=>[1], [2]=>[2]}
+
+    @db.sqls.should == []
   end
 
-  it "should have all not return a frozen object" do
+  it "should have to_hash not return a frozen object" do
     @c.to_hash.frozen?.should be_false
   end
 
+  it "should have to_hash_groups without arguments return the cached objects without a query" do
+    a = @c.to_hash_groups(:id)
+    a.should == {1=>[@c1], 2=>[@c2]}
+    a[1].first.should equal(@c1)
+    a[2].first.should equal(@c2)
+
+    a = @c.to_hash_groups([:id])
+    a.should == {[1]=>[@c1], [2]=>[@c2]}
+    a[[1]].first.should equal(@c1)
+    a[[2]].first.should equal(@c2)
+
+    @c.to_hash_groups(:id, :id).should == {1=>[1], 2=>[2]}
+    @c.to_hash_groups([:id], :id).should == {[1]=>[1], [2]=>[2]}
+    @c.to_hash_groups(:id, [:id]).should == {1=>[[1]], 2=>[[2]]}
+    @c.to_hash_groups([:id], [:id]).should == {[1]=>[[1]], [2]=>[[2]]}
+
+    @db.sqls.should == []
+  end
+
   it "all of the static cache values (model instances) should be frozen" do
     @c.all.all?{|o| o.frozen?}.should be_true
   end

data/spec/extensions/tactical_eager_loading_spec.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Sequel::Plugins::TacticalEagerLoading" do
   before do
-    class ::TaticalEagerLoadingModel < Sequel::Model
+    class ::TacticalEagerLoadingModel < Sequel::Model
       plugin :tactical_eager_loading
       columns :id, :parent_id
       many_to_one :parent, :class=>self
@@ -10,6 +10,8 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
       dataset._fetch = proc do |sql|
         if sql !~ /WHERE/
           [{:id=>1, :parent_id=>101}, {:id=>2, :parent_id=>102}, {:id=>101, :parent_id=>nil}, {:id=>102, :parent_id=>nil}]
+        elsif sql =~ /WHERE.*\bid = (\d+)/
+          [{:id=>$1.to_i, :parent_id=>nil}]
         elsif sql =~ /WHERE.*\bid IN \(([\d, ]*)\)/
           $1.split(', ').map{|x| {:id=>x.to_i, :parent_id=>nil}}
         elsif sql =~ /WHERE.*\bparent_id IN \(([\d, ]*)\)/
@@ -17,12 +19,12 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
         end
       end
     end
-    @c = ::TaticalEagerLoadingModel
-    @ds = TaticalEagerLoadingModel.dataset
+    @c = ::TacticalEagerLoadingModel
+    @ds = TacticalEagerLoadingModel.dataset
     MODEL_DB.reset
   end
   after do
-    Object.send(:remove_const, :TaticalEagerLoadingModel)
+    Object.send(:remove_const, :TacticalEagerLoadingModel)
   end
 
   it "Dataset#all should set the retrieved_by and retrieved_with attributes" do
@@ -60,4 +62,17 @@ describe "Sequel::Plugins::TacticalEagerLoading" do
     @c.all{|x| x.parent2 if x.is_a?(c)}
   end
 
+  it "association getter methods should not eagerly load the association if an instance is frozen" do
+    ts = @c.all
+    ts.first.freeze
+    MODEL_DB.sqls.length.should == 1
+    ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
+    MODEL_DB.sqls.length.should == 2
+    ts.map{|x| x.children}.should == [[], [], [ts[0]], [ts[1]]]
+    MODEL_DB.sqls.length.should == 2
+    ts.map{|x| x.parent}.should == [ts[2], ts[3], nil, nil]
+    MODEL_DB.sqls.length.should == 1
+    ts.map{|x| x.children}.should == [[], [], [ts[0]], [ts[1]]]
+    MODEL_DB.sqls.length.should == 1
+  end
 end

data/spec/extensions/update_primary_key_spec.rb

@@ -7,7 +7,6 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
     @c.columns :a, :b
     @c.set_primary_key :a
     @c.unrestrict_primary_key
-    @o = @c.new
     @ds = @c.dataset
     MODEL_DB.reset
   end
@@ -68,4 +67,21 @@ describe "Sequel::Plugins::UpdatePrimaryKey" do
     @c.all.should == [@c.load(:a=>2, :b=>5)]
     MODEL_DB.sqls.should == ["SELECT * FROM a LIMIT 1", "UPDATE a SET a = 2 WHERE (a = 1)", "UPDATE a SET b = 4 WHERE (a = 2)", "UPDATE a SET b = 5 WHERE (a = 2)", "SELECT * FROM a"]
   end
+
+  specify "should clear the associations cache of non-many_to_one associations when changing the primary key" do
+    @c.one_to_many :cs, :class=>@c
+    @c.many_to_one :c, :class=>@c
+    o = @c.new(:a=>1)
+    o.associations[:cs] = @c.new
+    o.associations[:c] = o2 = @c.new
+    o.a = 2
+    o.associations.should == {:c=>o2}
+  end
+
+  specify "should handle frozen instances" do
+    o = @c.new
+    o.a = 1
+    o.freeze
+    o.pk_hash.should == {:a=>1}
+  end
 end

data/spec/extensions/validation_class_methods_spec.rb

@@ -799,6 +799,31 @@ describe Sequel::Model, "Validations" do
     @person.should be_valid
   end
   
+  it "should validate that a column has the correct type for the schema column" do
+    p = model_class.call Sequel::Model do
+      columns :age, :d
+      self.raise_on_typecast_failure = false
+      validates_schema_type :age
+      validates_schema_type :d, :message=>'is a bad choice'
+      @db_schema = {:age=>{:type=>:integer}, :d=>{:type=>:date}}
+    end
+    
+    @person = p.new
+    @person.should be_valid
+
+    @person.age = 'a'
+    @person.should_not be_valid
+    @person.errors.full_messages.should == ['age is not a valid integer']
+    @person.age = 1
+    @person.should be_valid
+
+    @person.d = 'a'
+    @person.should_not be_valid
+    @person.errors.full_messages.should == ['d is a bad choice']
+    @person.d = Date.today
+    @person.should be_valid
+  end
+
   it "should validate numericality of column" do
     class ::Person < Sequel::Model
       validations.clear

data/spec/extensions/validation_helpers_spec.rb

@@ -247,6 +247,22 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.errors.full_messages.should == ['value is not a valid integer']
   end
 
+  specify "should support validates_schema_types" do
+    @c.set_validations{validates_schema_types}
+    @m.value = 123
+    @m.should be_valid
+    @m.value = '123'
+    @m.should be_valid
+    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a valid integer']
+
+    @c.set_validations{validates_schema_types(:value)}
+    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a valid integer']
+  end
+
   specify "should support validates_numeric" do
     @c.set_validations{validates_numeric(:value)}
     @m.value = 'blah'
@@ -279,29 +295,57 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.should be_valid
     @m.value = '123'
     @m.should_not be_valid
-    @m.errors.full_messages.should == ['value is not a Integer']
+    @m.errors.full_messages.should == ['value is not a valid integer']
     
     @c.set_validations{validates_type(:String, :value)}
     @m.value = '123'
     @m.should be_valid
     @m.value = 123
     @m.should_not be_valid
-    @m.errors.full_messages.should == ['value is not a String']
+    @m.errors.full_messages.should == ['value is not a valid string']
     
     @c.set_validations{validates_type('Integer', :value)}
     @m.value = 123
     @m.should be_valid
     @m.value = 123.05
     @m.should_not be_valid
-    @m.errors.full_messages.should == ['value is not a Integer']
+    @m.errors.full_messages.should == ['value is not a valid integer']
     
     @c.set_validations{validates_type(Integer, :value)}
     @m.value = nil
     @m.should be_valid
     @m.value = false
     @m.should_not be_valid
+    
+    @c.set_validations{validates_type([Integer, Float], :value)}
+    @m.value = nil
+    @m.should be_valid
+    @m.value = 1
+    @m.should be_valid
+    @m.value = 1.0
+    @m.should be_valid
+    @m.value = BigDecimal.new('1.0')
+    @m.should_not be_valid
+    @m.errors.full_messages.should == ['value is not a valid integer or float']
   end
 
+  specify "should support validates_not_null" do
+    @c.set_validations{validates_not_null(:value)}
+    @m.should_not be_valid
+    @m.value = ''
+    @m.should be_valid
+    @m.value = 1234
+    @m.should be_valid
+    @m.value = nil
+    @m.should_not be_valid
+    @m.value = true
+    @m.should be_valid
+    @m.value = false
+    @m.should be_valid
+    @m.value = Time.now
+    @m.should be_valid
+  end
+  
   specify "should support validates_presence" do
     @c.set_validations{validates_presence(:value)}
     @m.should_not be_valid
@@ -466,4 +510,16 @@ describe "Sequel::Plugins::ValidationHelpers" do
     m.should be_valid
     MODEL_DB.sqls.should == ["SELECT COUNT(*) AS count FROM items WHERE ((username = '2') AND (password = '1') AND (id != 3)) LIMIT 1"]
   end
+
+  it "should not attempt a database query if the underlying columns have validation errors" do
+    @c.columns(:id, :username, :password)
+    @c.set_dataset MODEL_DB[:items]
+    @c.set_validations{validates_not_string(:username); validates_unique([:username, :password])}
+    @c.dataset._fetch = {:v=>0}
+    
+    MODEL_DB.reset
+    m = @c.new(:username => "1", :password => "anothertest")
+    m.should_not be_valid
+    MODEL_DB.sqls.should == []
+  end
 end