sequel 4.33.0 → 4.34.0

data/spec/integration/dataset_test.rb

@@ -171,6 +171,10 @@ describe "Simple Dataset operations" do
     @ds.all.must_equal [{:id=>1, :number=>10}]
   end
 
+  it "should raise exception if raising on duplication columns" do
+    proc{@ds.select_map([:id, :id])}.must_raise Sequel::DuplicateColumnError
+  end if DB.opts[:on_duplicate_columns] == :raise
+
   it "should fetch a single row correctly" do
     @ds.first.must_equal(:id=>1, :number=>10)
     @ds.single_record.must_equal(:id=>1, :number=>10)
@@ -1169,6 +1173,8 @@ describe "Sequel::Dataset convenience methods" do
     @ds.to_hash([:a, :c], :b).must_equal([1, 3]=>2, [5, 7]=>6)
     @ds.to_hash(:a, [:b, :c]).must_equal(1=>[2, 3], 5=>[6, 7])
     @ds.to_hash([:a, :c], [:b, :d]).must_equal([1, 3]=>[2, 4], [5, 7]=>[6, 8])
+
+    @ds.to_hash(:a, :b, :hash => (tmp = {})).must_be_same_as(tmp)
   end
 
   it "should have working #to_hash_groups" do
@@ -1182,6 +1188,8 @@ describe "Sequel::Dataset convenience methods" do
     ds.to_hash_groups([:a, :c], :d).must_equal([1, 3]=>[4, 9], [5, 7]=>[8])
     ds.to_hash_groups(:a, [:b, :d]).must_equal(1=>[[2, 4], [2, 9]], 5=>[[6, 8]])
     ds.to_hash_groups([:a, :c], [:b, :d]).must_equal([1, 3]=>[[2, 4], [2, 9]], [5, 7]=>[[6, 8]])
+
+    ds.to_hash_groups(:a, :d, :hash => (tmp = {})).must_be_same_as(tmp)
   end
 
   it "should have working #select_map" do
@@ -1225,6 +1233,7 @@ describe "Sequel::Dataset convenience methods" do
     @ds.select_hash([:a, :c], :b).must_equal([1, 3]=>2, [5, 7]=>6)
     @ds.select_hash(:a, [:b, :c]).must_equal(1=>[2, 3], 5=>[6, 7])
     @ds.select_hash([:a, :c], [:b, :d]).must_equal([1, 3]=>[2, 4], [5, 7]=>[6, 8])
+    @ds.select_hash(:a, :b, :hash => (tmp = {})).must_be_same_as(tmp)
   end
 
   it "should have working #select_hash_groups" do
@@ -1238,6 +1247,7 @@ describe "Sequel::Dataset convenience methods" do
     ds.select_hash_groups([:a, :c], :d).must_equal([1, 3]=>[4, 9], [5, 7]=>[8])
     ds.select_hash_groups(:a, [:b, :d]).must_equal(1=>[[2, 4], [2, 9]], 5=>[[6, 8]])
     ds.select_hash_groups([:a, :c], [:b, :d]).must_equal([1, 3]=>[[2, 4], [2, 9]], [5, 7]=>[[6, 8]])
+    ds.select_hash_groups(:a, :d, :hash => (tmp = {})).must_be_same_as(tmp)
   end
 end
 

data/spec/integration/eager_loader_test.rb

@@ -511,7 +511,7 @@ describe "many_to_one/one_to_many not referencing primary key" do
 
   it "should load all associated one_to_many objects for a single object" do
     invs = @client1.invoices
-    invs.must_equal [@invoice1, @invoice2]
+    invs.sort_by{|x| x.pk}.must_equal [@invoice1, @invoice2]
     invs[0].client.must_equal @client1
     invs[1].client.must_equal @client1
   end

data/spec/integration/plugin_test.rb

@@ -158,15 +158,15 @@ describe "Class Table Inheritance Plugin" do
   end
   
   it "should handle one_to_many relationships" do
-    Executive.first.staff_members.must_equal [Staff[@i2]]
+    Executive.first(:name=>'Ex').staff_members.must_equal [Staff[@i2]]
   end
   
   it "should handle eagerly loading one_to_many relationships" do
-    Executive.limit(1).eager(:staff_members).first.staff_members.must_equal [Staff[@i2]]
+    Executive.where(:name=>'Ex').eager(:staff_members).first.staff_members.must_equal [Staff[@i2]]
   end
   
   it "should handle eagerly graphing one_to_many relationships" do
-    es = Executive.limit(1).eager_graph(:staff_members).all
+    es = Executive.where(:name=>'Ex').eager_graph(:staff_members).all
     es.must_equal [Executive[@i4]]
     es.map{|x| x.staff_members}.must_equal [[Staff[@i2]]]
   end

data/spec/integration/spec_helper.rb

@@ -50,3 +50,7 @@ if ENV['SEQUEL_CONNECTION_VALIDATOR']
   DB.pool.connection_validation_timeout = -1
 end
 
+if dch = ENV['SEQUEL_DUPLICATE_COLUMNS_HANDLER']
+  DB.extension :duplicate_columns_handler
+  DB.opts[:on_duplicate_columns] = dch.to_sym unless dch.empty?
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.33.0
+  version: 4.34.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -234,6 +234,7 @@ extra_rdoc_files:
 - doc/release_notes/4.31.0.txt
 - doc/release_notes/4.32.0.txt
 - doc/release_notes/4.33.0.txt
+- doc/release_notes/4.34.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -356,6 +357,7 @@ files:
 - doc/release_notes/4.31.0.txt
 - doc/release_notes/4.32.0.txt
 - doc/release_notes/4.33.0.txt
+- doc/release_notes/4.34.0.txt
 - doc/release_notes/4.4.0.txt
 - doc/release_notes/4.5.0.txt
 - doc/release_notes/4.6.0.txt
@@ -478,6 +480,7 @@ files:
 - lib/sequel/extensions/current_datetime_timestamp.rb
 - lib/sequel/extensions/dataset_source_alias.rb
 - lib/sequel/extensions/date_arithmetic.rb
+- lib/sequel/extensions/duplicate_columns_handler.rb
 - lib/sequel/extensions/empty_array_consider_nulls.rb
 - lib/sequel/extensions/empty_array_ignore_nulls.rb
 - lib/sequel/extensions/error_sql.rb
@@ -673,6 +676,7 @@ files:
 - spec/extensions/defaults_setter_spec.rb
 - spec/extensions/delay_add_association_spec.rb
 - spec/extensions/dirty_spec.rb
+- spec/extensions/duplicate_columns_handler_spec.rb
 - spec/extensions/eager_each_spec.rb
 - spec/extensions/empty_array_consider_nulls_spec.rb
 - spec/extensions/error_splitter_spec.rb