sequel 4.47.0 → 4.48.0

data/spec/extensions/sequel_3_dataset_methods_spec.rb

@@ -2,7 +2,9 @@ require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
 
 describe "Dataset#to_csv" do
   before do
-    @ds = Sequel.mock(:fetch=>[{:a=>1, :b=>2, :c=>3}, {:a=>4, :b=>5, :c=>6}, {:a=>7, :b=>8, :c=>9}])[:items].columns(:a, :b, :c).extension(:sequel_3_dataset_methods)
+    deprecated do
+      @ds = Sequel.mock(:fetch=>[{:a=>1, :b=>2, :c=>3}, {:a=>4, :b=>5, :c=>6}, {:a=>7, :b=>8, :c=>9}])[:items].columns(:a, :b, :c).extension(:sequel_3_dataset_methods)
+    end
   end
   
   it "should format a CSV representation of the records" do
@@ -15,7 +17,7 @@ describe "Dataset#to_csv" do
 end
 
 describe "Dataset#[]=" do
-  it "should perform an update on the specified filter" do
+  deprecated "should perform an update on the specified filter" do
     db = Sequel.mock
     ds = db[:items].extension(:sequel_3_dataset_methods)
     ds[:a => 1] = {:x => 3}
@@ -26,7 +28,9 @@ end
 describe "Dataset#insert_multiple" do
   before do
     @db = Sequel.mock(:autoid=>2)
-    @ds = @db[:items].extension(:sequel_3_dataset_methods)
+    deprecated do
+      @ds = @db[:items].extension(:sequel_3_dataset_methods)
+    end
   end
   
   it "should insert all items in the supplied array" do
@@ -92,7 +96,7 @@ unless Sequel.mock.dataset.frozen?
 end
 
 describe "Dataset#set" do
-  it "should act as alias to #update" do
+  deprecated "should act as alias to #update" do
     db = Sequel.mock
     ds = db[:items].extension(:sequel_3_dataset_methods)
     ds.set({:x => 3})
@@ -101,13 +105,13 @@ describe "Dataset#set" do
 end
 
 describe "Sequel::Dataset#qualify_to_first_source" do
-  it "should qualify to the first source" do
+  deprecated "should qualify to the first source" do
     Sequel.mock.dataset.extension(:sequel_3_dataset_methods).from(:t).filter{a<b}.qualify_to_first_source.sql.must_equal 'SELECT t.* FROM t WHERE (t.a < t.b)'
   end
 end
 
 describe "Sequel::Dataset#qualify_to" do
-  it "should qualify to the given table" do
+  deprecated "should qualify to the given table" do
     Sequel.mock.dataset.extension(:sequel_3_dataset_methods).from(:t).filter{a<b}.qualify_to(:e).sql.must_equal 'SELECT e.* FROM t WHERE (e.a < e.b)'
   end
 end

data/spec/extensions/sequel_4_dataset_methods_spec.rb

