sequel 3.46.0 → 3.47.0

data/spec/integration/associations_test.rb

@@ -6,7 +6,7 @@ shared_examples_for "eager limit strategies" do
     Artist.one_to_one  :last_album, {:clone=>:last_album}.merge(@els) if @els
     @album.update(:artist => @artist)
     diff_album = @diff_album.call
-    al, ar, t = @pr.call
+    ar = @pr.call[1]
     
     a = Artist.eager(:first_album, :last_album).order(:name).all
     a.should == [@artist, ar]
@@ -33,7 +33,7 @@ shared_examples_for "eager limit strategies" do
     @album.update(:artist => @artist)
     middle_album = @middle_album.call
     diff_album = @diff_album.call
-    al, ar, t = @pr.call
+    ar = @pr.call[1]
     
     ars = Artist.eager(:first_two_albums, :second_two_albums, :last_two_albums).order(:name).all
     ars.should == [@artist, ar]
@@ -58,7 +58,7 @@ shared_examples_for "eager limit strategies" do
     Album.many_to_many :second_two_tags, {:clone=>:second_two_tags}.merge(@els) if @els
     Album.many_to_many :last_two_tags, {:clone=>:last_two_tags}.merge(@els) if @els
     tu, tv = @other_tags.call
-    al, ar, t = @pr.call
+    al = @pr.call.first
     
     als = Album.eager(:first_two_tags, :second_two_tags, :last_two_tags).order(:name).all
     als.should == [@album, al]
@@ -84,7 +84,7 @@ shared_examples_for "eager limit strategies" do
     Artist.many_through_many :last_two_tags, {:clone=>:last_two_tags}.merge(@els) if @els
     @album.update(:artist => @artist)
     tu, tv = @other_tags.call
-    al, ar, t = @pr.call
+    ar = @pr.call[1]
     
     ars = Artist.eager(:first_two_tags, :second_two_tags, :last_two_tags).order(:name).all
     ars.should == [@artist, ar]
@@ -229,7 +229,7 @@ shared_examples_for "filtering/excluding by associations" do
     @album.add_tag(@tag)
     @Album.filter(:tags=>@tag).all.should == [@album]
     @Album.filter(:alias_tags=>@tag).all.should == [@album]
-    album, artist, tag = @pr.call
+    album, tag = @pr.call.values_at(0, 2)
     @Album.exclude(:tags=>@tag).all.should == [album]
     @Album.exclude(:alias_tags=>@tag).all.should == [album]
     @Album.exclude(:tags=>tag).all.sort_by{|x| x.pk}.should == [@album, album]

data/spec/integration/eager_loader_test.rb

@@ -330,71 +330,50 @@ describe "Polymorphic Associations" do
     end
     class ::Asset < Sequel::Model
       m = method(:constantize)
-      many_to_one :attachable, :reciprocal=>:assets, \
+      many_to_one :attachable, :reciprocal=>:assets,
+        :setter=>(proc do |attachable|
+          self[:attachable_id] = (attachable.pk if attachable)
+          self[:attachable_type] = (attachable.class.name if attachable)
+        end),
         :dataset=>(proc do
           klass = m.call(attachable_type)
           klass.where(klass.primary_key=>attachable_id)
-        end), \
+        end),
         :eager_loader=>(proc do |eo|
           id_map = {}
           eo[:rows].each do |asset|
             asset.associations[:attachable] = nil 
             ((id_map[asset.attachable_type] ||= {})[asset.attachable_id] ||= []) << asset
           end 
-          id_map.each do |klass_name, id_map|
+          id_map.each do |klass_name, idmap|
             klass = m.call(klass_name)
-            klass.where(klass.primary_key=>id_map.keys).all do |attach|
-              id_map[attach.pk].each do |asset|
+            klass.where(klass.primary_key=>idmap.keys).all do |attach|
+              idmap[attach.pk].each do |asset|
                 asset.associations[:attachable] = attach
               end 
             end 
           end 
         end)
-            
-      private
-
-      def _attachable=(attachable)
-        self[:attachable_id] = (attachable.pk if attachable)
-        self[:attachable_type] = (attachable.class.name if attachable)
-      end 
     end 
   
     INTEGRATION_DB.create_table!(:posts) do
       primary_key :id
     end
     class ::Post < Sequel::Model
