sequel 4.36.0 → 5.61.0

data/spec/extensions/tree_spec.rb

@@ -1,274 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe Sequel::Model, "tree plugin" do
-  def klass(opts={})
-    @db = DB
-    c = Class.new(Sequel::Model(@db[:nodes]))
-    c.class_eval do
-      def self.name; 'Node'; end
-      columns :id, :name, :parent_id, :i, :pi
-      plugin :tree, opts
-    end
-    c
-  end
-
-  before do
-    @c = klass
-    @ds = @c.dataset
-    @o = @c.load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
-    @db.reset
-  end
-
-  it "should define the correct associations" do
-    @c.associations.sort_by{|x| x.to_s}.must_equal [:children, :parent]
-  end
-  
-  it "should define the correct reciprocals" do
-    @c.associations.sort_by{|x| x.to_s}.map{|x| @c.association_reflection(x).reciprocal}.must_equal [:parent, :children]
-  end
-  
-  it "should define the correct associations when giving options" do
-    klass(:children=>{:name=>:cs}, :parent=>{:name=>:p}).associations.sort_by{|x| x.to_s}.must_equal [:cs, :p]
-  end
-
-  it "should use the correct SQL for lazy associations" do
-    @o.parent_dataset.sql.must_equal 'SELECT * FROM nodes WHERE (nodes.id = 1) LIMIT 1'
-    @o.children_dataset.sql.must_equal 'SELECT * FROM nodes WHERE (nodes.parent_id = 2)'
-  end
-  
-  it "should use the correct SQL for lazy associations when giving options" do
-    o = klass(:primary_key=>:i, :key=>:pi, :order=>:name, :children=>{:name=>:cs}, :parent=>{:name=>:p}).load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
-    o.p_dataset.sql.must_equal 'SELECT * FROM nodes WHERE (nodes.i = 4) ORDER BY name LIMIT 1'
-    o.cs_dataset.sql.must_equal 'SELECT * FROM nodes WHERE (nodes.pi = 3) ORDER BY name'
-  end
-
-  it "should have parent_column give the symbol of the parent column" do
-    @c.parent_column.must_equal :parent_id
-    klass(:key=>:p_id).parent_column.must_equal :p_id
-  end
-
-  it "should have tree_order give the order of the association" do
-    @c.tree_order.must_equal nil
-    klass(:order=>:name).tree_order.must_equal :name
-    klass(:order=>[:parent_id, :name]).tree_order.must_equal [:parent_id, :name]
-  end
-
-  it "should work correctly in subclasses" do
-    o = Class.new(klass(:primary_key=>:i, :key=>:pi, :order=>:name, :children=>{:name=>:cs}, :parent=>{:name=>:p})).load(:id=>2, :parent_id=>1, :name=>'AA', :i=>3, :pi=>4)
-    o.p_dataset.sql.must_equal 'SELECT * FROM nodes WHERE (nodes.i = 4) ORDER BY name LIMIT 1'
-    o.cs_dataset.sql.must_equal 'SELECT * FROM nodes WHERE (nodes.pi = 3) ORDER BY name'
-  end
-
-  it "should have roots return an array of the tree's roots" do
-    @ds._fetch = [{:id=>1, :parent_id=>nil, :name=>'r'}]
-    @c.roots.must_equal [@c.load(:id=>1, :parent_id=>nil, :name=>'r')]
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE (parent_id IS NULL)"]
-  end
-
-  it "should have roots_dataset be a dataset representing the tree's roots" do
-    @c.roots_dataset.sql.must_equal "SELECT * FROM nodes WHERE (parent_id IS NULL)"
-  end
-
-  it "should have ancestors return the ancestors of the current node" do
-    @ds._fetch = [[{:id=>1, :parent_id=>5, :name=>'r'}], [{:id=>5, :parent_id=>nil, :name=>'r2'}]]
-    @o.ancestors.must_equal [@c.load(:id=>1, :parent_id=>5, :name=>'r'), @c.load(:id=>5, :parent_id=>nil, :name=>'r2')]
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE id = 1",
-      "SELECT * FROM nodes WHERE id = 5"]
-  end
-
-  it "should have descendants return the descendants of the current node" do
-    @ds._fetch = [[{:id=>3, :parent_id=>2, :name=>'r'}, {:id=>4, :parent_id=>2, :name=>'r2'}], [{:id=>5, :parent_id=>4, :name=>'r3'}], []]
-    @o.descendants.must_equal [@c.load(:id=>3, :parent_id=>2, :name=>'r'), @c.load(:id=>4, :parent_id=>2, :name=>'r2'), @c.load(:id=>5, :parent_id=>4, :name=>'r3')] 
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE (nodes.parent_id = 2)",
-      "SELECT * FROM nodes WHERE (nodes.parent_id = 3)",
-      "SELECT * FROM nodes WHERE (nodes.parent_id = 5)",
-      "SELECT * FROM nodes WHERE (nodes.parent_id = 4)"]
-  end
-
-  it "should have root return the root of the current node" do
-    @ds._fetch = [[{:id=>1, :parent_id=>5, :name=>'r'}], [{:id=>5, :parent_id=>nil, :name=>'r2'}]]
-    @o.root.must_equal @c.load(:id=>5, :parent_id=>nil, :name=>'r2')
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE id = 1",
-      "SELECT * FROM nodes WHERE id = 5"]
-  end
-
-  it "should have root? return true for a root node and false for a child node" do
-    @c.load(:parent_id => nil).root?.must_equal true
-    @c.load(:parent_id => 1).root?.must_equal false
-  end
-
-  it "should have root? return false for an new node" do
-    @c.new.root?.must_equal false
-  end
-
-  it "should have self_and_siblings return the children of the current node's parent" do
-    @ds._fetch = [[{:id=>1, :parent_id=>3, :name=>'r'}], [{:id=>7, :parent_id=>1, :name=>'r2'}, @o.values.dup]]
-    @o.self_and_siblings.must_equal [@c.load(:id=>7, :parent_id=>1, :name=>'r2'), @o] 
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE id = 1",
-      "SELECT * FROM nodes WHERE (nodes.parent_id = 1)"]
-  end
-
-  it "should have siblings return the children of the current node's parent, except for the current node" do
-    @ds._fetch = [[{:id=>1, :parent_id=>3, :name=>'r'}], [{:id=>7, :parent_id=>1, :name=>'r2'}, @o.values.dup]]
-    @o.siblings.must_equal [@c.load(:id=>7, :parent_id=>1, :name=>'r2')] 
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE id = 1",
-      "SELECT * FROM nodes WHERE (nodes.parent_id = 1)"]
-  end
-
-  describe ":single_root option" do
-    before do
-      @c = klass(:single_root => true)
-    end
-
-    it "should have root class method return the root" do
-      @c.dataset._fetch = [{:id=>1, :parent_id=>nil, :name=>'r'}]
-      @c.root.must_equal @c.load(:id=>1, :parent_id=>nil, :name=>'r')
-    end
-
-    it "prevents creating a second root" do
-      @c.dataset._fetch = [{:id=>1, :parent_id=>nil, :name=>'r'}]
-      lambda { @c.create }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-    end
-
-    it "errors when promoting an existing record to a second root" do
-      @c.dataset._fetch = [{:id=>1, :parent_id=>nil, :name=>'r'}]
-      n = @c.load(:id => 2, :parent_id => 1)
-      lambda { n.update(:parent_id => nil) }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-    end
-
-    it "allows updating existing root" do
-      @c.dataset._fetch = [{:id=>1, :parent_id=>nil, :name=>'r'}]
-       @c.root.update(:name => 'fdsa') 
-    end
-  end
-end
-
-describe Sequel::Model, "tree plugin with composite keys" do
-  def klass(opts={})
-    @db = DB
-    c = Class.new(Sequel::Model(@db[:nodes]))
-    c.class_eval do
-      def self.name; 'Node'; end
-      columns :id, :id2, :name, :parent_id, :parent_id2, :i, :pi
-      set_primary_key [:id, :id2]
-      plugin :tree, opts.merge(:key=>[:parent_id, :parent_id2])
-    end
-    c
-  end
-
-  before do
-    @c = klass
-    @ds = @c.dataset
-    @o = @c.load(:id=>2, :id2=>5, :parent_id=>1, :parent_id2=>6, :name=>'AA', :i=>3, :pi=>4)
-    @db.reset
-  end
-
-  
-  it "should use the correct SQL for lazy associations" do
-    @o.parent_dataset.sql.must_equal 'SELECT * FROM nodes WHERE ((nodes.id = 1) AND (nodes.id2 = 6)) LIMIT 1'
-    @o.children_dataset.sql.must_equal 'SELECT * FROM nodes WHERE ((nodes.parent_id = 2) AND (nodes.parent_id2 = 5))'
-  end
-  
-  it "should have parent_column give an array of symbols of the parent column" do
-    @c.parent_column.must_equal [:parent_id, :parent_id2]
-  end
-
-  it "should have roots return an array of the tree's roots" do
-    @ds._fetch = [{:id=>1, :parent_id=>nil, :parent_id2=>nil, :name=>'r'}]
-    @c.roots.must_equal [@c.load(:id=>1, :parent_id=>nil, :parent_id2=>nil, :name=>'r')]
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE ((parent_id IS NULL) OR (parent_id2 IS NULL))"]
-  end
-
-  it "should have roots_dataset be a dataset representing the tree's roots" do
-    @c.roots_dataset.sql.must_equal "SELECT * FROM nodes WHERE ((parent_id IS NULL) OR (parent_id2 IS NULL))"
-  end
-
-  it "should have ancestors return the ancestors of the current node" do
-    @ds._fetch = [[{:id=>1, :id2=>6, :parent_id=>5, :parent_id2=>7, :name=>'r'}], [{:id=>5, :id2=>7, :parent_id=>nil, :parent_id2=>nil, :name=>'r2'}]]
-    @o.ancestors.must_equal [@c.load(:id=>1, :id2=>6, :parent_id=>5, :parent_id2=>7, :name=>'r'), @c.load(:id=>5, :id2=>7, :parent_id=>nil, :parent_id2=>nil, :name=>'r2')]
-    sqls = @db.sqls
-    sqls.length.must_equal 2
-    ["SELECT * FROM nodes WHERE ((id = 1) AND (id2 = 6)) LIMIT 1", "SELECT * FROM nodes WHERE ((id2 = 6) AND (id = 1)) LIMIT 1"].must_include(sqls[0])
-    ["SELECT * FROM nodes WHERE ((id = 5) AND (id2 = 7)) LIMIT 1", "SELECT * FROM nodes WHERE ((id2 = 7) AND (id = 5)) LIMIT 1"].must_include(sqls[1])
-  end
-
-  it "should have descendants return the descendants of the current node" do
-    @ds._fetch = [[{:id=>3, :id2=>7, :parent_id=>2, :parent_id2=>5, :name=>'r'}, {:id=>4, :id2=>8, :parent_id=>2, :parent_id2=>5, :name=>'r2'}], [{:id=>5, :id2=>9, :parent_id=>4, :parent_id2=>8, :name=>'r3'}], []]
-    @o.descendants.must_equal [@c.load(:id=>3, :id2=>7, :parent_id=>2, :parent_id2=>5, :name=>'r'), @c.load(:id=>4, :id2=>8, :parent_id=>2, :parent_id2=>5, :name=>'r2'), @c.load(:id=>5, :id2=>9, :parent_id=>4, :parent_id2=>8, :name=>'r3')] 
-    @db.sqls.must_equal ["SELECT * FROM nodes WHERE ((nodes.parent_id = 2) AND (nodes.parent_id2 = 5))",
-      "SELECT * FROM nodes WHERE ((nodes.parent_id = 3) AND (nodes.parent_id2 = 7))",
-      "SELECT * FROM nodes WHERE ((nodes.parent_id = 5) AND (nodes.parent_id2 = 9))",
-      "SELECT * FROM nodes WHERE ((nodes.parent_id = 4) AND (nodes.parent_id2 = 8))"]
-  end
-
-  it "should have root return the root of the current node" do
-    @ds._fetch = [[{:id=>1, :id2=>6, :parent_id=>5, :parent_id2=>7, :name=>'r'}], [{:id=>5, :id2=>7, :parent_id=>nil, :parent_id2=>nil, :name=>'r2'}]]
-    @o.root.must_equal @c.load(:id=>5, :id2=>7, :parent_id=>nil, :parent_id2=>nil, :name=>'r2')
-    sqls = @db.sqls
-    sqls.length.must_equal 2
-    ["SELECT * FROM nodes WHERE ((id = 1) AND (id2 = 6)) LIMIT 1", "SELECT * FROM nodes WHERE ((id2 = 6) AND (id = 1)) LIMIT 1"].must_include(sqls[0])
-    ["SELECT * FROM nodes WHERE ((id = 5) AND (id2 = 7)) LIMIT 1", "SELECT * FROM nodes WHERE ((id2 = 7) AND (id = 5)) LIMIT 1"].must_include(sqls[1])
-  end
-
-  it "should have root? return true for a root node and false for a child node" do
-    @c.load(:parent_id => nil, :parent_id2=>nil).root?.must_equal true
-    @c.load(:parent_id => 1, :parent_id2=>nil).root?.must_equal true
-    @c.load(:parent_id => nil, :parent_id2=>2).root?.must_equal true
-    @c.load(:parent_id => 1, :parent_id2=>2).root?.must_equal false
-  end
-
-  it "should have root? return false for an new node" do
-    @c.new.root?.must_equal false
-  end
-
-  it "should have self_and_siblings return the children of the current node's parent" do
-    @ds._fetch = [[{:id=>1, :id2=>6, :parent_id=>3, :parent_id2=>7, :name=>'r'}], [{:id=>7, :id2=>9, :parent_id=>1, :parent_id2=>6, :name=>'r2'}, @o.values.dup]]
-    @o.self_and_siblings.must_equal [@c.load(:id=>7, :id2=>9, :parent_id=>1, :parent_id2=>6, :name=>'r2'), @o] 
-    sqls = @db.sqls
-    sqls.length.must_equal 2
-    ["SELECT * FROM nodes WHERE ((id = 1) AND (id2 = 6)) LIMIT 1", "SELECT * FROM nodes WHERE ((id2 = 6) AND (id = 1)) LIMIT 1"].must_include(sqls[0])
-    sqls[1].must_equal "SELECT * FROM nodes WHERE ((nodes.parent_id = 1) AND (nodes.parent_id2 = 6))"
-  end
-
-  it "should have siblings return the children of the current node's parent, except for the current node" do
-    @ds._fetch = [[{:id=>1, :id2=>6, :parent_id=>3, :parent_id2=>7, :name=>'r'}], [{:id=>7, :id2=>9, :parent_id=>1, :parent_id2=>6, :name=>'r2'}, @o.values.dup]]
-    @o.siblings.must_equal [@c.load(:id=>7, :id2=>9, :parent_id=>1, :parent_id2=>6, :name=>'r2')] 
-    sqls = @db.sqls
-    sqls.length.must_equal 2
-    ["SELECT * FROM nodes WHERE ((id = 1) AND (id2 = 6)) LIMIT 1", "SELECT * FROM nodes WHERE ((id2 = 6) AND (id = 1)) LIMIT 1"].must_include(sqls[0])
-    sqls[1].must_equal "SELECT * FROM nodes WHERE ((nodes.parent_id = 1) AND (nodes.parent_id2 = 6))"
-  end
-
-  describe ":single_root option" do
-    before do
-      @c = klass(:single_root => true)
-    end
-
-    it "prevents creating a second root" do
-      @c.dataset._fetch = [{:id=>1, :id2=>6, :parent_id=>nil, :parent_id2=>nil, :name=>'r'}]
-      lambda { @c.create }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-      @c.dataset._fetch = [{:id=>1, :id2=>6, :parent_id=>1, :parent_id2=>nil, :name=>'r'}]
-      lambda { @c.create(:parent_id2=>1) }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-      @c.dataset._fetch = [{:id=>1, :id2=>6, :parent_id=>nil, :parent_id2=>2, :name=>'r'}]
-      lambda { @c.create(:parent_id=>2) }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-    end
-
-    it "errors when promoting an existing record to a second root" do
-      @c.dataset._fetch = [{:id=>1, :id2=>6, :parent_id=>nil, :parent_id2=>nil, :name=>'r'}]
-      lambda { @c.load(:id => 2, :id2=>7, :parent_id => 1, :parent_id2=>2).update(:parent_id => nil, :parent_id2=>nil) }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-      @c.dataset._fetch = [{:id=>1, :id2=>6, :parent_id=>1, :parent_id2=>nil, :name=>'r'}]
-      lambda { @c.load(:id => 2, :id2=>7, :parent_id => 1, :parent_id2=>2).update(:parent_id => nil) }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-      @c.dataset._fetch = [{:id=>1, :id2=>6, :parent_id=>nil, :parent_id2=>2, :name=>'r'}]
-      lambda { @c.load(:id => 2, :id2=>7, :parent_id => 1, :parent_id2=>2).update(:parent_id2 => nil) }.must_raise(Sequel::Plugins::Tree::TreeMultipleRootError)
-    end
-
-    it "allows updating existing root" do
-      @c.dataset._fetch = {:id=>1, :id2=>6, :parent_id=>nil, :parent_id2=>nil, :name=>'r'}
-       @c.root.update(:name => 'fdsa') 
-      @c.dataset._fetch = {:id=>1, :id2=>6, :parent_id=>1, :parent_id2=>nil, :name=>'r'}
-       @c.root.update(:name => 'fdsa') 
-      @c.dataset._fetch = {:id=>1, :id2=>6, :parent_id=>nil, :parent_id2=>2, :name=>'r'}
-       @c.root.update(:name => 'fdsa') 
-    end
-  end
-end

