sequel 4.49.0 → 5.3.0

data/spec/model/model_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Model()" do
   before do
@@ -109,14 +109,6 @@ describe "Sequel::Model()" do
       Object.send(:remove_const, :Album) if defined?(::Album)
     end
 
-    deprecated "Sequel.cache_anonymous_models should return value for Sequel::Model" do
-      Sequel.cache_anonymous_models.must_equal true
-      Sequel::Model.cache_anonymous_models = false
-      Sequel.cache_anonymous_models.must_equal false
-      Sequel.cache_anonymous_models = true
-      Sequel.cache_anonymous_models.must_equal true
-    end
-
     it "should work without raising an exception with a symbol" do
       class ::Album < Sequel::Model(:table); end
       class ::Album < Sequel::Model(:table); end
@@ -185,12 +177,7 @@ end
 describe "Sequel::Model.freeze" do
   it "should freeze the model class and not allow any changes" do
     model = Class.new(Sequel::Model(:items))
-    deprecated do
-      model.set_allowed_columns [:id]
-      model.finder(:name=>:f_by_name){|pl, ds| ds.where(:name=>pl.arg).limit(1)}
-    end
     model.freeze
-    model.f_by_name(1)
 
     model.frozen?.must_equal true
     model.dataset.frozen?.must_equal true
@@ -201,11 +188,12 @@ describe "Sequel::Model.freeze" do
     model.send(:overridable_methods_module).frozen?.must_equal true
     model.default_set_fields_options.frozen?.must_equal true
 
-    proc{model.dataset_module{}}.must_raise RuntimeError, TypeError
-    deprecated do
-      model.allowed_columns.frozen?.must_equal true
-      proc{model.finder(:name=>:first_by_name){|pl, ds| ds.where(:name=>pl.arg).limit(1)}}.must_raise RuntimeError, TypeError
-    end
+    proc{model.dataset_module{}}.must_raise RuntimeError
+  end
+
+  it "should work if the model is already frozen" do
+    model = Class.new(Sequel::Model(:items))
+    model.freeze.freeze
   end
 
   it "should freeze a model class without a dataset without breaking" do
@@ -219,10 +207,7 @@ describe "Sequel::Model.freeze" do
     model.send(:overridable_methods_module).frozen?.must_equal true
     model.default_set_fields_options.frozen?.must_equal true
 
-    proc{model.dataset_module{}}.must_raise RuntimeError, TypeError
-    deprecated do
-      proc{model.finder(:name=>:first_by_name){|pl, ds| ds.where(:name=>pl.arg).limit(1)}}.must_raise RuntimeError, TypeError
-    end
+    proc{model.dataset_module{}}.must_raise RuntimeError
   end
 
   it "should allow subclasses of frozen model classes to work correctly" do
@@ -233,14 +218,8 @@ describe "Sequel::Model.freeze" do
 
     model.dataset_module{}
     model.plugin Module.new
-    deprecated do
-      model.finder(:name=>:first_by_name){|pl, ds| ds.where(:name=>pl.arg).limit(1)}
-    end
-    model.first_by_name('a').values.must_equal(:id=>1, :x=>1)
-    model.dataset.frozen?.must_equal false
 
     model.frozen?.must_equal false
-    model.dataset.frozen?.must_equal false
     model.db_schema.frozen?.must_equal false
     model.db_schema[:id].frozen?.must_equal false
     model.setter_methods.frozen?.must_equal false
@@ -252,10 +231,8 @@ end
 
 describe Sequel::Model do
   it "should have class method aliased as model" do
-    Sequel::Model.instance_methods.collect{|x| x.to_s}.must_include("model")
-
     model_a = Class.new(Sequel::Model(:items))
-    model_a.new.model.wont_be_nil
+    model_a.new.model.must_be_same_as model_a
   end
 
   it "should be associated with a dataset" do
@@ -279,15 +256,10 @@ describe Sequel::Model do
     DB.reset
   end
 
-  deprecated "should allow dup/clone" do
-    @model.dup.must_be :<, @model.superclass
-    @model.clone.must_be :<, @model.superclass
-  end
-
   it "should not allow dup/clone" do