@@ -0,0 +1,121 @@
+require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+
+describe "Dataset#and" do
+  before do
+    @dataset = Sequel.mock.dataset.from(:test).extension(:sequel_4_dataset_methods)
+    @d1 = @dataset.where(:x => 1)
+  end
+  
+  it "should add a WHERE filter if none exists" do
+    @dataset.and(:a => 1).sql.must_equal 'SELECT * FROM test WHERE (a = 1)'
+  end
+  
+  it "should add an expression to the where clause" do
+    @d1.and(:y => 2).sql.must_equal 'SELECT * FROM test WHERE ((x = 1) AND (y = 2))'
+  end
+  
+  it "should accept placeholder literal string filters" do
+    @d1.and(Sequel.lit('y > ?', 2)).sql.must_equal 'SELECT * FROM test WHERE ((x = 1) AND (y > 2))'
+  end
+
+  it "should accept expression filters" do
+    @d1.and(Sequel.expr(:yy) > 3).sql.must_equal 'SELECT * FROM test WHERE ((x = 1) AND (yy > 3))'
+  end
+      
+  it "should accept string filters with placeholders" do
+    @d1.extension(:auto_literal_strings).and('y > ?', 2).sql.must_equal 'SELECT * FROM test WHERE ((x = 1) AND (y > 2))'
+  end
+
+  it "should accept blocks passed to filter" do
+    @d1.and{yy > 3}.sql.must_equal 'SELECT * FROM test WHERE ((x = 1) AND (yy > 3))'
+  end
+  
+  it "should correctly add parens to give predictable results" do
+    @d1.or(:y => 2).and(:z => 3).sql.must_equal 'SELECT * FROM test WHERE (((x = 1) OR (y = 2)) AND (z = 3))'
+    @d1.and(:y => 2).or(:z => 3).sql.must_equal 'SELECT * FROM test WHERE (((x = 1) AND (y = 2)) OR (z = 3))'
+  end
+end
+
+describe "Dataset#exclude_where" do
+  before do
+    @dataset = Sequel.mock.dataset.from(:test).extension(:sequel_4_dataset_methods)
+  end
+
+  it "should correctly negate the expression and add it to the where clause" do
+    @dataset.exclude_where(:region=>'Asia').sql.must_equal "SELECT * FROM test WHERE (region != 'Asia')"
+    @dataset.exclude_where(:region=>'Asia').exclude_where(:region=>'NA').sql.must_equal "SELECT * FROM test WHERE ((region != 'Asia') AND (region != 'NA'))"
+  end
+
+  it "should affect the where clause even if having clause is already used" do
+    @dataset.group_and_count(:name).having{count > 2}.exclude_where(:region=>'Asia').sql.
+      must_equal "SELECT name, count(*) AS count FROM test WHERE (region != 'Asia') GROUP BY name HAVING (count > 2)"
+  end
+end
+
+describe "Dataset#interval" do
+  before do
+    @db = Sequel.mock(:fetch=>{:v => 1234}).extension(:sequel_4_dataset_methods)
+    @ds = @db[:test].freeze
+  end
+  
+  it "should generate the correct SQL statement" do
+    5.times do
+      @ds.interval(:stamp)
+      @db.sqls.must_equal ["SELECT (max(stamp) - min(stamp)) AS interval FROM test LIMIT 1"]
+    end
+
+    @ds.filter(Sequel.expr(:price) > 100).interval(:stamp)
+    @db.sqls.must_equal ["SELECT (max(stamp) - min(stamp)) AS interval FROM test WHERE (price > 100) LIMIT 1"]
+  end
+  
+  it "should use a subselect for the same conditions as count" do
+    ds = @ds.order(:stamp).limit(5)
+    5.times do
+      ds.interval(:stamp).must_equal 1234
+      @db.sqls.must_equal ['SELECT (max(stamp) - min(stamp)) AS interval FROM (SELECT * FROM test ORDER BY stamp LIMIT 5) AS t1 LIMIT 1']
+    end
+  end
+
+  it "should accept virtual row blocks" do
+    5.times do
+      @ds.interval{a(b)}
+      @db.sqls.must_equal ["SELECT (max(a(b)) - min(a(b))) AS interval FROM test LIMIT 1"]
+    end
+  end
+end
+
+describe "Dataset#range" do
+  before do
+    @db = Sequel.mock(:fetch=>{:v1 => 1, :v2 => 10}).extension(:sequel_4_dataset_methods)
+    @ds = @db[:test].freeze
+  end
+  
+  it "should generate a correct SQL statement" do
+    5.times do
+      @ds.range(:stamp)
+      @db.sqls.must_equal ["SELECT min(stamp) AS v1, max(stamp) AS v2 FROM test LIMIT 1"]
+    end
+
+    @ds.filter(Sequel.expr(:price) > 100).range(:stamp)
+    @db.sqls.must_equal ["SELECT min(stamp) AS v1, max(stamp) AS v2 FROM test WHERE (price > 100) LIMIT 1"]
+  end
+  
+  it "should return a range object" do
+    5.times do
+      @ds.range(:tryme).must_equal(1..10)
+    end
+  end
+  
+  it "should use a subselect for the same conditions as count" do
+    @ds.order(:stamp).limit(5).range(:stamp).must_equal(1..10)
+    @db.sqls.must_equal ['SELECT min(stamp) AS v1, max(stamp) AS v2 FROM (SELECT * FROM test ORDER BY stamp LIMIT 5) AS t1 LIMIT 1']
+  end
+  
+  it "should accept virtual row blocks" do
+    5.times do
+      @ds.range{a(b)}
+      @db.sqls.must_equal ["SELECT min(a(b)) AS v1, max(a(b)) AS v2 FROM test LIMIT 1"]
+    end
+  end
+end
+

data/spec/extensions/single_table_inheritance_spec.rb

