sequel 3.43.0 → 3.44.0

data/spec/model/associations_spec.rb

@@ -250,11 +250,11 @@ describe Sequel::Model, "many_to_one" do
   it "should use :conditions option if given" do
     @c2.many_to_one :parent, :class => @c2, :key => :blah, :conditions=>{:a=>32}
     @c2.new(:id => 1, :blah => 567).parent
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((nodes.id = 567) AND (a = 32)) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((a = 32) AND (nodes.id = 567)) LIMIT 1"]
 
     @c2.many_to_one :parent, :class => @c2, :key => :blah, :conditions=>:a
     @c2.new(:id => 1, :blah => 567).parent
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((nodes.id = 567) AND a) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (a AND (nodes.id = 567)) LIMIT 1"]
   end
 
   it "should support :order, :limit (only for offset), and :dataset options, as well as a block" do
@@ -711,7 +711,7 @@ describe Sequel::Model, "one_to_one" do
     end
     attrib = @c1.load(:id=>3)
     @c2.new(:id => 1234).attribute = attrib
-    MODEL_DB.sqls.should == ['UPDATE attributes SET node_id = NULL WHERE ((node_id = 1234) AND (a = 1) AND (b = 2) AND (id != 3))',
+    MODEL_DB.sqls.should == ['UPDATE attributes SET node_id = NULL WHERE ((a = 1) AND (node_id = 1234) AND (b = 2) AND (id != 3))',
       "UPDATE attributes SET node_id = 1234 WHERE (id = 3)"]
   end
 
@@ -824,11 +824,11 @@ describe Sequel::Model, "one_to_one" do
   it "should use :conditions option if given" do
     @c2.one_to_one :parent, :class => @c2, :conditions=>{:a=>32}
     @c2.new(:id => 567).parent
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((nodes.node_id = 567) AND (a = 32)) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((a = 32) AND (nodes.node_id = 567)) LIMIT 1"]
 
     @c2.one_to_one :parent, :class => @c2, :conditions=>:a
     @c2.new(:id => 567).parent
-    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE ((nodes.node_id = 567) AND a) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (a AND (nodes.node_id = 567)) LIMIT 1"]
   end
 
   it "should support :order, :limit (only for offset), and :dataset options, as well as a block" do
@@ -1364,9 +1364,9 @@ describe Sequel::Model, "one_to_many" do
   
   it "should support a conditions option" do
     @c2.one_to_many :attributes, :class => @c1, :conditions => {:a=>32}
-    @c2.new(:id => 1234).attributes_dataset.sql.should == "SELECT * FROM attributes WHERE ((attributes.node_id = 1234) AND (a = 32))"
+    @c2.new(:id => 1234).attributes_dataset.sql.should == "SELECT * FROM attributes WHERE ((a = 32) AND (attributes.node_id = 1234))"
     @c2.one_to_many :attributes, :class => @c1, :conditions => Sequel.~(:a)
-    @c2.new(:id => 1234).attributes_dataset.sql.should == "SELECT * FROM attributes WHERE ((attributes.node_id = 1234) AND NOT a)"
+    @c2.new(:id => 1234).attributes_dataset.sql.should == "SELECT * FROM attributes WHERE (NOT a AND (attributes.node_id = 1234))"
   end
   
   it "should support an order option" do
@@ -1555,7 +1555,7 @@ describe Sequel::Model, "one_to_many" do
       ds.filter(:b=>2)
     end
     @c2.new(:id => 1234).remove_all_attributes
-    MODEL_DB.sqls.should == ['UPDATE attributes SET node_id = NULL WHERE ((node_id = 1234) AND (a = 1) AND (b = 2))']
+    MODEL_DB.sqls.should == ['UPDATE attributes SET node_id = NULL WHERE ((a = 1) AND (node_id = 1234) AND (b = 2))']
   end
 
   it "should have the remove_all_ method respect the :primary_key option" do
@@ -1924,6 +1924,19 @@ describe Sequel::Model, "many_to_many" do
     MODEL_DB.sqls.should == ['SELECT * FROM attributes NATURAL JOIN an WHERE ((an.nodeid = 1234) AND (xxx = 555)) ORDER BY a LIMIT 10']
   end
 
+  it "should support a :dataset option that accepts the reflection as an argument" do
+    c1 = @c1
+    @c2.many_to_many :attributes, :class => @c1, :dataset=>lambda{|opts| opts.associated_dataset.join_table(:natural, :an).filter(:an__nodeid=>pk)}, :order=> :a, :limit=>10, :select=>nil do |ds|
+      ds.filter(:xxx => @xxx)
+    end
+
+    n = @c2.new(:id => 1234)
+    n.xxx = 555
+    n.attributes_dataset.sql.should == 'SELECT * FROM attributes NATURAL JOIN an WHERE ((an.nodeid = 1234) AND (xxx = 555)) ORDER BY a LIMIT 10'
+    n.attributes.should == [@c1.load({})]
+    MODEL_DB.sqls.should == ['SELECT * FROM attributes NATURAL JOIN an WHERE ((an.nodeid = 1234) AND (xxx = 555)) ORDER BY a LIMIT 10']
+  end
+
   it "should support a :limit option" do
     @c2.many_to_many :attributes, :class => @c1 , :limit=>10
     @c2.new(:id => 1234).attributes_dataset.sql.should == 'SELECT attributes.* FROM attributes INNER JOIN attributes_nodes ON ((attributes_nodes.attribute_id = attributes.id) AND (attributes_nodes.node_id = 1234)) LIMIT 10'

data/spec/model/dataset_methods_spec.rb

@@ -70,40 +70,80 @@ describe Sequel::Model::DatasetMethods, "#to_hash"  do
   end
 end
 
-describe Sequel::Model::DatasetMethods, "#join_table"  do
+describe Sequel::Model::DatasetMethods  do
   before do
     @c = Class.new(Sequel::Model(:items))
+    @c.columns :id
+    @c.db.reset
   end
 
-  specify "should allow use to use a model class when joining" do
+  specify "#join_table should allow use to use a model class when joining" do
     @c.join(Class.new(Sequel::Model(:categories)), :item_id => :id).sql.should == 'SELECT * FROM items INNER JOIN categories ON (categories.item_id = items.id)'
   end
 
-  specify "should handle model classes that aren't simple selects using a subselect" do
+  specify "#join_table should handle model classes that aren't simple selects using a subselect" do
     @c.join(Class.new(Sequel::Model(MODEL_DB[:categories].where(:foo=>1))), :item_id => :id).sql.should == 'SELECT * FROM items INNER JOIN (SELECT * FROM categories WHERE (foo = 1)) AS t1 ON (t1.item_id = items.id)'
   end
-end 
-
-describe Sequel::Model::DatasetMethods, "#graph"  do
-  before do
-    @c = Class.new(Sequel::Model(:items))
-    @c.columns :id
-  end
 
-  specify "should allow use to use a model class when joining" do
+  specify "#graph should allow use to use a model class when joining" do
     c = Class.new(Sequel::Model(:categories))
     c.columns :id
     @c.graph(c, :item_id => :id).sql.should == 'SELECT items.id, categories.id AS categories_id FROM items LEFT OUTER JOIN categories ON (categories.item_id = items.id)'
   end
-end 
 
-describe Sequel::Model::DatasetMethods, "#insert_sql"  do
-  before do
-    @c = Class.new(Sequel::Model(:items))
-    @c.columns :id
+  specify "#insert_sql should handle a single model instance as an argument" do
+    @c.insert_sql(@c.load(:id=>1)).should == 'INSERT INTO items (id) VALUES (1)'
   end
 
-  specify "should handle a single model instance as an argument" do
-    @c.insert_sql(@c.load(:id=>1)).should == 'INSERT INTO items (id) VALUES (1)'
+  specify "#first should handle no primary key" do
+    @c.no_primary_key
+    @c.first.should be_a_kind_of(@c)
+    @c.db.sqls.should == ['SELECT * FROM items LIMIT 1']
+  end
+
+  specify "#last should reverse order by primary key if not already ordered" do
+    @c.last.should be_a_kind_of(@c)
+    @c.db.sqls.should == ['SELECT * FROM items ORDER BY id DESC LIMIT 1']
+    @c.where(:id=>2).last(:foo=>2){{bar=>3}}.should be_a_kind_of(@c)
+    @c.db.sqls.should == ['SELECT * FROM items WHERE ((id = 2) AND (bar = 3) AND (foo = 2)) ORDER BY id DESC LIMIT 1']
+  end
+
+  specify "#last should use existing order if there is one" do
+    @c.order(:foo).last.should be_a_kind_of(@c)
+    @c.db.sqls.should == ['SELECT * FROM items ORDER BY foo DESC LIMIT 1']
+  end
+
+  specify "#last should handle a composite primary key" do
+    @c.set_primary_key [:id1, :id2]
+    @c.last.should be_a_kind_of(@c)
+    @c.db.sqls.should == ['SELECT * FROM items ORDER BY id1 DESC, id2 DESC LIMIT 1']
+  end
+
+  specify "#last should raise an error if no primary key" do
+    @c.no_primary_key
+    proc{@c.last}.should raise_error(Sequel::Error)
+  end
+
+  specify "#paged_each should order by primary key if not already ordered" do
+    @c.paged_each{|r| r.should be_a_kind_of(@c)}
+    @c.db.sqls.should == ['BEGIN', 'SELECT * FROM items ORDER BY id LIMIT 1000 OFFSET 0', 'COMMIT']
+    @c.paged_each(:rows_per_fetch=>5){|r|}
+    @c.db.sqls.should == ['BEGIN', 'SELECT * FROM items ORDER BY id LIMIT 5 OFFSET 0', 'COMMIT']
+  end
+
+  specify "#paged_each should use existing order if there is one" do
+    @c.order(:foo).paged_each{|r| r.should be_a_kind_of(@c)}
+    @c.db.sqls.should == ['BEGIN', 'SELECT * FROM items ORDER BY foo LIMIT 1000 OFFSET 0', 'COMMIT']
+  end
+
+  specify "#paged_each should handle a composite primary key" do
+    @c.set_primary_key [:id1, :id2]
+    @c.paged_each{|r| r.should be_a_kind_of(@c)}
+    @c.db.sqls.should == ['BEGIN', 'SELECT * FROM items ORDER BY id1, id2 LIMIT 1000 OFFSET 0', 'COMMIT']
+  end
+
+  specify "#paged_each should raise an error if no primary key" do
+    @c.no_primary_key
+    proc{@c.paged_each{|r| }}.should raise_error(Sequel::Error)
   end
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.43.0
+  version: 3.44.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -106,6 +106,7 @@ extra_rdoc_files:
 - doc/release_notes/3.41.0.txt
 - doc/release_notes/3.42.0.txt
 - doc/release_notes/3.43.0.txt
+- doc/release_notes/3.44.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -186,6 +187,7 @@ files:
 - doc/release_notes/3.41.0.txt
 - doc/release_notes/3.42.0.txt
 - doc/release_notes/3.43.0.txt
+- doc/release_notes/3.44.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc