sequel 4.46.0 → 4.49.0

data/spec/model/class_dataset_methods_spec.rb

@@ -9,7 +9,9 @@ describe Sequel::Model, "class dataset methods"  do
   end
 
   it "should call the dataset method of the same name with the same args" do
-    @c.<<({}).must_equal @d
+    deprecated do
+      @c.<<({}).must_equal @d
+    end
     @db.sqls.must_equal ["INSERT INTO items DEFAULT VALUES"]
     @c.all.must_equal [@c.load(:id=>1)]
     @db.sqls.must_equal ["SELECT * FROM items"]
@@ -27,7 +29,9 @@ describe Sequel::Model, "class dataset methods"  do
     @c.except(@d, :from_self=>false).sql.must_equal "SELECT * FROM items EXCEPT SELECT * FROM items"
     @c.exclude(:a).sql.must_equal "SELECT * FROM items WHERE NOT a"
     @c.exclude_having(:a).sql.must_equal "SELECT * FROM items HAVING NOT a"
-    @c.exclude_where(:a).sql.must_equal "SELECT * FROM items WHERE NOT a"
+    deprecated do
+      @c.exclude_where(:a).sql.must_equal "SELECT * FROM items WHERE NOT a"
+    end
     @c.fetch_rows("S"){|r| r.must_equal(:id=>1)}
     @db.sqls.must_equal ["S"]
     @c.filter(:a).sql.must_equal "SELECT * FROM items WHERE a"
@@ -56,7 +60,9 @@ describe Sequel::Model, "class dataset methods"  do
     @c.insert.must_equal 2
     @db.sqls.must_equal ["INSERT INTO items DEFAULT VALUES"]
     @c.intersect(@d, :from_self=>false).sql.must_equal "SELECT * FROM items INTERSECT SELECT * FROM items"
-    @c.interval(:id).must_equal 1
+    deprecated do
+      @c.interval(:id).must_equal 1
+    end
     @db.sqls.must_equal ["SELECT (max(id) - min(id)) AS interval FROM items LIMIT 1"]
     @c.join(@c.table_name).sql.must_equal "SELECT * FROM items INNER JOIN items"
     @c.join_table(:inner, @c.table_name).sql.must_equal "SELECT * FROM items INNER JOIN items"
@@ -116,6 +122,8 @@ describe Sequel::Model, "class dataset methods"  do
     @db.sqls.must_equal ["SELECT * FROM items"]
     @c.sum(:id).must_equal 1
     @db.sqls.must_equal ["SELECT sum(id) AS sum FROM items LIMIT 1"]
+    @c.as_hash(:id, :id).must_equal(1=>1)
+    @db.sqls.must_equal ["SELECT * FROM items"]
     @c.to_hash(:id, :id).must_equal(1=>1)
     @db.sqls.must_equal ["SELECT * FROM items"]
     @c.to_hash_groups(:id, :id).must_equal(1=>[1])
@@ -127,6 +135,12 @@ describe Sequel::Model, "class dataset methods"  do
     @c.with(:a, @d).sql.must_equal "WITH a AS (SELECT * FROM items) SELECT * FROM items"
     @c.with_recursive(:a, @d, @d).sql.must_equal "WITH a AS (SELECT * FROM items UNION ALL SELECT * FROM items) SELECT * FROM items"
     @c.with_sql('S').sql.must_equal "S"
+    @c.where_all(:id=>1){|r|}.must_equal [@c.load(:id=>1)]
+    @db.sqls.must_equal ["SELECT * FROM items WHERE (id = 1)"]
+    @c.where_each(:id=>1){|r|}
+    @db.sqls.must_equal ["SELECT * FROM items WHERE (id = 1)"]
+    @c.where_single_value(:id=>1).must_equal 1
+    @db.sqls.must_equal ["SELECT * FROM items WHERE (id = 1) LIMIT 1"]
 
     sc = Class.new(@c)
     sc.set_dataset(@d.where(:a).order(:a).select(:a).group(:a).limit(2))
@@ -134,7 +148,9 @@ describe Sequel::Model, "class dataset methods"  do
     sc.invert.sql.must_equal 'SELECT a FROM items WHERE NOT a GROUP BY a ORDER BY a LIMIT 2'
     sc.dataset = sc.dataset.with_fetch(:v1=>1, :v2=>2)
     @db.sqls