-    proc{@model.dup}.must_raise Sequel::Error
-    proc{@model.clone}.must_raise Sequel::Error
-  end if false # SEQUEL5
+    proc{@model.dup}.must_raise NoMethodError
+    proc{@model.clone}.must_raise NoMethodError
+  end
 
   it "has table_name return name of table" do
     @model.table_name.must_equal :items
@@ -328,6 +300,13 @@ describe Sequel::Model do
     proc{@model.set_dataset(Object.new)}.must_raise(Sequel::Error)
   end
 
+  it "set_dataset should use a subquery for joined datasets" do
+    @model.set_dataset(DB.from(:foo, :bar))
+    @model.dataset.sql.must_equal 'SELECT * FROM (SELECT * FROM foo, bar) AS foo'
+    @model.set_dataset(DB[:foo].cross_join(:bar))
+    @model.dataset.sql.must_equal 'SELECT * FROM (SELECT * FROM foo CROSS JOIN bar) AS foo'
+  end
+
   it "set_dataset should add the destroy method to the dataset that destroys each object" do
     ds = DB[:foo]
     ds.wont_respond_to(:destroy)
@@ -490,11 +469,10 @@ describe Sequel::Model, ".require_valid_table = true" do
     c.columns.must_equal [:id]
   end
 
-  deprecated "should assume nil value is the same as false" do
+  it "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
+    ds = @db.dataset.with_extend{def columns; raise Sequel::Error; end}
     c.set_dataset(ds)
   end
 end
@@ -575,36 +553,6 @@ describe Sequel::Model, "new" do
   end
 end
 
-describe Sequel::Model, ".subset" do
-  before do
-    @c = Class.new(Sequel::Model(:items))
-    DB.reset
-  end
-
-  deprecated "should create a filter on the underlying dataset" do
-    proc {@c.new_only}.must_raise(NoMethodError)
-    
-    @c.subset(:new_only){age < 'new'}
-    
-    @c.new_only.sql.must_equal "SELECT * FROM items WHERE (age < 'new')"
-    @c.dataset.new_only.sql.must_equal "SELECT * FROM items WHERE (age < 'new')"
-    
-    @c.subset(:pricey){price > 100}
-    
-    @c.pricey.sql.must_equal "SELECT * FROM items WHERE (price > 100)"
-    @c.dataset.pricey.sql.must_equal "SELECT * FROM items WHERE (price > 100)"
-    
-    @c.pricey.new_only.sql.must_equal "SELECT * FROM items WHERE ((price > 100) AND (age < 'new'))"
-    @c.new_only.pricey.sql.must_equal "SELECT * FROM items WHERE ((age < 'new') AND (price > 100))"
-  end
-
-  deprecated "should not override existing model methods" do
-    def @c.active() true end
-    @c.subset(:active, :active)
-    @c.active.must_equal true
-  end
-end
-
 describe Sequel::Model, ".find" do
   before do
     @c = Class.new(Sequel::Model(:items))
@@ -629,242 +577,6 @@ describe Sequel::Model, ".find" do
   end
 end
 