@@ -90,7 +90,7 @@ describe Sequel::Model, "single table inheritance plugin" do
 
   it "should fallback to the main class if the sti_key field is empty or nil without calling constantize" do
     called = false
-    StiTest.meta_def(:constantize) do |s|
+    def StiTest.constantize(s)
       called = true
       Object
     end

data/spec/extensions/spec_helper.rb

@@ -28,13 +28,19 @@ rescue LoadError
   nil
 end
 
-Sequel.extension :meta_def
 Sequel.extension :core_refinements if RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby'
 
 def skip_warn(s)
   warn "Skipping test of #{s}" if ENV["SKIPPED_TEST_WARN"]
 end
 
+class Minitest::HooksSpec
+  # SEQUEL5: Replace with define_singleton_method
+  def meta_def(obj, name, &block)
+    (class << obj; self end).send(:define_method, name, &block)
+  end
+end
+
 # SEQUEL5: Remove
 output = Sequel::Deprecation.output
 Sequel::Deprecation.output = nil

data/spec/extensions/static_cache_spec.rb

@@ -113,35 +113,58 @@ describe "Sequel::Plugins::StaticCache" do
       @c.all.must_equal [@c1, @c2]
     end
 
-    it "should have to_hash without arguments run without a query" do
+    it "should have as_hash/to_hash without arguments run without a query" do
       a = @c.to_hash
       a.must_equal(1=>@c1, 2=>@c2)
       a[1].must_equal @c1
       a[2].must_equal @c2
+
+      a = @c.as_hash
+      a.must_equal(1=>@c1, 2=>@c2)
+      a[1].must_equal @c1
+      a[2].must_equal @c2
+      @db.sqls.must_equal []
+    end
+
+    it "should have as_hash handle :hash option" do
+      h = {}
+      a = @c.as_hash(nil, nil, :hash=>h)
+      a.must_be_same_as h
+      a.must_equal(1=>@c1, 2=>@c2)
+      a[1].must_equal @c1
+      a[2].must_equal @c2
+
+      h = {}
+      a = @c.as_hash(:id, nil, :hash=>h)
+      a.must_be_same_as h
+      a.must_equal(1=>@c1, 2=>@c2)
+      a[1].must_equal @c1
+      a[2].must_equal @c2
+
       @db.sqls.must_equal []
     end
 
-    it "should have to_hash with arguments return results without a query" do
-      a = @c.to_hash(:id)
+    it "should have as_hash with arguments return results without a query" do
+      a = @c.as_hash(:id)
       a.must_equal(1=>@c1, 2=>@c2)
       a[1].must_equal @c1
       a[2].must_equal @c2
 
-      a = @c.to_hash([:id])
+      a = @c.as_hash([:id])
       a.must_equal([1]=>@c1, [2]=>@c2)
       a[[1]].must_equal @c1
       a[[2]].must_equal @c2
 
-      @c.to_hash(:id, :id).must_equal(1=>1, 2=>2)
-      @c.to_hash([:id], :id).must_equal([1]=>1, [2]=>2)
-      @c.to_hash(:id, [:id]).must_equal(1=>[1], 2=>[2])
-      @c.to_hash([:id], [:id]).must_equal([1]=>[1], [2]=>[2])
+      @c.as_hash(:id, :id).must_equal(1=>1, 2=>2)
+      @c.as_hash([:id], :id).must_equal([1]=>1, [2]=>2)
+      @c.as_hash(:id, [:id]).must_equal(1=>[1], 2=>[2])
+      @c.as_hash([:id], [:id]).must_equal([1]=>[1], [2]=>[2])
 
       @db.sqls.must_equal []
     end
 
-    it "should have to_hash not return a frozen object" do
-      @c.to_hash.frozen?.must_equal false
+    it "should have as_hash not return a frozen object" do
+      @c.as_hash.frozen?.must_equal false
     end
 
     it "should have to_hash_groups without arguments return the cached objects without a query" do
@@ -163,10 +186,38 @@ describe "Sequel::Plugins::StaticCache" do
       @db.sqls.must_equal []
     end
 