-    sc.range(:a).must_equal(1..2)
+    deprecated do
+      sc.range(:a).must_equal(1..2)
+    end
     @db.sqls.must_equal ["SELECT min(a) AS v1, max(a) AS v2 FROM (SELECT a FROM items WHERE a GROUP BY a ORDER BY a LIMIT 2) AS t1 LIMIT 1"]
     sc.reverse.sql.must_equal 'SELECT a FROM items WHERE a GROUP BY a ORDER BY a DESC LIMIT 2'
     sc.reverse_order.sql.must_equal 'SELECT a FROM items WHERE a GROUP BY a ORDER BY a DESC LIMIT 2'

data/spec/model/dataset_methods_spec.rb

@@ -38,7 +38,7 @@ describe Sequel::Model::DatasetMethods, "#destroy"  do
   end
 end
 
-describe Sequel::Model::DatasetMethods, "#to_hash"  do
+describe Sequel::Model::DatasetMethods, "#as_hash"  do
   before do
     @c = Class.new(Sequel::Model(:items)) do
       set_primary_key :name
@@ -47,6 +47,15 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
   end
 
   it "should result in a hash with primary key value keys and model object values" do
+    @d = @d.with_fetch([{:name=>1}, {:name=>2}])
+    h = @d.as_hash
+    h.must_be_kind_of(Hash)
+    a = h.to_a
+    a.collect{|x| x[1].class}.must_equal [@c, @c]
+    a.sort_by{|x| x[0]}.collect{|x| [x[0], x[1].values]}.must_equal [[1, {:name=>1}], [2, {:name=>2}]]
+  end
+
+  it "should be aliased as to_hash" do
     @d = @d.with_fetch([{:name=>1}, {:name=>2}])
     h = @d.to_hash
     h.must_be_kind_of(Hash)
@@ -57,7 +66,7 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
 
   it "should result in a hash with given value keys and model object values" do
     @d = @d.with_fetch([{:name=>1, :number=>3}, {:name=>2, :number=>4}])
-    h = @d.to_hash(:number)
+    h = @d.as_hash(:number)
     h.must_be_kind_of(Hash)
     a = h.to_a
     a.collect{|x| x[1].class}.must_equal [@c, @c]
@@ -66,7 +75,7 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
 
   it "should raise an error if the class doesn't have a primary key" do
     @c.no_primary_key
-    proc{@d.to_hash}.must_raise(Sequel::Error)
+    proc{@d.as_hash}.must_raise(Sequel::Error)
   end
 end
 

data/spec/model/eager_loading_spec.rb

@@ -380,8 +380,8 @@ describe Sequel::Model, "#eager" do
     DB.sqls.must_equal []
   end
 
-  it "should handle a :eager_loading_predicate_key option to change the SQL used in the lookup, for many_to_one associations" do
-    EagerAlbum.many_to_one :sband, :clone=>:band, :eager_loading_predicate_key=>(Sequel[:bands][:id] / 3), :primary_key_method=>:id3
+  it "should handle a :predicate_key option to change the SQL used in the lookup, for many_to_one associations" do
+    EagerAlbum.many_to_one :sband, :clone=>:band, :predicate_key=>(Sequel[:bands][:id] / 3), :primary_key_method=>:id3
     EagerBand.dataset = EagerBand.dataset.with_fetch(:id=>6)
     a = EagerAlbum.eager(:sband).all
     DB.sqls.must_equal ['SELECT * FROM albums', 'SELECT * FROM bands WHERE ((bands.id / 3) IN (2))']
@@ -390,8 +390,8 @@ describe Sequel::Model, "#eager" do
     DB.sqls.must_equal []
   end
   
-  it "should handle a :eager_loading_predicate_key option to change the SQL used in the lookup, for one_to_many associations" do
-    EagerBand.one_to_many :salbums, :clone=>:albums, :eager_loading_predicate_key=>(Sequel[:albums][:band_id] * 3), :key_method=>:band_id3, :eager=>nil, :reciprocal=>nil
+  it "should handle a :predicate_key option to change the SQL used in the lookup, for one_to_many associations" do
+    EagerBand.one_to_many :salbums, :clone=>:albums, :predicate_key=>(Sequel[:albums][:band_id] * 3), :key_method=>:band_id3, :eager=>nil, :reciprocal=>nil
     EagerBand.dataset = EagerBand.dataset.with_fetch(:id=>6)
     a = EagerBand.eager(:salbums).all
     DB.sqls.must_equal ['SELECT * FROM bands', 'SELECT * FROM albums WHERE ((albums.band_id * 3) IN (6))']