data/spec/extensions/typecast_on_load_spec.rb

@@ -1,80 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe Sequel::Model, "TypecastOnLoad plugin" do
-  before do
-    @db = Sequel.mock(:fetch=>{:id=>1, :b=>"1", :y=>"0"}, :columns=>[:id, :b, :y], :numrows=>1)
-    def @db.supports_schema_parsing?() true end
-    def @db.schema(*args)
-      [[:id, {}], [:y, {:type=>:boolean, :db_type=>'tinyint(1)'}], [:b, {:type=>:integer, :db_type=>'integer'}]]
-    end
-    @c = Class.new(Sequel::Model(@db[:items])) do
-      attr_accessor :bset
-      def b=(x)
-        self.bset = true
-        super
-      end
-    end
-  end 
-
-  it "should call setter method with value when loading the object, for all given columns" do
-    @c.plugin :typecast_on_load, :b
-    o = @c.load(:id=>1, :b=>"1", :y=>"0")
-    o.values.must_equal(:id=>1, :b=>1, :y=>"0")
-    o.bset.must_equal true
-  end
-
-  it "should call setter method with value when reloading the object, for all given columns" do
-    @c.plugin :typecast_on_load, :b
-    o = @c.load(:id=>1, :b=>"1", :y=>"0")
-    o.refresh
-    o.values.must_equal(:id=>1, :b=>1, :y=>"0")
-    o.bset.must_equal true
-  end
-
-  it "should call setter method with value when automatically reloading the object on creation" do
-    @c.plugin :typecast_on_load, :b
-    o = @c.new(:b=>"1", :y=>"0")
-    o.save.values.must_equal(:id=>1, :b=>1, :y=>"0")
-    o.bset.must_equal true
-  end
-
-  it "should call setter method with value when automatically reloading the object on creation via insert_select" do
-    @c.plugin :typecast_on_load, :b
-    @c.dataset.meta_def(:insert_select){|h| insert(h); first}
-    o = @c.new(:b=>"1", :y=>"0")
-    o.save.values.must_equal(:id=>1, :b=>1, :y=>"0")
-    o.bset.must_equal true
-  end
-
-  it "should allowing setting columns separately via add_typecast_on_load_columns" do
-    @c.plugin :typecast_on_load
-    @c.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>"1", :y=>"0")
-    @c.add_typecast_on_load_columns :b
-    @c.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>1, :y=>"0")
-    @c.add_typecast_on_load_columns :y
-    @c.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>1, :y=>false)
-  end
-
-  it "should work with subclasses" do
-    @c.plugin :typecast_on_load
-    @c.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>"1", :y=>"0")
-
-    c1 = Class.new(@c)
-    @c.add_typecast_on_load_columns :b
-    @c.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>1, :y=>"0")
-    c1.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>"1", :y=>"0")
-
-    c2 = Class.new(@c)
-    @c.add_typecast_on_load_columns :y
-    @c.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>1, :y=>false)
-    c2.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>1, :y=>"0")
-    
-    c1.add_typecast_on_load_columns :y
-    c1.load(:id=>1, :b=>"1", :y=>"0").values.must_equal(:id=>1, :b=>"1", :y=>false)
-  end
-
-  it "should not mark the object as modified" do
-    @c.plugin :typecast_on_load, :b
-    @c.load(:id=>1, :b=>"1", :y=>"0").modified?.must_equal false
-  end
-end