+    it "should have to_hash_groups handle :hash option" do
+      h = {}
+      a = @c.to_hash_groups(:id, nil, :hash=>h)
+      a.must_be_same_as h
+      a.must_equal(1=>[@c1], 2=>[@c2])
+      a[1].first.must_equal @c1
+      a[2].first.must_equal @c2
+    end
+
+    it "should have as_hash_groups without arguments return the cached objects without a query" do
+      a = @c.to_hash_groups(:id)
+      a.must_equal(1=>[@c1], 2=>[@c2])
+      a[1].first.must_equal @c1
+      a[2].first.must_equal @c2
+
+      a = @c.to_hash_groups([:id])
+      a.must_equal([1]=>[@c1], [2]=>[@c2])
+      a[[1]].first.must_equal @c1
+      a[[2]].first.must_equal @c2
+
+      @c.to_hash_groups(:id, :id).must_equal(1=>[1], 2=>[2])
+      @c.to_hash_groups([:id], :id).must_equal([1]=>[1], [2]=>[2])
+      @c.to_hash_groups(:id, [:id]).must_equal(1=>[[1]], 2=>[[2]])
+      @c.to_hash_groups([:id], [:id]).must_equal([1]=>[[1]], [2]=>[[2]])
+
+      @db.sqls.must_equal []
+    end
+
     it "subclasses should work correctly" do
       c = Class.new(@c)
       c.all.must_equal [c.load(:id=>1), c.load(:id=>2)]
-      c.to_hash.must_equal(1=>c.load(:id=>1), 2=>c.load(:id=>2))
+      c.as_hash.must_equal(1=>c.load(:id=>1), 2=>c.load(:id=>2))
       @db.sqls.must_equal ['SELECT * FROM t']
     end
 
@@ -174,8 +225,8 @@ describe "Sequel::Plugins::StaticCache" do
       ds = @c.dataset.from(:t2).columns(:id).with_fetch(:id=>3)
       @c.dataset = ds
       @c.all.must_equal [@c.load(:id=>3)]
-      @c.to_hash.must_equal(3=>@c.load(:id=>3))
-      @c.to_hash[3].must_equal @c.all.first
+      @c.as_hash.must_equal(3=>@c.load(:id=>3))
+      @c.as_hash[3].must_equal @c.all.first
       @db.sqls.must_equal ['SELECT * FROM t2']
     end
   end
@@ -238,18 +289,18 @@ describe "Sequel::Plugins::StaticCache" do
       a.last.must_be_same_as(@c2)
     end
 
-    it "should have to_hash without arguments use cached instances" do
-      a = @c.to_hash
+    it "should have as_hash without arguments use cached instances" do
+      a = @c.as_hash
       a[1].must_be_same_as(@c1)
       a[2].must_be_same_as(@c2)
     end
 
-    it "should have to_hash with arguments return cached instances" do
-      a = @c.to_hash(:id)
+    it "should have as_hash with arguments return cached instances" do
+      a = @c.as_hash(:id)
       a[1].must_be_same_as(@c1)
       a[2].must_be_same_as(@c2)
 
-      a = @c.to_hash([:id])
+      a = @c.as_hash([:id])
       a[[1]].must_be_same_as(@c1)
       a[[2]].must_be_same_as(@c2)
     end
@@ -313,16 +364,16 @@ describe "Sequel::Plugins::StaticCache" do
       @c.map.all?{|o| !o.frozen?}.must_equal true
     end
 
-    it "none of values in the hash returned by to_hash without an argument should be frozen" do
-      @c.to_hash.values.all?{|o| !o.frozen?}.must_equal true
+    it "none of values in the hash returned by as_hash without an argument should be frozen" do
+      @c.as_hash.values.all?{|o| !o.frozen?}.must_equal true
     end
 
-    it "none of values in the hash returned by to_hash with a single argument should be frozen" do
-      @c.to_hash(:id).values.all?{|o| !o.frozen?}.must_equal true
+    it "none of values in the hash returned by as_hash with a single argument should be frozen" do
+      @c.as_hash(:id).values.all?{|o| !o.frozen?}.must_equal true
     end
 
-    it "none of values in the hash returned by to_hash with a single array argument should be frozen" do
-      @c.to_hash([:id, :id]).values.all?{|o| !o.frozen?}.must_equal true
+    it "none of values in the hash returned by as_hash with a single array argument should be frozen" do
+      @c.as_hash([:id, :id]).values.all?{|o| !o.frozen?}.must_equal true
     end
 
     it "none of values in the hash returned by to_hash_groups with a single argument should be frozen" do

data/spec/extensions/string_agg_spec.rb

@@ -48,7 +48,7 @@ describe "string_agg extension" do
   it "should correctly literalize on MySQL, H2, HSQLDB" do
     [:mysql, :h2, :hsqldb].each do |type|
       db = dbf.call(type)