-describe Sequel::Model, ".first_where" do
-  deprecated "should take a condition and do a lookup" do
-    db = Sequel.mock(:fetch=>[])
-    c = Class.new(Sequel::Model(db[:items]))
-    db.sqls
-    c.first_where(:a)
-    db.sqls.must_equal ['SELECT * FROM items WHERE a LIMIT 1']
-    proc{c.first_where(1)}.must_raise Sequel::Error
-  end
-end
-
-describe Sequel::Model, ".finder" do
-  before do
-    @h = {:id=>1}
-    @db = Sequel.mock(:fetch=>@h)
-    @c = Class.new(Sequel::Model(@db[:items]))
-    @c.instance_eval do
-      def foo(a, b)
-        where(:bar=>a).order(b)
-      end
-    end
-    @o = @c.load(@h)
-    @db.sqls
-  end
-
-  deprecated "should create a method that calls the method given and returns the first instance" do
-    @c.finder :foo
-    @c.first_foo(1, 2).must_equal @o
-    @c.first_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 LIMIT 1"]
-  end
-
-  deprecated "should work correctly when subclassing" do
-    @c.finder(:foo)
-    @sc = Class.new(@c)
-    @sc.set_dataset :foos
-    @db.sqls
-    @sc.first_foo(1, 2).must_equal @sc.load(@h)
-    @sc.first_foo(3, 4).must_equal @sc.load(@h)
-    @db.sqls.must_equal ["SELECT * FROM foos WHERE (bar = 1) ORDER BY 2 LIMIT 1", "SELECT * FROM foos WHERE (bar = 3) ORDER BY 4 LIMIT 1"]
-  end
-
-  deprecated "should work correctly when dataset is modified" do
-    @c.finder(:foo)
-    @c.first_foo(1, 2).must_equal @o
-    @c.set_dataset :foos
-    @c.first_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1", "SELECT * FROM foos LIMIT 1", "SELECT * FROM foos WHERE (bar = 3) ORDER BY 4 LIMIT 1"]
-  end
-
-  deprecated "should create a method based on the given block if no method symbol provided" do
-    @c.finder(:name=>:first_foo){|pl, ds| ds.where(pl.arg).limit(1)}
-    @c.first_foo(:id=>1).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (id = 1) LIMIT 1"]
-  end
-
-  deprecated "should raise an error if both a block and method symbol given" do
-    proc{@c.finder(:foo, :name=>:first_foo){|pl, ds| ds.where(pl.arg)}}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should raise an error if two option hashes are provided" do
-    proc{@c.finder({:name2=>:foo}, :name=>:first_foo){|pl, ds| ds.where(pl.arg)}}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should support :type option" do
-    @c.finder :foo, :type=>:all
-    @c.finder :foo, :type=>:each
-    @c.finder :foo, :type=>:get
-
-    a = []
-    @c.all_foo(1, 2){|r| a << r}.must_equal [@o]
-    a.must_equal [@o]
-   
-    a = []
-    @c.each_foo(3, 4){|r| a << r}
-    a.must_equal [@o]
-
-    @c.get_foo(5, 6).must_equal 1
-
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4", "SELECT * FROM items WHERE (bar = 5) ORDER BY 6 LIMIT 1"]
-  end
-
-  deprecated "should support :name option" do
-    @c.finder :foo, :name=>:find_foo
-    @c.find_foo(1, 2).must_equal @o
-    @c.find_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 LIMIT 1"]
-  end
-
-  deprecated "should support :arity option" do
-    def @c.foobar(*b)
-      ds = dataset
-      b.each_with_index do |a, i|
-        ds = ds.where(i=>a)
-      end
-      ds
-    end
-    @c.finder :foobar, :arity=>1, :name=>:find_foobar_1
-    @c.finder :foobar, :arity=>2, :name=>:find_foobar_2
-    @c.find_foobar_1(:a)
-    @c.find_foobar_2(:a, :b)
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (0 = a) LIMIT 1", "SELECT * FROM items WHERE ((0 = a) AND (1 = b)) LIMIT 1"]
-  end
-
-  deprecated "should support :mod option" do
-    m = Module.new
-    @c.finder :foo, :mod=>m
-    proc{@c.first_foo}.must_raise NoMethodError
-    @c.extend m
-    @c.first_foo(1, 2).must_equal @o
-    @c.first_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 LIMIT 1"]
-  end
-
-  deprecated "should raise error when calling with the wrong arity" do
-    @c.finder :foo
-    proc{@c.first_foo(1)}.must_raise Sequel::Error
-    proc{@c.first_foo(1,2,3)}.must_raise Sequel::Error
-  end
-end
-
-describe Sequel::Model, ".prepared_finder" do
-  before do
-    @h = {:id=>1}
-    @db = Sequel.mock(:fetch=>@h)
-    @db.extend_datasets do
-      def select_sql
-        sql = super
-        sql << ' -- prepared' if is_a?(Sequel::Dataset::PreparedStatementMethods)
-        sql
-      end
-    end
-    @c = Class.new(Sequel::Model(@db[:items]))
-    @c.instance_eval do
-      def foo(a, b)
-        where(:bar=>a).order(b)
-      end
-    end
-    @o = @c.load(@h)
-    @db.sqls
-  end
-
-  deprecated "should create a method that calls the method given and returns the first instance" do
-    @c.prepared_finder :foo
-    @c.first_foo(1, 2).must_equal @o
-    @c.first_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1 -- prepared", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should work correctly when subclassing" do
-    @c.prepared_finder(:foo)
-    @sc = Class.new(@c)
-    @sc.set_dataset :foos
-    @db.sqls
-    @sc.first_foo(1, 2).must_equal @sc.load(@h)
-    @sc.first_foo(3, 4).must_equal @sc.load(@h)
-    @db.sqls.must_equal ["SELECT * FROM foos WHERE (bar = 1) ORDER BY 2 LIMIT 1 -- prepared", "SELECT * FROM foos WHERE (bar = 3) ORDER BY 4 LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should work correctly when dataset is modified" do
-    @c.prepared_finder(:foo)
-    @c.first_foo(1, 2).must_equal @o
-    @c.set_dataset :foos
-    @c.first_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1 -- prepared", "SELECT * FROM foos LIMIT 1", "SELECT * FROM foos WHERE (bar = 3) ORDER BY 4 LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should create a method based on the given block if no method symbol provided" do
-    @c.prepared_finder(:name=>:first_foo){|a1| where(:id=>a1).limit(1)}
-    @c.first_foo(1).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (id = 1) LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should raise an error if both a block and method symbol given" do
-    proc{@c.prepared_finder(:foo, :name=>:first_foo){|pl, ds| ds.where(pl.arg)}}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should raise an error if two option hashes are provided" do
-    proc{@c.prepared_finder({:name2=>:foo}, :name=>:first_foo){|pl, ds| ds.where(pl.arg)}}.must_raise(Sequel::Error)
-  end
-
-  deprecated "should support :type option" do
-    @c.prepared_finder :foo, :type=>:all
-    @c.prepared_finder :foo, :type=>:each
-
-    a = []
-    @c.all_foo(1, 2){|r| a << r}.must_equal [@o]
-    a.must_equal [@o]
-   
-    a = []
-    @c.each_foo(3, 4){|r| a << r}
-    a.must_equal [@o]
-
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 -- prepared", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 -- prepared"]
-  end
-
-  deprecated "should support :name option" do
-    @c.prepared_finder :foo, :name=>:find_foo
-    @c.find_foo(1, 2).must_equal @o
-    @c.find_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1 -- prepared", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should support :arity option" do
-    def @c.foobar(*b)
-      ds = dataset
-      b.each_with_index do |a, i|
-        ds = ds.where(i=>a)
-      end
-      ds
-    end
-    @c.prepared_finder :foobar, :arity=>1, :name=>:find_foobar_1
-    @c.prepared_finder :foobar, :arity=>2, :name=>:find_foobar_2
-    @c.find_foobar_1(:a)
-    @c.find_foobar_2(:a, :b)
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (0 = a) LIMIT 1 -- prepared", "SELECT * FROM items WHERE ((0 = a) AND (1 = b)) LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should support :mod option" do
-    m = Module.new
-    @c.prepared_finder :foo, :mod=>m
-    proc{@c.first_foo}.must_raise NoMethodError
-    @c.extend m
-    @c.first_foo(1, 2).must_equal @o
-    @c.first_foo(3, 4).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1 -- prepared", "SELECT * FROM items WHERE (bar = 3) ORDER BY 4 LIMIT 1 -- prepared"]
-  end
-
-  deprecated "should handle models with names" do
-    def @c.name; 'foobar' end
-    @c.prepared_finder :foo
-    @c.first_foo(1, 2).must_equal @o
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (bar = 1) ORDER BY 2 LIMIT 1 -- prepared"]
-  end
-end
-
 describe Sequel::Model, ".fetch" do
   before do
     DB.reset