data/spec/extensions/unlimited_update_spec.rb

@@ -1,20 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::UnlimitedUpdate" do
-  before do
-    @db = Sequel.mock(:host=>'mysql', :numrows=>1)
-    @c = Class.new(Sequel::Model(@db[:test]))
-    @c.columns :id, :name
-    @o = @c.load(:id=>1, :name=>'a')
-    @db.sqls
-  end
-
-  it "should remove limit from update dataset" do
-    @o.save
-    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1) LIMIT 1"]
-
-    @c.plugin :unlimited_update
-    @o.save
-    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1)"]
-  end
-end

data/spec/extensions/update_or_create_spec.rb

@@ -1,87 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::UpdateOrCreate" do
-  before do
-    @db = Sequel.mock(:autoid=>proc{1}, :numrows=>1)
-    @c = Class.new(Sequel::Model(@db[:test]))
-    @c.plugin :update_or_create
-    @c.columns :id, :a, :b 
-    @db.sqls
-  end
-
-  it ".update_or_create should update an existing record if one exists" do
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.update_or_create(:a=>2){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>2, :b=>4)
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1", "UPDATE test SET b = 4 WHERE (id = 1)"]
-
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.update_or_create({:a=>2}, :b=>4).must_equal @c.load(:id=>1, :a=>2, :b=>4)
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1", "UPDATE test SET b = 4 WHERE (id = 1)"]
-
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.update_or_create({:a=>2}, :a=>3){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>3, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 2) LIMIT 1"
-    sqls.shift.must_match(/UPDATE test SET [ab] = [34], [ab] = [34] WHERE \(id = 1\)/)
-  end
-
-  it ".update_or_create should create a record if an existing record does not exist" do
-    @db.fetch = [[], [{:id=>1, :a=>1, :b=>4}]]
-    @c.update_or_create(:a=>1){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>1, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 1) LIMIT 1"
-    sqls.shift.must_match(/INSERT INTO test \([ab], [ab]\) VALUES \([14], [14]\)/)
-    sqls.shift.must_equal "SELECT * FROM test WHERE (id = 1) LIMIT 1"
-
-    @db.fetch = [[], [{:id=>1, :a=>1, :b=>4}]]
-    @c.update_or_create({:a=>1}, :b=>4).must_equal @c.load(:id=>1, :a=>1, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 1) LIMIT 1"
-    sqls.shift.must_match(/INSERT INTO test \([ab], [ab]\) VALUES \([14], [14]\)/)
-    sqls.shift.must_equal "SELECT * FROM test WHERE (id = 1) LIMIT 1"
-
-    @db.fetch = [[], [{:id=>1, :a=>3, :b=>4}]]
-    @c.update_or_create({:a=>1}, :a=>3){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>3, :b=>4)
-    sqls = @db.sqls
-    sqls.shift.must_equal "SELECT * FROM test WHERE (a = 1) LIMIT 1"
-    sqls.shift.must_match(/INSERT INTO test \([ab], [ab]\) VALUES \([34], [34]\)/)
-    sqls.shift.must_equal "SELECT * FROM test WHERE (id = 1) LIMIT 1"
-  end
-
-  it ".update_or_create should return an existing record even if no changes necessary" do
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.update_or_create(:a=>2){|t| t.b = 3}.must_equal @c.load(:id=>1, :a=>2, :b=>3)
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1"]
-  end
-
-  it ".find_or_new should return an existing record" do
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.find_or_new(:a=>2){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>2, :b=>4)
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1"]
-
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.find_or_new({:a=>2}, :b=>4).must_equal @c.load(:id=>1, :a=>2, :b=>4)
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1"]
-
-    @db.fetch = [[{:id=>1, :a=>2, :b=>3}]]
-    @c.find_or_new({:a=>2}, :a=>3){|t| t.b = 4}.must_equal @c.load(:id=>1, :a=>3, :b=>4)
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 2) LIMIT 1"]
-  end
-
-  it ".find_or_new should return a new record if no record exists" do
-    o = @c.find_or_new(:a=>1){|t| t.b = 4}
-    o.must_equal @c.load(:a=>1, :b=>4)
-    o.new?.must_equal true
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 1) LIMIT 1"]
-
-    o = @c.find_or_new({:a=>1}, :b=>4)
-    o.must_equal @c.load(:a=>1, :b=>4)
-    o.new?.must_equal true
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 1) LIMIT 1"]
-
-    o = @c.find_or_new({:a=>1}, :a=>3){|t| t.b = 4}
-    o.must_equal @c.load(:a=>3, :b=>4)
-    o.new?.must_equal true
-    @db.sqls.must_equal ["SELECT * FROM test WHERE (a = 1) LIMIT 1"]
-  end
-end

