sequel 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a449facae4b3dcc14c19ce0f524ca2025db4c74e
-  data.tar.gz: 19e4bbb80143055d03da8134f6308363ff8e2406
+  metadata.gz: 0e97437793fba5f6d584ca832d9188c5779809da
+  data.tar.gz: bf8b6218bf26ea9dc03387724dc904951e0f81d9
 SHA512:
-  metadata.gz: 68c5cbe1672f325a040584b37b78188c34322b6505b7b267d61d7103ee8a3f2364e335324f330a4c63e239eb21896c66242c9c62de91b2052d6bc2ad03289dcf
-  data.tar.gz: 0ee8a1dbc5118fa916c90f112142b3580b2dbbfb4a5eca8f3f5924b510043e488cfbc2d1f1335db587a30b8dfe3a3b02754b46586ce770a38b6bc76ddb004fd0
+  metadata.gz: 8fd114ba94ddf1c53718cbf10b8454dac4ad8cceec47414dca2fbd4a21527f7bfd2f2f3811d18f2bf7035631701c7fa54f352af593517f283e09f8f991cc17da
+  data.tar.gz: b171c79c198bd268e1aee3ff16a26369bfcb0eac4abf5787fc47bf0a1cd16dfa95919ded5455fac1dd4d7290bc3066d58df38cd128c1183a7ca593dff531c12c

data/CHANGELOG

@@ -1,3 +1,7 @@
+=== 4.1.1 (2013-08-01)
+
+* Fix select_map, select_order_map, and single_value methods on eager_graphed datasets (jeremyevans)
+
 === 4.1.0 (2013-08-01)
 
 * Support :inherits option in Database#create_table on PostgreSQL, for table inheritance (jeremyevans)

data/lib/sequel/dataset/actions.rb

@@ -589,7 +589,7 @@ module Sequel
     # Returns nil if dataset is empty.  Users should generally use
     # +get+ instead of this method.
     def single_value
-      if r = naked.ungraphed.single_record
+      if r = ungraphed.naked.single_record
         r.values.first
       end
     end
@@ -761,7 +761,7 @@ module Sequel
     
     # Internals of +select_map+ and +select_order_map+
     def _select_map(column, order, &block)
-      ds = naked.ungraphed
+      ds = ungraphed.naked
       columns = Array(column)
       virtual_row_columns(columns, block)
       select_cols = order ? columns.map{|c| c.is_a?(SQL::OrderedExpression) ? c.expression : c} : columns

data/lib/sequel/version.rb

@@ -6,7 +6,7 @@ module Sequel
   MINOR = 1
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
-  TINY  = 0
+  TINY  = 1
   
   # The version of Sequel you are using, as a string (e.g. "2.11.0")
   VERSION = [MAJOR, MINOR, TINY].join('.')

data/spec/model/eager_loading_spec.rb

@@ -839,6 +839,23 @@ describe Sequel::Model, "#eager_graph" do
     proc{GraphAlbum.eager_graph(Object.new)}.should raise_error(Sequel::Error)
   end
 
+  it "should work correctly with select_map" do
+    ds = GraphAlbum.eager_graph(:band)
+    ds._fetch = [{:id=>1}, {:id=>2}]
+    ds.select_map(:albums__id).should == [1, 2]
+    DB.sqls.should == ['SELECT albums.id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id)']
+    ds._fetch = [{:id=>1}, {:id=>2}]
+    ds.select_map([:albums__id, :albums__id]).should == [[1, 1], [2, 2]]
+    DB.sqls.should == ['SELECT albums.id, albums.id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id)']
+  end
+
+  it "should work correctly with single_value" do
+    ds = GraphAlbum.eager_graph(:band).select(:albums__id)
+    ds._fetch = [{:id=>1}]
+    ds.single_value.should == 1
+    DB.sqls.should == ['SELECT albums.id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id) LIMIT 1']
+  end
+
   it "should not split results and assign associations if ungraphed is called" do
     ds = GraphAlbum.eager_graph(:band).ungraphed
     ds.sql.should == 'SELECT albums.id, albums.band_id, band.id AS band_id_0, band.vocalist_id FROM albums LEFT OUTER JOIN bands AS band ON (band.id = albums.band_id)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Jeremy Evans