@@ -912,10 +624,9 @@ describe Sequel::Model, ".find_or_create" do
     @db.fetch = [[], {:x=>1, :id=>1}]
     @db.autoid = 1
     @c.find_or_create(:x => 1){|x| x[:y] = 2}.must_equal @c.load(:x=>1, :id=>1)
-    sqls = @db.sqls
-    sqls.first.must_equal "SELECT * FROM items WHERE (x = 1) LIMIT 1"
-    ["INSERT INTO items (x, y) VALUES (1, 2)", "INSERT INTO items (y, x) VALUES (2, 1)"].must_include(sqls[1])
-    sqls.last.must_equal "SELECT * FROM items WHERE id = 1"
+    @db.sqls.must_equal ["SELECT * FROM items WHERE (x = 1) LIMIT 1",
+      "INSERT INTO items (x, y) VALUES (1, 2)",
+      "SELECT * FROM items WHERE id = 1"]
   end
 end
 
@@ -973,17 +684,12 @@ describe Sequel::Model, "attribute accessors" do
   end
 
   it "should be created on set_dataset" do
-    %w'x z x= z='.each do |x|
-      @c.instance_methods.collect{|z| z.to_s}.wont_include(x)
-    end
+    a = [:x, :z, :x= ,:z=]
+    (a - @c.instance_methods).must_equal a
     @c.set_dataset(@dataset)