data/spec/extensions/update_primary_key_spec.rb

@@ -1,100 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::UpdatePrimaryKey" do
-  before do
-    @c = Class.new(Sequel::Model(:a))
-    @c.plugin :update_primary_key
-    @c.columns :a, :b
-    @c.set_primary_key :a
-    @c.unrestrict_primary_key
-    @ds = @c.dataset
-    DB.reset
-  end
-
-  it "should handle regular updates" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>1, :b=>4}], [{:a=>1, :b=>4}], [{:a=>1, :b=>5}], [{:a=>1, :b=>5}], [{:a=>1, :b=>6}], [{:a=>1, :b=>6}]]
-    @c.first.update(:b=>4)
-    @c.all.must_equal [@c.load(:a=>1, :b=>4)]
-    DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET b = 4 WHERE (a = 1)", "SELECT * FROM a"]
-    @c.first.set(:b=>5).save
-    @c.all.must_equal [@c.load(:a=>1, :b=>5)]
-    DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET b = 5 WHERE (a = 1)", "SELECT * FROM a"]
-    @c.first.set(:b=>6).save(:columns=>:b)
-    @c.all.must_equal [@c.load(:a=>1, :b=>6)]
-    DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET b = 6 WHERE (a = 1)", "SELECT * FROM a"]
-  end
-
-  it "should handle updating the primary key field with another field" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
-    @c.first.update(:a=>2, :b=>4)
-    @c.all.must_equal [@c.load(:a=>2, :b=>4)]
-    sqls = DB.sqls
-    ["UPDATE a SET a = 2, b = 4 WHERE (a = 1)", "UPDATE a SET b = 4, a = 2 WHERE (a = 1)"].must_include(sqls.slice!(1))
-    sqls.must_equal ["SELECT * FROM a LIMIT 1", "SELECT * FROM a"]
-  end
-
-  it "should handle updating just the primary key field when saving changes" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>3}], [{:a=>2, :b=>3}], [{:a=>3, :b=>3}]]
-    @c.first.update(:a=>2)
-    @c.all.must_equal [@c.load(:a=>2, :b=>3)]
-    DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET a = 2 WHERE (a = 1)", "SELECT * FROM a"]
-    @c.first.set(:a=>3).save(:columns=>:a)
-    @c.all.must_equal [@c.load(:a=>3, :b=>3)]
-    DB.sqls.must_equal ["SELECT * FROM a LIMIT 1", "UPDATE a SET a = 3 WHERE (a = 2)", "SELECT * FROM a"]
-  end
-
-  it "should handle saving after modifying the primary key field with another field" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
-    @c.first.set(:a=>2, :b=>4).save
-    @c.all.must_equal [@c.load(:a=>2, :b=>4)]
-    sqls = DB.sqls
-    ["UPDATE a SET a = 2, b = 4 WHERE (a = 1)", "UPDATE a SET b = 4, a = 2 WHERE (a = 1)"].must_include(sqls.slice!(1))
-    sqls.must_equal ["SELECT * FROM a LIMIT 1", "SELECT * FROM a"]
-  end
-
-  it "should handle saving after modifying just the primary key field" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>3}]]
-    @c.first.set(:a=>2).save
-    @c.all.must_equal [@c.load(:a=>2, :b=>3)]
-    sqls = DB.sqls
-    ["UPDATE a SET a = 2, b = 3 WHERE (a = 1)", "UPDATE a SET b = 3, a = 2 WHERE (a = 1)"].must_include(sqls.slice!(1))
-    sqls.must_equal ["SELECT * FROM a LIMIT 1", "SELECT * FROM a"]
-  end
-
-  it "should handle saving after updating the primary key" do
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>5}]]
-    @c.first.update(:a=>2).update(:b=>4).set(:b=>5).save
-    @c.all.must_equal [@c.load(:a=>2, :b=>5)]
-    DB.sqls.must_equal ["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
-
-  it "should work correctly when using the prepared_statements plugin" do
-    @c.plugin :prepared_statements
-    @ds._fetch = [[{:a=>1, :b=>3}], [{:a=>2, :b=>4}]]
-    o = @c.first
-    o.update(:a=>2, :b=>4)
-    @c.all.must_equal [@c.load(:a=>2, :b=>4)]
-    sqls = DB.sqls
-    ["UPDATE a SET a = 2, b = 4 WHERE (a = 1)", "UPDATE a SET b = 4, a = 2 WHERE (a = 1)"].must_include(sqls.slice!(1))
-    sqls.must_equal ["SELECT * FROM a LIMIT 1", "SELECT * FROM a"]
-
-    o.delete
-  end
-
-  it "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.must_equal(:c=>o2)
-  end
-
-  it "should handle frozen instances" do
-    o = @c.new
-    o.a = 1
-    o.freeze
-    o.pk_hash.must_equal(:a=>1)
-  end
-end

data/spec/extensions/update_refresh_spec.rb

@@ -1,53 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::UpdateRefresh" do
-  before do
-    @db = Sequel.mock(:numrows=>1, :fetch=>{:id=>1, :name=>'b'})
-    @c = Class.new(Sequel::Model(@db[:test]))
-    @ds = @c.dataset
-    @c.columns :id, :name
-    @c.plugin :update_refresh
-    @db.sqls
-  end
-
-  it "should refresh the instance after updating" do
-    o = @c.load(:id=>1, :name=>'a')
-    o.save
-    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1)", "SELECT * FROM test WHERE (id = 1) LIMIT 1"]
-    o.name.must_equal 'b'
-  end
-
-  it "should refresh the instance after updating" do
-    @db.extend_datasets{def supports_returning?(x) true end; def update_sql(*); sql = super; update_returning_sql(sql); sql end}
-    @c.dataset = @db[:test]
-    @db.sqls
-    o = @c.load(:id=>1, :name=>'a')
-    o.save
-    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1) RETURNING *"]
-    o.name.must_equal 'b'
-  end
-
-  it "should support specifying columns to return" do
-    @db.extend_datasets{def supports_returning?(x) true end; def update_sql(*); sql = super; update_returning_sql(sql); sql end}
-    @c.plugin :update_refresh, :columns => [ :a ]
-    @c.dataset = @db[:test]
-    @db.sqls
-    o = @c.load(:id=>1, :name=>'a')
-    o.save
-    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1) RETURNING a"]
-    o.name.must_equal 'b'
-  end
-
-
-  it "should refresh the instance after updating when returning specific columns" do
-    @db.extend_datasets{def supports_returning?(x) true end; def update_sql(*); sql = super; update_returning_sql(sql); sql end}
-    @c.plugin :insert_returning_select
-    @c.dataset = @db[:test].select(:id, :name)
-    @db.sqls
-    o = @c.load(:id=>1, :name=>'a')
-    o.this.opts[:returning] = [:id, :name]
-    o.save
-    @db.sqls.must_equal ["UPDATE test SET name = 'a' WHERE (id = 1) RETURNING id, name"]
-    o.name.must_equal 'b'
-  end
-end