@@ -400,8 +400,8 @@ describe Sequel::Model, "#eager" do
     DB.sqls.must_equal []
   end
   
-  it "should handle a :eager_loading_predicate_key option to change the SQL used in the lookup, for many_to_many associations" do
-    EagerAlbum.many_to_many :sgenres, :clone=>:genres, :eager_loading_predicate_key=>(Sequel[:ag][:album_id] * 1)
+  it "should handle a :predicate_key option to change the SQL used in the lookup, for many_to_many associations" do
+    EagerAlbum.many_to_many :sgenres, :clone=>:genres, :predicate_key=>(Sequel[:ag][:album_id] * 1)
     a = EagerAlbum.eager(:sgenres).all
     a.must_equal [EagerAlbum.load(:id => 1, :band_id => 2)]
     DB.sqls.must_equal ['SELECT * FROM albums', "SELECT genres.*, (ag.album_id * 1) AS x_foreign_key_x FROM genres INNER JOIN ag ON (ag.genre_id = genres.id) WHERE ((ag.album_id * 1) IN (1))"]
@@ -409,8 +409,8 @@ describe Sequel::Model, "#eager" do
     DB.sqls.must_equal []
   end
 
-  it "should handle a :eager_loading_predicate_key option to change the SQL used in the lookup, for one_through_one associations" do
-    EagerAlbum.one_through_one :sgenre, :clone=>:genre, :eager_loading_predicate_key=>(Sequel[:ag][:album_id] * 1)
+  it "should handle a :predicate_key option to change the SQL used in the lookup, for one_through_one associations" do
+    EagerAlbum.one_through_one :sgenre, :clone=>:genre, :predicate_key=>(Sequel[:ag][:album_id] * 1)
     a = EagerAlbum.eager(:sgenre).all
     a.must_equal [EagerAlbum.load(:id => 1, :band_id => 2)]
     DB.sqls.must_equal ['SELECT * FROM albums', "SELECT genres.*, (ag.album_id * 1) AS x_foreign_key_x FROM genres INNER JOIN ag ON (ag.genre_id = genres.id) WHERE ((ag.album_id * 1) IN (1))"]

data/spec/model/model_spec.rb

@@ -489,6 +489,14 @@ describe Sequel::Model, ".require_valid_table = true" do
     c.set_dataset @db[:bars]
     c.columns.must_equal [:id]
   end
+
+  deprecated "should assume nil value is the same as false" do
+    c = Class.new(Sequel::Model)
+    c.require_valid_table = nil
+    ds = @db.dataset
+    def ds.columns; raise Sequel::Error; end
+    c.set_dataset(ds)
+  end
 end
 
 describe Sequel::Model, "constructors" do
@@ -1114,7 +1122,43 @@ describe "Model.db_schema" do
     @c.db_schema.must_equal(:x=>{:type=>:integer}, :z=>{}, :y=>{:type=>:string})
   end
 
-  it "should fallback to fetching records if schema raises an error" do
+  deprecated "should not raise error if setting dataset where getting schema and columns raises an error" do
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should not raise error if setting dataset where getting schema and columns raises an error and require_valid_table is false" do
+    @c.require_valid_table = false
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should raise error if setting dataset where getting schema and columns raises an error and require_valid_table is true" do
+    @c.require_valid_table = true
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should use dataset columns if getting schema raises an error and require_valid_table is false" do
+    @c.require_valid_table = false
+    def @db.schema(table, opts={})
+      raise Sequel::Error
+    end
+    @c.dataset = @dataset.join(:x, :id).from_self.columns(:id, :x)
+    @c.db_schema.must_equal(:x=>{}, :id=>{})
+  end
+  
+  it "should use dataset columns if getting schema raises an error and require_valid_table is true" do
+    @c.require_valid_table = true
     def @db.schema(table, opts={})
       raise Sequel::Error
     end

data/spec/model/plugins_spec.rb

@@ -295,4 +295,38 @@ describe Sequel::Plugins do
     @c.foo.must_equal 1
   end
 end
+
+describe "Sequel::Model.plugin" do
+  before do
+    @c = Class.new(Sequel::Model)
+  end
+  after do
+    Sequel::Plugins.send(:remove_const, :SomethingOrOther)
+  end
+
+  it "should try loading plugins from sequel/plugins/:plugin" do
+    a = []
+    m = Module.new
+    (class << @c; self end).send(:define_method, :require) do |b|
+      a << b
+      Sequel::Plugins.const_set(:SomethingOrOther, m)
+    end
+    @c.plugin :something_or_other
+    @c.plugins.must_include m
+    a.must_equal ['sequel/plugins/something_or_other']
+  end
   