-    %w'x z x= z='.each do |x|
-      @c.instance_methods.collect{|z| z.to_s}.must_include(x)
-    end
+    (a - @c.instance_methods).must_equal []
     o = @c.new
-    %w'x z x= z='.each do |x|
-      o.methods.collect{|z| z.to_s}.must_include(x)
-    end
+    (a - o.methods).must_equal []
 
     o.x.must_be_nil
     o.x = 34
@@ -1046,12 +752,6 @@ describe Sequel::Model, ".[]" do
     DB.sqls.must_equal ["SELECT * FROM items WHERE name = 'sharon'"]
   end
 
-  deprecated "should use a qualified primary key if the dataset is joined" do
-    @c.dataset = @c.dataset.cross_join(:a)
-    @c[1].must_equal @c.load(:name => 'sharon', :id => 1)
-    DB.sqls.must_equal ["SELECT * FROM items CROSS JOIN a WHERE (items.id = 1) LIMIT 1"]
-  end
-
   it "should handle a dataset that uses a subquery" do
     @c.dataset = @c.dataset.cross_join(:a).from_self(:alias=>:b)
     @c[1].must_equal @c.load(:name => 'sharon', :id => 1)
@@ -1061,9 +761,7 @@ describe Sequel::Model, ".[]" do
   it "should work correctly for composite primary key specified as array" do
     @c.set_primary_key [:node_id, :kind]
     @c[3921, 201].must_be_kind_of(@c)
-    sqls = DB.sqls
-    sqls.length.must_equal 1
-    sqls.first.must_match(/^SELECT \* FROM items WHERE \((\(node_id = 3921\) AND \(kind = 201\))|(\(kind = 201\) AND \(node_id = 3921\))\) LIMIT 1$/)
+    DB.sqls.must_equal ['SELECT * FROM items WHERE ((node_id = 3921) AND (kind = 201)) LIMIT 1']
   end
 end
 
@@ -1122,14 +820,6 @@ describe "Model.db_schema" do
     @c.db_schema.must_equal(:x=>{:type=>:integer}, :z=>{}, :y=>{:type=>:string})
   end
 
-  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={})

data/spec/model/plugins_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, ".plugin" do
   before do
@@ -307,7 +307,7 @@ describe "Sequel::Model.plugin" do
   it "should try loading plugins from sequel/plugins/:plugin" do
     a = []
     m = Module.new
-    (class << @c; self end).send(:define_method, :require) do |b|
+    @c.define_singleton_method(:require) do |b|
       a << b
       Sequel::Plugins.const_set(:SomethingOrOther, m)
     end
@@ -315,18 +315,4 @@ describe "Sequel::Model.plugin" do
     @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