-      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable, :conditions=>{:attachable_type=>'Post'}
-      
-      private
-
-      def _add_asset(asset)
-        asset.update(:attachable_id=>pk, :attachable_type=>'Post')
-      end
-      def _remove_asset(asset)
-        asset.update(:attachable_id=>nil, :attachable_type=>nil)
-      end
-      def _remove_all_assets
-        assets_dataset.update(:attachable_id=>nil, :attachable_type=>nil)
-      end
+      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable, :conditions=>{:attachable_type=>'Post'},
+        :adder=>proc{|asset| asset.update(:attachable_id=>pk, :attachable_type=>'Post')},
+        :remover=>proc{|asset| asset.update(:attachable_id=>nil, :attachable_type=>nil)},
+        :clearer=>proc{assets_dataset.update(:attachable_id=>nil, :attachable_type=>nil)}
     end 
   
     INTEGRATION_DB.create_table!(:notes) do
       primary_key :id
     end
     class ::Note < Sequel::Model
-      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable, :conditions=>{:attachable_type=>'Note'}     
-
-      private
-
-      def _add_asset(asset)
-        asset.update(:attachable_id=>pk, :attachable_type=>'Note')
-      end
-      def _remove_asset(asset)
-        asset.update(:attachable_id=>nil, :attachable_type=>nil)
-      end
-      def _remove_all_assets
-        assets_dataset.update(:attachable_id=>nil, :attachable_type=>nil)
-      end
+      one_to_many :assets, :key=>:attachable_id, :reciprocal=>:attachable, :conditions=>{:attachable_type=>'Note'},     
+        :adder=>proc{|asset| asset.update(:attachable_id=>pk, :attachable_type=>'Note')},
+        :remover=>proc{|asset| asset.update(:attachable_id=>nil, :attachable_type=>nil)},
+        :clearer=>proc{assets_dataset.update(:attachable_id=>nil, :attachable_type=>nil)}
     end
   end
   before do
@@ -475,8 +454,17 @@ describe "many_to_one/one_to_many not referencing primary key" do
       String :name
     end
     class ::Client < Sequel::Model
-      one_to_many :invoices, :reciprocal=>:client, \
-        :dataset=>proc{Invoice.filter(:client_name=>name)}, \
+      one_to_many :invoices, :reciprocal=>:client,
+        :adder=>(proc do |invoice|
+          invoice.client_name = name
+          invoice.save
+        end),
+        :remover=>(proc do |invoice|
+          invoice.client_name = nil
+          invoice.save
+        end),
+        :clearer=>proc{invoices_dataset.update(:client_name=>nil)},
+        :dataset=>proc{Invoice.filter(:client_name=>name)},
         :eager_loader=>(proc do |eo|
           id_map = {}
           eo[:rows].each do |client|
@@ -488,20 +476,6 @@ describe "many_to_one/one_to_many not referencing primary key" do
             client.associations[:invoices] << inv 
           end 
         end)
-
-      private
-
-      def _add_invoice(invoice)
-        invoice.client_name = name
-        invoice.save
-      end
-      def _remove_invoice(invoice)
-        invoice.client_name = nil
-        invoice.save
-      end
-      def _remove_all_invoices
-        Invoice.filter(:client_name=>name).update(:client_name=>nil)
-      end
     end 
   
     INTEGRATION_DB.create_table!(:invoices) do
@@ -509,8 +483,9 @@ describe "many_to_one/one_to_many not referencing primary key" do
       String :client_name
     end
     class ::Invoice < Sequel::Model
-      many_to_one :client, :key=>:client_name, \
-        :dataset=>proc{Client.filter(:name=>client_name)}, \
+      many_to_one :client, :key=>:client_name,
+        :setter=>proc{|client| self.client_name = (client.name if client)},
+        :dataset=>proc{Client.filter(:name=>client_name)},
         :eager_loader=>(proc do |eo|
           id_map = eo[:id_map]
           eo[:rows].each{|inv| inv.associations[:client] = nil}
@@ -518,12 +493,6 @@ describe "many_to_one/one_to_many not referencing primary key" do
             id_map[client.name].each{|inv| inv.associations[:client] = client}
           end 
         end)
-      
-      private
-
-      def _client=(client)
-        self.client_name = (client.name if client)
-      end
     end
   end
   before do
@@ -596,7 +565,7 @@ describe "many_to_one/one_to_many not referencing primary key" do
   end
 
   it "should remove all associated objects correctly" do
-    invs = @client1.remove_all_invoices
+    @client1.remove_all_invoices
     @invoice1.refresh.client.should == nil
     @invoice1.client_name.should == nil
     @invoice2.refresh.client.should == nil

data/spec/integration/model_test.rb

@@ -159,12 +159,12 @@ describe "Sequel::Model basic support" do
   end
 
   specify ".to_hash should return a hash keyed on primary key if no argument provided" do