-      db.meta_def(:database_type){type}
+      meta_def(db, :database_type){type}
       ds = db.dataset.with_quote_identifiers(false).with_extend{def input_identifier(v) v.to_s end}
       ds.literal(@sa1).upcase.must_equal "GROUP_CONCAT(C SEPARATOR ',')"
       ds.literal(@sa2).upcase.must_equal "GROUP_CONCAT(C SEPARATOR '-')"

data/spec/extensions/touch_spec.rb

@@ -67,6 +67,15 @@ describe "Touch plugin" do
       "UPDATE albums SET updated_at = CURRENT_TIMESTAMP WHERE (albums.artist_id = 1)"]
   end
 
+  it "should clear associations after touching them  :associations option" do
+    @Artist.plugin :touch, :associations=>:albums
+    @a.associations[:albums] = [@Album.call(:id=>1)]
+    @a.touch
+    @a.associations[:albums].must_be_nil
+    DB.sqls.must_equal ["UPDATE artists SET updated_at = CURRENT_TIMESTAMP WHERE (id = 1)",
+      "UPDATE albums SET updated_at = CURRENT_TIMESTAMP WHERE (albums.artist_id = 1)"]
+  end
+
   it "should be able to give an array to the :associations option specifying multiple associations" do
     @Album.plugin :touch, :associations=>[:artist, :followup_albums]
     @Album.load(:id=>4, :artist_id=>1).touch

data/spec/extensions/validation_helpers_spec.rb

@@ -18,6 +18,12 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.wont_be :valid?
     @m.value = '1_1'
     @m.must_be :valid?
+    o = String.new
+    class << o
+      undef_method :blank?
+    end
+    @m.value = o
+    @m.must_be :valid?
     o = Object.new
     @m.value = o
     @m.wont_be :valid?
@@ -248,17 +254,17 @@ describe "Sequel::Plugins::ValidationHelpers" do
     @m.must_be :valid?
     @m.value = '123'
     @m.must_be :valid?
-    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    def @m.db_schema; {:value=>{:type=>:integer}} end
     @m.wont_be :valid?
     @m.errors.full_messages.must_equal ['value is not a valid integer']
 
     @c.set_validations{validates_schema_types(:value)}
-    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    def @m.db_schema; {:value=>{:type=>:integer}} end
     @m.wont_be :valid?
     @m.errors.full_messages.must_equal ['value is not a valid integer']
 
     @c.set_validations{validates_schema_types(:value, :message=>'is bad')}
-    @m.meta_def(:db_schema){{:value=>{:type=>:integer}}}
+    def @m.db_schema; {:value=>{:type=>:integer}} end
     @m.wont_be :valid?
     @m.errors.full_messages.must_equal ['value is bad']
   end

data/spec/extensions/whitelist_security_spec.rb

@@ -64,6 +64,19 @@ describe Sequel::Model, "#(set|update)_(all|only)" do
   end
 end
 
+describe Sequel::Model, "#(set|update)_(all|only) without set_allowed_columns" do
+  before do
+    @c = Class.new(Sequel::Model(:items)) do
+      set_primary_key :id
+      columns :x, :y, :z, :id
+    end
+    @c.plugin :whitelist_security
+    @c.strict_param_setting = false
+    @o1 = @c.new
+    DB.reset
+  end
+end
+
 describe Sequel::Model, ".strict_param_setting" do
   before do
     @c = Class.new(Sequel::Model(:blahblah)) do
@@ -105,6 +118,19 @@ describe Sequel::Model, ".allowed_columns " do
     @c.allowed_columns.must_equal [:x, :y]
   end
 
+  it "should not change behavior if allowed_columns are not set" do
+    i = @c.new(:x => 1, :y => 2, :z => 3)
+    i.values.must_equal(:x => 1, :y => 2, :z => 3)
+    i.set(:x => 4, :y => 5, :z => 6)
+    i.values.must_equal(:x => 4, :y => 5, :z => 6)
+
+    @c.dataset = @c.dataset.with_fetch(:x => 7)
+    i = @c.new
+    i.update(:x => 7)
+    i.values.must_equal(:x => 7)
+    DB.sqls.must_equal ["INSERT INTO blahblah (x) VALUES (7)", "SELECT * FROM blahblah WHERE id = 10"]
+  end
+
   it "should only set allowed columns by default" do
     @c.set_allowed_columns :x, :y
     i = @c.new(:x => 1, :y => 2, :z => 3)