sequel 3.30.0 → 3.31.0

data/spec/integration/dataset_test.rb

@@ -39,6 +39,12 @@ describe "Simple Dataset operations" do
     @ds.filter(:id=>2).first[:number].should == 20
   end
 
+  specify "should have insert_multiple return primary key values" do
+    @ds.insert_multiple([{:number=>20}, {:number=>30}]).should == [2, 3]
+    @ds.filter(:id=>2).get(:number).should == 20
+    @ds.filter(:id=>3).get(:number).should == 30
+  end
+
   specify "should join correctly" do
     @ds.join(:items___b, :id=>:id).select_all(:items).all.should == [{:id=>1, :number=>10}]
   end
@@ -713,6 +719,55 @@ describe "Sequel::Dataset#import and #multi_insert" do
   end
 end
 
+describe "Sequel::Dataset#import and #multi_insert :return=>:primary_key " do
+  before do
+    @db = INTEGRATION_DB
+    @db.create_table!(:imp){primary_key :id; Integer :i}
+    @ds = @db[:imp]
+  end
+  after do
+    @db.drop_table(:imp)
+  end
+
+  specify "should return primary key values " do
+    @ds.multi_insert([{:i=>10}, {:i=>20}, {:i=>30}], :return=>:primary_key).should == [1, 2, 3]
+    @ds.import([:i], [[40], [50], [60]], :return=>:primary_key).should == [4, 5, 6]
+    @ds.order(:id).map([:id, :i]).should == [[1, 10], [2, 20], [3, 30], [4, 40], [5, 50], [6, 60]]
+  end
+
+  specify "should return primary key values when :slice is used" do
+    @ds.multi_insert([{:i=>10}, {:i=>20}, {:i=>30}], :return=>:primary_key, :slice=>2).should == [1, 2, 3]
+    @ds.import([:i], [[40], [50], [60]], :return=>:primary_key, :slice=>2).should == [4, 5, 6]
+    @ds.order(:id).map([:id, :i]).should == [[1, 10], [2, 20], [3, 30], [4, 40], [5, 50], [6, 60]]
+  end
+end
+
+describe "Sequel::Dataset convenience methods" do
+  before(:all) do
+    @db = INTEGRATION_DB
+    @db.create_table!(:a){Integer :a; Integer :b; Integer :c}
+    @ds = @db[:a]
+    @ds.insert(1, 3, 5)
+    @ds.insert(1, 3, 6)
+    @ds.insert(1, 4, 5)
+    @ds.insert(2, 3, 5)
+    @ds.insert(2, 4, 6)
+  end
+  after(:all) do
+    @db.drop_table(:a)
+  end
+  
+  it "#group_rollup should include hierarchy of groupings" do
+    @ds.group_by(:a).group_rollup.select_map([:a, :sum.sql_function(:b).cast(Integer).as(:b), :sum.sql_function(:c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 10, 16], [2, 7, 11], [nil, 17, 27]]
+    @ds.group_by(:a, :b).group_rollup.select_map([:a, :b, :sum.sql_function(:c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 3, 11], [1, 4, 5], [1, nil, 16], [2, 3, 5], [2, 4, 6], [2, nil, 11], [nil, nil, 27]]
+  end if INTEGRATION_DB.dataset.supports_group_rollup?
+
+  it "#group_cube should include all combinations of groupings" do
+    @ds.group_by(:a).group_cube.select_map([:a, :sum.sql_function(:b).cast(Integer).as(:b), :sum.sql_function(:c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 10, 16], [2, 7, 11], [nil, 17, 27]]
+    @ds.group_by(:a, :b).group_cube.select_map([:a, :b, :sum.sql_function(:c).cast(Integer).as(:c)]).sort_by{|x| x.inspect}.should == [[1, 3, 11], [1, 4, 5], [1, nil, 16], [2, 3, 5], [2, 4, 6], [2, nil, 11], [nil, 3, 16], [nil, 4, 11], [nil, nil, 27]]
+  end if INTEGRATION_DB.dataset.supports_group_cube?
+end
+
 describe "Sequel::Dataset convenience methods" do
   before(:all) do
     @db = INTEGRATION_DB
@@ -738,6 +793,22 @@ describe "Sequel::Dataset convenience methods" do
     @ds.empty?.should == false
   end
   
+  it "#empty? should work correctly for datasets with limits" do
+    ds = @ds.limit(1)
+    ds.empty?.should == true
+    ds.insert(20, 10)
+    ds.empty?.should == false
+  end
+  
+  it "#empty? should work correctly for datasets with limits and offsets" do
+    ds = @ds.limit(1, 1)
+    ds.empty?.should == true
+    ds.insert(20, 10)
+    ds.empty?.should == true
+    ds.insert(20, 10)
+    ds.empty?.should == false
+  end
+  
   it "#group_and_count should return a grouping by count" do
     @ds.group_and_count(:a).order(:count).all.should == []
     @ds.insert(20, 10)

data/spec/integration/prepared_statement_test.rb

@@ -66,6 +66,10 @@ describe "Prepared Statements and Bound Arguments" do
     @ds.filter(:id=>:$i).filter(:numb=>@ds.select(:numb).filter(:numb=>:$n)).filter(:id=>:$j).call(:select, :n=>10, :i=>1, :j=>1).should == [{:id=>1, :numb=>10}]
   end
 
+  specify "should support subselects with exists with call" do
+    @ds.filter(:id=>:$i).filter(@ds.select(:numb).filter(:numb=>:$n).exists).filter(:id=>:$j).call(:select, :n=>10, :i=>1, :j=>1).should == [{:id=>1, :numb=>10}]
+  end
+
   specify "should support subselects with literal strings with call" do
     @ds.filter(:id=>:$i, :numb=>@ds.select(:numb).filter("numb = ?", :$n)).call(:select, :n=>10, :i=>1).should == [{:id=>1, :numb=>10}]
   end
@@ -151,6 +155,10 @@ describe "Prepared Statements and Bound Arguments" do
     @ds.filter(:id=>:$i).filter(:numb=>@ds.select(:numb).filter(:numb=>:$n)).filter(:id=>:$j).prepare(:select, :seq_select).call(:n=>10, :i=>1, :j=>1).should == [{:id=>1, :numb=>10}]
   end
 
+  specify "should support subselects with exists with prepare" do
+    @ds.filter(:id=>:$i).filter(@ds.select(:numb).filter(:numb=>:$n).exists).filter(:id=>:$j).prepare(:select, :seq_select).call(:n=>10, :i=>1, :j=>1).should == [{:id=>1, :numb=>10}]
+  end
+
   specify "should support subselects with literal strings with prepare" do
     @ds.filter(:id=>:$i, :numb=>@ds.select(:numb).filter("numb = ?", :$n)).prepare(:select, :seq_select).call(:n=>10, :i=>1).should == [{:id=>1, :numb=>10}]
   end

data/spec/model/association_reflection_spec.rb

@@ -187,6 +187,33 @@ describe Sequel::Model::Associations::AssociationReflection, "#associated_object
   end
 end
 
+describe Sequel::Model::Associations::AssociationReflection do
+  before do
+    @c = Class.new(Sequel::Model(:foo))
+    @c.meta_def(:name){"C"}
+  end
+
+  it "one_to_many #qualified_primary_key should be a qualified version of the primary key" do
+    @c.one_to_many :cs, :class=>@c
+    @c.dataset.literal(@c.association_reflection(:cs).qualified_primary_key).should == 'foo.id'
+  end
+
+  it "many_to_many #associated_key_column should be the left key" do
+    @c.many_to_many :cs, :class=>@c
+    @c.association_reflection(:cs).associated_key_column.should == :c_id
+  end
+
+  it "many_to_many #qualified_right_key should be a qualified version of the primary key" do
+    @c.many_to_many :cs, :class=>@c, :right_key=>:c2_id
+    @c.dataset.literal(@c.association_reflection(:cs).qualified_right_key).should == 'cs_cs.c2_id'
+  end
+
+  it "many_to_many #qualified_right_primary_key should be a qualified version of the primary key" do
+    @c.many_to_many :cs, :class=>@c
+    @c.dataset.literal(@c.association_reflection(:cs).qualified_right_primary_key).should == 'foo.id'
+  end
+end
+
 describe Sequel::Model::Associations::AssociationReflection, "#remove_before_destroy?" do
   before do
     @c = Class.new(Sequel::Model(:foo))

data/spec/model/associations_spec.rb

@@ -148,6 +148,21 @@ describe Sequel::Model, "many_to_one" do
     MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (nodes.id = 234) LIMIT 1"]
   end
   
+  it "should allow association with the same name as the key if :key_alias is given" do
+    @c2.def_column_alias(:parent_id_id, :parent_id)
+    @c2.many_to_one :parent_id, :key_column=>:parent_id, :class => @c2
+    d = @c2.load(:id => 1, :parent_id => 234)
+    d.parent_id_dataset.sql.should == "SELECT * FROM nodes WHERE (nodes.id = 234) LIMIT 1"
+    d.parent_id.should == @c2.load(:x => 1, :id => 1)
+    d.parent_id_id.should == 234
+    d[:parent_id].should == 234
+    MODEL_DB.sqls.should == ["SELECT * FROM nodes WHERE (nodes.id = 234) LIMIT 1"]
+
+    d.parent_id_id = 3
+    d.parent_id_id.should == 3
+    d[:parent_id].should == 3
+  end
+  
   it "should use implicit class if omitted" do
     begin
       class ::ParParent < Sequel::Model; end
@@ -1181,7 +1196,7 @@ describe Sequel::Model, "one_to_many" do
     a = @c1.load(:id => 2345, :node_id => 1234)
     a.should == n.remove_attribute(a)
     a.values.should == {:node_id => nil, :id => 2345}
-    MODEL_DB.sqls.should == ["SELECT 1 FROM attributes WHERE ((attributes.node_id = 1234) AND (id = 2345)) LIMIT 1", 'UPDATE attributes SET node_id = NULL WHERE (id = 2345)']
+    MODEL_DB.sqls.should == ["SELECT 1 AS one FROM attributes WHERE ((attributes.node_id = 1234) AND (id = 2345)) LIMIT 1", 'UPDATE attributes SET node_id = NULL WHERE (id = 2345)']
   end
 
   it "should have the remove_ method raise an error if the passed object is not already associated" do
@@ -1191,7 +1206,7 @@ describe Sequel::Model, "one_to_many" do
     a = @c1.load(:id => 2345, :node_id => 1234)
     @c1.dataset._fetch = []
     proc{n.remove_attribute(a)}.should raise_error(Sequel::Error)
-    MODEL_DB.sqls.should == ["SELECT 1 FROM attributes WHERE ((attributes.node_id = 1234) AND (id = 2345)) LIMIT 1"]
+    MODEL_DB.sqls.should == ["SELECT 1 AS one FROM attributes WHERE ((attributes.node_id = 1234) AND (id = 2345)) LIMIT 1"]
   end
 
   it "should accept a hash for the add_ method and create a new record" do
@@ -1287,7 +1302,7 @@ describe Sequel::Model, "one_to_many" do
     n.remove_attribute(a).should == a
     sqls = MODEL_DB.sqls
     sqls.pop.should =~ /UPDATE attributes SET (node_id|y) = NULL, (node_id|y) = NULL WHERE \(id = 2345\)/
-    sqls.should == ["SELECT 1 FROM attributes WHERE ((attributes.node_id = 1234) AND (attributes.y = 5) AND (id = 2345)) LIMIT 1"]
+    sqls.should == ["SELECT 1 AS one FROM attributes WHERE ((attributes.node_id = 1234) AND (attributes.y = 5) AND (id = 2345)) LIMIT 1"]
   end
   
   it "should accept a array of composite primary key values for the remove_ method and remove an existing record" do

data/spec/model/base_spec.rb

@@ -35,6 +35,26 @@ describe "Model attribute setters" do
   end
 end
 
+describe "Model.def_column_alias" do
+  before do
+    @o = Class.new(Sequel::Model(:items)) do
+      columns :id
+      def_column_alias(:id2, :id)
+    end.load(:id=>1)
+    MODEL_DB.reset
+  end
+
+  it "should create an getter alias for the column" do
+    @o.id2.should == 1
+  end
+
+  it "should create an setter alias for the column" do
+    @o.id2 = 2
+    @o.id2.should == 2
+    @o.values.should == {:id => 2}
+  end
+end
+
 describe Sequel::Model, "dataset" do
   before do
     @a = Class.new(Sequel::Model(:items))

data/spec/model/eager_loading_spec.rb

@@ -102,6 +102,16 @@ describe Sequel::Model, "#eager" do
     MODEL_DB.sqls.should == []
   end
   
+  it "should eagerly load a single many_to_one association with the same name as the column" do
+    EagerAlbum.def_column_alias(:band_id_id, :band_id)
+    EagerAlbum.many_to_one :band_id, :key_column=>:band_id, :class=>EagerBand
+    a = EagerAlbum.eager(:band_id).all
+    MODEL_DB.sqls.should == ['SELECT * FROM albums', 'SELECT * FROM bands WHERE (bands.id IN (2))']
+    a.should == [EagerAlbum.load(:id => 1, :band_id => 2)]
+    a.first.band_id.should == EagerBand.load(:id=>2)
+    MODEL_DB.sqls.should == []
+  end
+  
   it "should eagerly load a single one_to_one association" do
     EagerAlbum.one_to_one :track, :class=>'EagerTrack', :key=>:album_id
     a = EagerAlbum.eager(:track).all
@@ -757,6 +767,17 @@ describe Sequel::Model, "#eager_graph" do
     a.first.band.should == GraphBand.load(:id => 2, :vocalist_id=>3)
   end
   
+  it "should eagerly load a single many_to_one association with the same name as a column" do
+    GraphAlbum.def_column_alias(:band_id_id, :band_id)
+    GraphAlbum.many_to_one :band_id, :key_column=>:band_id, :class=>GraphBand
+    ds = GraphAlbum.eager_graph(:band_id)
+    ds.sql.should == 'SELECT albums.id, albums.band_id, band_id.id AS band_id_id, band_id.vocalist_id FROM albums LEFT OUTER JOIN bands AS band_id ON (band_id.id = albums.band_id)'
+    ds._fetch = {:id=>1, :band_id=>2, :band_id_id=>2, :vocalist_id=>3}
+    a = ds.all
+    a.should == [GraphAlbum.load(:id => 1, :band_id => 2)]
+    a.first.band_id.should == GraphBand.load(:id => 2, :vocalist_id=>3)
+  end
+  
   it "should eagerly load a single one_to_one association" do
     GraphAlbum.one_to_one :track, :class=>'GraphTrack', :key=>:album_id
     ds = GraphAlbum.eager_graph(:track)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 3.30.0
+  version: 3.31.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-01 00:00:00.000000000 Z
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies: []
 description: The Database Toolkit for Ruby
 email: code@jeremyevans.net
@@ -89,6 +89,7 @@ extra_rdoc_files:
 - doc/release_notes/3.28.0.txt
 - doc/release_notes/3.29.0.txt
 - doc/release_notes/3.30.0.txt
+- doc/release_notes/3.31.0.txt
 files:
 - MIT-LICENSE
 - CHANGELOG
@@ -156,6 +157,7 @@ files:
 - doc/release_notes/3.28.0.txt
 - doc/release_notes/3.29.0.txt
 - doc/release_notes/3.30.0.txt
+- doc/release_notes/3.31.0.txt
 - doc/sharding.rdoc
 - doc/sql.rdoc
 - doc/validations.rdoc