+  deprecated "should try loading plugins from sequel_plugin" do
+    proc{@c.plugin :something_or_other}.must_raise(LoadError)
+    a = []
+    m = Module.new
+    (class << @c; self end).send(:define_method, :require) do |b|
+      a << b
+      raise LoadError if b == 'sequel/plugins/something_or_other'
+      Sequel::Plugins.const_set(:SomethingOrOther, m)
+    end
+    @c.plugin :something_or_other
+    @c.plugins.must_include m
+    a.must_equal ['sequel/plugins/something_or_other', 'sequel_something_or_other']
+  end
+end

data/spec/model/record_spec.rb

@@ -436,7 +436,7 @@ describe "Model#freeze" do
   end
 
   it "should still have working class attr overriddable methods" do
-    Sequel::Model::BOOLEAN_SETTINGS.each{|m| @o.send(m) == Album.send(m)}
+    [:typecast_empty_string_to_nil, :typecast_on_assignment, :strict_param_setting, :raise_on_save_failure, :raise_on_typecast_failure, :require_modification, :use_transactions].each{|m| @o.send(m) == Album.send(m)}
   end
 
   it "should have working new? method" do

data/spec/spec_config.rb

@@ -2,6 +2,8 @@ ENV['SEQUEL_POSTGRES_URL'] ||= 'postgres:///sequel_test?user=sequel_test&passwor
 ENV['SEQUEL_SQLITE_URL'] ||= 'sqlite:/'
 gem 'minitest'
 require 'minitest'
+require 'minitest/autorun'
+#at_exit{GC.stress = true}
 if false # Minitest.respond_to?(:before_parallel_fork)
   if SEQUEL_ADAPTER_TEST.to_s == 'postgres'
     Minitest.before_parallel_fork{DB.disconnect}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.46.0
+  version: 4.49.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -248,6 +248,9 @@ extra_rdoc_files:
 - doc/release_notes/4.44.0.txt
 - doc/release_notes/4.45.0.txt
 - doc/release_notes/4.46.0.txt
+- doc/release_notes/4.47.0.txt
+- doc/release_notes/4.48.0.txt
+- doc/release_notes/4.49.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -385,6 +388,9 @@ files:
 - doc/release_notes/4.44.0.txt
 - doc/release_notes/4.45.0.txt
 - doc/release_notes/4.46.0.txt
+- doc/release_notes/4.47.0.txt
+- doc/release_notes/4.48.0.txt
+- doc/release_notes/4.49.0.txt
 - doc/release_notes/4.5.0.txt
 - doc/release_notes/4.6.0.txt
 - doc/release_notes/4.7.0.txt
@@ -488,6 +494,7 @@ files:
 - lib/sequel/database/transactions.rb
 - lib/sequel/dataset.rb
 - lib/sequel/dataset/actions.rb
+- lib/sequel/dataset/dataset_module.rb
 - lib/sequel/dataset/features.rb
 - lib/sequel/dataset/graph.rb
 - lib/sequel/dataset/misc.rb
@@ -561,6 +568,7 @@ files:
 - lib/sequel/extensions/schema_dumper.rb
 - lib/sequel/extensions/select_remove.rb
 - lib/sequel/extensions/sequel_3_dataset_methods.rb
+- lib/sequel/extensions/sequel_4_dataset_methods.rb
 - lib/sequel/extensions/server_block.rb
 - lib/sequel/extensions/server_logging.rb
 - lib/sequel/extensions/set_overrides.rb
@@ -674,8 +682,6 @@ files:
 - lib/sequel/version.rb
 - spec/adapter_spec.rb
 - spec/adapters/db2_spec.rb
-- spec/adapters/firebird_spec.rb
-- spec/adapters/informix_spec.rb
 - spec/adapters/mssql_spec.rb
 - spec/adapters/mysql_spec.rb
 - spec/adapters/oracle_spec.rb
@@ -810,6 +816,7 @@ files:
 - spec/extensions/scissors_spec.rb
 - spec/extensions/select_remove_spec.rb
 - spec/extensions/sequel_3_dataset_methods_spec.rb
+- spec/extensions/sequel_4_dataset_methods_spec.rb
 - spec/extensions/serialization_modification_detection_spec.rb
 - spec/extensions/serialization_spec.rb
 - spec/extensions/server_block_spec.rb