-    i = Item.create(:name=>'J')
+    Item.create(:name=>'J')
     Item.to_hash.should == {1=>Item.load(:id=>1, :name=>'J')}
   end
   
   specify ".to_hash should return a hash keyed on argument if one argument provided" do
-    i = Item.create(:name=>'J')
+    Item.create(:name=>'J')
     Item.to_hash(:name).should == {'J'=>Item.load(:id=>1, :name=>'J')}
   end
   

data/spec/integration/plugin_test.rb

@@ -429,14 +429,12 @@ describe "Lazy Attributes plugin" do
   
   specify "should load lazy attribute for all items returned when accessing any item if using identity map " do
     Item.create(:name=>'K', :num=>2)
-    Item.with_identity_map do
-      a = Item.order(:name).all
-      a.should == [Item.load(:id=>1, :name=>'J'), Item.load(:id=>2, :name=>'K')]
-      a.map{|x| x[:num]}.should == [nil, nil]
-      a.first.num.should == 1
-      a.map{|x| x[:num]}.should == [1, 2]
-      a.last.num.should == 2
-    end
+    a = Item.order(:name).all
+    a.should == [Item.load(:id=>1, :name=>'J'), Item.load(:id=>2, :name=>'K')]
+    a.map{|x| x[:num]}.should == [nil, nil]
+    a.first.num.should == 1
+    a.map{|x| x[:num]}.should == [1, 2]
+    a.last.num.should == 2
   end
 end
 
@@ -1879,20 +1877,23 @@ describe "Sequel::Plugins::ConstraintValidations" do
     @db.create_constraint_validations_table
     @ds = @db[:cv_test]
     @regexp = regexp = @db.dataset.supports_regexp?
-    @validate_block = proc do
-      presence :pre, :name=>:p
-      exact_length 5, :exactlen, :name=>:el
-      min_length 5, :minlen, :name=>:minl
-      max_length 5, :maxlen, :name=>:maxl
-      length_range 3..5, :lenrange, :name=>:lr
+    @validation_opts = {}
+    opts_proc = proc{@validation_opts}
+    @validate_block = proc do |opts|
+      opts = opts_proc.call
+      presence :pre, opts.merge(:name=>:p)
+      exact_length 5, :exactlen, opts.merge(:name=>:el)
+      min_length 5, :minlen, opts.merge(:name=>:minl)
+      max_length 5, :maxlen, opts.merge(:name=>:maxl)
+      length_range 3..5, :lenrange, opts.merge(:name=>:lr)
       if regexp
-        format /^foo\d+/, :form, :name=>:f
+        format(/^foo\d+/, :form, opts.merge(:name=>:f))
       end
-      like 'foo%', :lik, :name=>:l
-      ilike 'foo%', :ilik, :name=>:il
-      includes %w'abc def', :inc, :name=>:i
-      unique :uniq, :name=>:u
-      max_length 6, :minlen, :name=>:maxl2
+      like 'foo%', :lik, opts.merge(:name=>:l)
+      ilike 'foo%', :ilik, opts.merge(:name=>:il)
+      includes %w'abc def', :inc, opts.merge(:name=>:i)
+      unique :uniq, opts.merge(:name=>:u)
+      max_length 6, :minlen, opts.merge(:name=>:maxl2)
     end
     @valid_row = {:pre=>'a', :exactlen=>'12345', :minlen=>'12345', :maxlen=>'12345', :lenrange=>'1234', :lik=>'fooabc', :ilik=>'FooABC', :inc=>'abc', :uniq=>'u'}
     @violations = [
@@ -1927,6 +1928,7 @@ describe "Sequel::Plugins::ConstraintValidations" do
         try = @valid_row.dup
         vals += ['1234567'] if col == :minlen
         vals.each do |val|
+          next if val.nil? && @validation_opts[:allow_nil]
           try[col] = val
           proc{@ds.insert(try)}.should raise_error(Sequel::DatabaseError)
         end
@@ -1950,32 +1952,36 @@ describe "Sequel::Plugins::ConstraintValidations" do
       @violations.each do |col, vals|
         try = @valid_row.dup
         vals.each do |val|
+          next if val.nil? && @validation_opts[:allow_nil]
           try[col] = val
           c.new(try).should_not be_valid
         end
       end
+      c.db.constraint_validations = nil
     end
   end
 
   describe "via create_table" do
     before(:all) do
-      regexp = @regexp
-      validate_block = @validate_block
-      @db.create_table!(:cv_test) do
-        primary_key :id
-        String :pre
-        String :exactlen
-        String :minlen
-        String :maxlen
-        String :lenrange
-        if regexp
-          String :form
+      @table_block = proc do
+        regexp = @regexp
+        validate_block = @validate_block
+        @db.create_table!(:cv_test) do
+          primary_key :id
+          String :pre
+          String :exactlen
+          String :minlen
+          String :maxlen
+          String :lenrange
+          if regexp
+            String :form
+          end
+          String :lik
+          String :ilik
+          String :inc
+          String :uniq, :null=>false
+          validate(&validate_block)
         end
-        String :lik
-        String :ilik
-        String :inc
-        String :uniq, :null=>false
-        validate(&validate_block)
       end
     end
     after(:all) do
@@ -1983,30 +1989,44 @@ describe "Sequel::Plugins::ConstraintValidations" do
       @db.drop_constraint_validations_for(:table=>:cv_test)
     end
 
-    it_should_behave_like "constraint validations"
+    describe "with :allow_nil=>true" do
+      before(:all) do
+        @validation_opts = {:allow_nil=>true}
+        @table_block.call
+      end
+      it_should_behave_like "constraint validations"
+    end
+    describe "with :allow_nil=>false" do
+      before(:all) do
+        @table_block.call
+      end
+      it_should_behave_like "constraint validations"
+    end
   end
 
   describe "via alter_table" do
     before(:all) do
-      regexp = @regexp
-      validate_block = @validate_block
-      @db.create_table!(:cv_test) do
-        primary_key :id
-        String :lik
-        String :ilik
-        String :inc
-        String :uniq, :null=>false
-      end
-      @db.alter_table(:cv_test) do
-        add_column :pre, String
-        add_column :exactlen, String
-        add_column :minlen, String
-        add_column :maxlen, String
-        add_column :lenrange, String
-        if regexp
-          add_column :form, String
+      @table_block = proc do
+        regexp = @regexp
+        validate_block = @validate_block
+        @db.create_table!(:cv_test) do
+          primary_key :id
+          String :lik
+          String :ilik
+          String :inc
+          String :uniq, :null=>false
+        end
+        @db.alter_table(:cv_test) do
+          add_column :pre, String
+          add_column :exactlen, String
+          add_column :minlen, String
+          add_column :maxlen, String
+          add_column :lenrange, String
+          if regexp
+            add_column :form, String
+          end
+          validate(&validate_block)
         end
-        validate(&validate_block)
       end
     end
     after(:all) do
@@ -2014,7 +2034,19 @@ describe "Sequel::Plugins::ConstraintValidations" do
       @db.drop_constraint_validations_for(:table=>:cv_test)
     end
 
-    it_should_behave_like "constraint validations"
+    describe "with :allow_nil=>true" do
+      before(:all) do
+        @validation_opts = {:allow_nil=>true}
+        @table_block.call
+      end
+      it_should_behave_like "constraint validations"
+    end
+    describe "with :allow_nil=>false" do
+      before(:all) do
+        @table_block.call
+      end
+      it_should_behave_like "constraint validations"
+    end
   end
 end
 

data/spec/integration/prepared_statement_test.rb

@@ -350,7 +350,7 @@ describe "Dataset#unbind" do
       end
       ds.insert(:c=>v)
     end
-    @u = proc{|ds| ds, bv = ds.unbind; ds.call(:first, bv)}
+    @u = proc{|ds1| ds2, bv = ds1.unbind; ds2.call(:first, bv)}
   end
   after do
     INTEGRATION_DB.drop_table?(:items)

data/spec/integration/schema_test.rb

@@ -146,7 +146,7 @@ describe "Database schema parser" do
     INTEGRATION_DB.create_table!(:items){FalseClass :number}
     INTEGRATION_DB.schema(:items).first.last[:type].should == :boolean
   end
-end if INTEGRATION_DB.respond_to?(:schema_parse_table, true)
+end if INTEGRATION_DB.supports_schema_parsing?
 
 test_indexes = begin
   INTEGRATION_DB.drop_table?(:blah)

data/spec/integration/timezone_test.rb

@@ -2,7 +2,6 @@ require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper.rb')
 
 describe "Sequel timezone support" do
   def test_timezone(timezone=Sequel.application_timezone)
-    tz = timezone
     Sequel.datetime_class = Time
     # Tests should cover both DST and non-DST times.
     [Time.now, Time.local(2010,1,1,12), Time.local(2010,6,1,12)].each do |t|

data/spec/integration/transaction_test.rb

@@ -114,7 +114,6 @@ describe "Database transactions" do
       transaction do
         self[:items] << {:name => 'abc'}
         return
-        self[:items] << {:name => 'd'}
       end
     end