sequel 4.36.0 → 5.61.0

data/spec/extensions/eager_each_spec.rb

@@ -1,66 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::EagerEach" do
-  before do
-    @c = Class.new(Sequel::Model(:items))
-    @c.columns :id, :parent_id
-    @c.plugin :eager_each
-    @c.one_to_many :children, :class=>@c, :key=>:parent_id
-    @c.db.sqls
-  end
-
-  it "should make #each on an eager dataset do eager loading" do
-    a = []
-    ds = @c.eager(:children)
-    ds._fetch = [{:id=>1, :parent_id=>nil}, {:id=>2, :parent_id=>nil}]
-    @c.dataset._fetch = [{:id=>3, :parent_id=>1}, {:id=>4, :parent_id=>1}, {:id=>5, :parent_id=>2}, {:id=>6, :parent_id=>2}]
-    ds.each{|c| a << c}
-    a.must_equal [@c.load(:id=>1, :parent_id=>nil), @c.load(:id=>2, :parent_id=>nil)]
-    a.map{|c| c.associations[:children]}.must_equal [[@c.load(:id=>3, :parent_id=>1), @c.load(:id=>4, :parent_id=>1)], [@c.load(:id=>5, :parent_id=>2), @c.load(:id=>6, :parent_id=>2)]]
-    sqls = @c.db.sqls
-    sqls.shift.must_equal 'SELECT * FROM items'
-    ['SELECT * FROM items WHERE (items.parent_id IN (1, 2))', 
-     'SELECT * FROM items WHERE (items.parent_id IN (2, 1))'].must_include(sqls.pop)
-  end
-
-  it "should make #each on an eager_graph dataset do eager loading" do
-    a = []
-    ds = @c.eager_graph(:children)
-    ds._fetch = [{:id=>1, :parent_id=>nil, :children_id=>3, :children_parent_id=>1}, {:id=>1, :parent_id=>nil, :children_id=>4, :children_parent_id=>1}, {:id=>2, :parent_id=>nil, :children_id=>5, :children_parent_id=>2}, {:id=>2, :parent_id=>nil, :children_id=>6, :children_parent_id=>2}]
-    ds.each{|c| a << c}
-    a.must_equal [@c.load(:id=>1, :parent_id=>nil), @c.load(:id=>2, :parent_id=>nil)]
-    a.map{|c| c.associations[:children]}.must_equal [[@c.load(:id=>3, :parent_id=>1), @c.load(:id=>4, :parent_id=>1)], [@c.load(:id=>5, :parent_id=>2), @c.load(:id=>6, :parent_id=>2)]]
-    @c.db.sqls.must_equal ['SELECT items.id, items.parent_id, children.id AS children_id, children.parent_id AS children_parent_id FROM items LEFT OUTER JOIN items AS children ON (children.parent_id = items.id)']
-  end
-
-  it "should make #first on an eager dataset do eager loading" do
-    ds = @c.eager(:children)
-    ds._fetch = [{:id=>1, :parent_id=>nil}]
-    @c.dataset._fetch = [{:id=>3, :parent_id=>1}, {:id=>4, :parent_id=>1}]
-    a = ds.first
-    a.values.must_equal(:id=>1, :parent_id=>nil)
-    a.associations[:children].must_equal [@c.load(:id=>3, :parent_id=>1), @c.load(:id=>4, :parent_id=>1)]
-    @c.db.sqls.must_equal ['SELECT * FROM items LIMIT 1','SELECT * FROM items WHERE (items.parent_id IN (1))'] 
-  end
-
-  it "should make #first on an eager_graph dataset do eager loading" do
-    ds = @c.eager_graph(:children)
-    ds._fetch = [[{:id=>1, :parent_id=>nil, :children_id=>3, :children_parent_id=>1}], [{:id=>1, :parent_id=>nil, :children_id=>3, :children_parent_id=>1}, {:id=>1, :parent_id=>nil, :children_id=>4, :children_parent_id=>1}]]
-    a = ds.first
-    a.values.must_equal(:id=>1, :parent_id=>nil)
-    a.associations[:children].must_equal [@c.load(:id=>3, :parent_id=>1), @c.load(:id=>4, :parent_id=>1)]
-    @c.db.sqls.must_equal ['SELECT items.id, items.parent_id, children.id AS children_id, children.parent_id AS children_parent_id FROM items LEFT OUTER JOIN items AS children ON (children.parent_id = items.id) LIMIT 1',
-      'SELECT items.id, items.parent_id, children.id AS children_id, children.parent_id AS children_parent_id FROM items LEFT OUTER JOIN items AS children ON (children.parent_id = items.id) WHERE (items.id = 1)']
-  end
-
-  it "should make #first on a non-eager dataset work correctly" do
-    @c.dataset._fetch = [{:id=>1, :parent_id=>nil}]
-    @c.first.must_equal @c.load(:id=>1, :parent_id=>nil)
-  end
-
-  it "should not attempt to eager load when getting the columns" do
-    ds = @c.eager(:children)
-    def ds.all; raise; end
-    ds.columns!
-  end
-end

data/spec/extensions/empty_array_consider_nulls_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "filter_having extension" do
-  before do
-    @dataset = Sequel.mock[:test].extension(:empty_array_consider_nulls)
-  end
-
-  it "should handle all types of IN/NOT IN queries with empty arrays" do
-    @dataset.filter(:id => []).sql.must_equal "SELECT * FROM test WHERE (id != id)"
-    @dataset.filter([:id1, :id2] => []).sql.must_equal "SELECT * FROM test WHERE ((id1 != id1) AND (id2 != id2))"
-    @dataset.exclude(:id => []).sql.must_equal "SELECT * FROM test WHERE (id = id)"
-    @dataset.exclude([:id1, :id2] => []).sql.must_equal "SELECT * FROM test WHERE ((id1 = id1) AND (id2 = id2))"
-  end
-
-  it "should handle IN/NOT IN queries with multiple columns and an empty dataset where the database doesn't support it" do
-    @dataset.meta_def(:supports_multiple_column_in?){false}
-    db = Sequel.mock
-    d1 = db[:test].select(:id1, :id2).filter(:region=>'Asia').columns(:id1, :id2)
-    @dataset.filter([:id1, :id2] => d1).sql.must_equal "SELECT * FROM test WHERE ((id1 != id1) AND (id2 != id2))"
-    db.sqls.must_equal ["SELECT id1, id2 FROM test WHERE (region = 'Asia')"]
-    @dataset.exclude([:id1, :id2] => d1).sql.must_equal "SELECT * FROM test WHERE ((id1 = id1) AND (id2 = id2))"
-    db.sqls.must_equal ["SELECT id1, id2 FROM test WHERE (region = 'Asia')"]
-  end
-end

data/spec/extensions/error_splitter_spec.rb

@@ -1,18 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "Sequel::Plugins::ErrorSplitter" do
-  before do
-    @c = Class.new(Sequel::Model)
-    @c.plugin :error_splitter
-    @m = @c.new
-    def @m.validate
-      errors.add([:a, :b], 'is bad')
-    end
-  end
-
-  it "should split errors for multiple columns and assign them to each column" do
-    @m.valid?.must_equal false
-    @m.errors.must_equal(:a=>['is bad'], :b=>['is bad'])
-  end
-end
-

data/spec/extensions/error_sql_spec.rb

@@ -1,20 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "error_sql extension" do
-  before do
-    @db = Sequel.mock(:fetch=>proc{|sql| @db.log_yield(sql){raise StandardError}}).extension(:error_sql)
-  end
-
-  it "should have Sequel::DatabaseError#sql give the SQL causing the error" do
-    @db["SELECT"].all rescue (e = $!)
-    e.sql.must_equal "SELECT"
-  end
-
-  it "should have Sequel::DatabaseError#sql give the SQL causing the error when using a logger" do
-    l = Object.new
-    def l.method_missing(*) end
-    @db.loggers = [l]
-    @db["SELECT"].all rescue (e = $!)
-    e.sql.must_equal "SELECT"
-  end
-end

data/spec/extensions/eval_inspect_spec.rb

@@ -1,73 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-Sequel.extension :eval_inspect
-
-describe "eval_inspect extension" do
-  before do
-    @ds = Sequel.mock.dataset
-    @ds.meta_def(:supports_window_functions?){true}
-    @ds.meta_def(:literal_blob_append){|sql, s| sql << "X'#{s}'"}
-  end
-
-  it "should make eval(obj.inspect) == obj for all Sequel::SQL::Expression subclasses" do
-    [
-      # Objects with components where eval(inspect) == self
-      Sequel::SQL::AliasedExpression.new(:b, :a),
-      Sequel::SQL::AliasedExpression.new(:b, :a, [:c, :d]),
-      Sequel::SQL::CaseExpression.new({:b=>:a}, :c),
-      Sequel::SQL::CaseExpression.new({:b=>:a}, :c, :d),
-      Sequel::SQL::Cast.new(:a, :b),
-      Sequel::SQL::ColumnAll.new(:a),
-      Sequel::SQL::ComplexExpression.new(:'=', :b, :a),
-      Sequel::SQL::Constant.new(:a),
-      Sequel::CURRENT_DATE,
-      Sequel::CURRENT_TIMESTAMP,
-      Sequel::CURRENT_TIME,
-      Sequel::SQLTRUE,
-      Sequel::SQLFALSE,
-      Sequel::NULL,
-      Sequel::NOTNULL,
-      Sequel::SQL::Function.new(:a, :b, :c),
-      Sequel::SQL::Identifier.new(:a),
-      Sequel::SQL::JoinClause.new(:inner, :b),
-      Sequel::SQL::JoinOnClause.new({:d=>:a}, :inner, :b),
-      Sequel::SQL::JoinUsingClause.new([:a], :inner, :b),
-      Sequel::SQL::JoinClause.new(:inner, Sequel.as(:b, :c, [:d, :e])),
-      Sequel::SQL::JoinOnClause.new({:d=>:a}, :inner, Sequel.as(:b, :c, [:d, :e])),
-      Sequel::SQL::JoinUsingClause.new([:a], :inner, Sequel.as(:b, :c, [:d, :e])),
-      Sequel::SQL::PlaceholderLiteralString.new('? = ?', [:a, :b]),
-      Sequel::SQL::PlaceholderLiteralString.new(':a = :b', [{:a=>:b, :b=>42}]),
-      Sequel::SQL::OrderedExpression.new(:a),
-      Sequel::SQL::OrderedExpression.new(:a, false),
-      Sequel::SQL::OrderedExpression.new(:a, false, :nulls=>:first),
-      Sequel::SQL::OrderedExpression.new(:a, false, :nulls=>:last),
-      Sequel::SQL::QualifiedIdentifier.new(:b, :a),
-      Sequel::SQL::Subscript.new(:a, [1, 2]),
-      Sequel::SQL::Window.new(:order=>:a, :partition=>:b),
-      Sequel::SQL::Function.new(:a, :b, :c).over(:order=>:a, :partition=>:b),
-      Sequel::SQL::Wrapper.new(:a),
-      
-      # Objects with components where eval(inspect) != self
-      Sequel::SQL::AliasedExpression.new(Sequel::SQL::Blob.new('s'), :a),
-      Sequel::SQL::AliasedExpression.new(Sequel::LiteralString.new('s'), :a),
-      Sequel::SQL::PlaceholderLiteralString.new('(a, b) IN ?', [Sequel::SQL::ValueList.new([[1, 2]])]),
-      Sequel::SQL::CaseExpression.new({{:d=>Sequel::LiteralString.new('e')}=>:a}, :c, :d),
-      Sequel::SQL::AliasedExpression.new(Date.new(2011, 10, 11), :a),
-      Sequel::SQL::AliasedExpression.new(Sequel::SQLTime.create(10, 20, 30, 500000.125), :a),
-      Sequel::SQL::AliasedExpression.new(DateTime.new(2011, 9, 11, 10, 20, 30), :a),
-      Sequel::SQL::AliasedExpression.new(DateTime.new(2011, 9, 11, 10, 20, 30, 0.25), :a),
-      Sequel::SQL::AliasedExpression.new(DateTime.new(2011, 9, 11, 10, 20, 30, -0.25), :a),
-      Sequel::SQL::AliasedExpression.new(Time.local(2011, 9, 11, 10, 20, 30), :a),
-      Sequel::SQL::AliasedExpression.new(Time.local(2011, 9, 11, 10, 20, 30, 500000.125), :a),
-      Sequel::SQL::AliasedExpression.new(Time.utc(2011, 9, 11, 10, 20, 30), :a),
-      Sequel::SQL::AliasedExpression.new(Time.utc(2011, 9, 11, 10, 20, 30, 500000.125), :a),
-      Sequel::SQL::AliasedExpression.new(BigDecimal.new('1.000000000000000000000000000000000000000000000001'), :a),
-      Sequel::SQL::AliasedExpression.new(Sequel::CURRENT_DATE, :a),
-      Sequel::SQL::AliasedExpression.new(Sequel::CURRENT_TIMESTAMP, :a),
-    ].each do |o|
-      v = eval(o.inspect)
-      v.must_equal o
-      @ds.literal(v).must_equal @ds.literal(o)
-    end
-  end
-end

data/spec/extensions/filter_having_spec.rb

@@ -1,40 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "filter_having extension" do
-  before do
-    @ds = Sequel.mock[:t].extension(:filter_having)
-    @dsh = @ds.having(:a)
-  end
-
-  it "should make filter operate on HAVING clause if dataset has a HAVING clause" do
-    @dsh.filter(:b).sql.must_equal 'SELECT * FROM t HAVING (a AND b)'
-  end
-
-  it "should make filter operate on WHERE clause if dataset does not have a HAVING clause" do
-    @ds.filter(:b).sql.must_equal 'SELECT * FROM t WHERE b'
-  end
-
-  it "should make and operate on HAVING clause if dataset has a HAVING clause" do
-    @dsh.and(:b).sql.must_equal 'SELECT * FROM t HAVING (a AND b)'
-  end
-
-  it "should make and operate on WHERE clause if dataset does not have a HAVING clause" do
-    @ds.where(:a).and(:b).sql.must_equal 'SELECT * FROM t WHERE (a AND b)'
-  end
-
-  it "should make or operate on HAVING clause if dataset has a HAVING clause" do
-    @dsh.or(:b).sql.must_equal 'SELECT * FROM t HAVING (a OR b)'
-  end
-
-  it "should make or operate on WHERE clause if dataset does not have a HAVING clause" do
-    @ds.where(:a).or(:b).sql.must_equal 'SELECT * FROM t WHERE (a OR b)'
-  end
-
-  it "should make exclude operate on HAVING clause if dataset has a HAVING clause" do
-    @dsh.exclude(:b).sql.must_equal 'SELECT * FROM t HAVING (a AND NOT b)'
-  end
-
-  it "should make exclude operate on WHERE clause if dataset does not have a HAVING clause" do
-    @ds.exclude(:b).sql.must_equal 'SELECT * FROM t WHERE NOT b'
-  end
-end

data/spec/extensions/force_encoding_spec.rb

@@ -1,114 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-if RUBY_VERSION >= '1.9.0'
-describe "force_encoding plugin" do
-  before do
-    @c = Class.new(Sequel::Model) do
-    end
-    @c.columns :id, :x
-    @c.plugin :force_encoding, 'UTF-8'
-    @e1 = Encoding.find('UTF-8')
-  end
-
-  it "should force encoding to given encoding on load" do
-    s = 'blah'.dup
-    s.force_encoding('US-ASCII')
-    o = @c.load(:id=>1, :x=>s)
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal @e1
-  end
-  
-  it "should force encoding to given encoding when setting column values" do
-    s = 'blah'.dup
-    s.force_encoding('US-ASCII')
-    o = @c.new(:x=>s)
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal @e1
-  end
-  
-  it "should work correctly when given a frozen string" do
-    s = 'blah'.dup
-    s.force_encoding('US-ASCII')
-    s.freeze
-    o = @c.new(:x=>s)
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal @e1
-  end
-  
-  it "should have a forced_encoding class accessor" do
-    s = 'blah'.dup
-    s.force_encoding('US-ASCII')
-    @c.forced_encoding = 'Windows-1258'
-    o = @c.load(:id=>1, :x=>s)
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal Encoding.find('Windows-1258')
-  end
-  
-  it "should not force encoding if forced_encoding is nil" do
-    s = 'blah'.dup
-    s.force_encoding('US-ASCII')
-    @c.forced_encoding = nil
-    o = @c.load(:id=>1, :x=>s)
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal Encoding.find('US-ASCII')
-  end
-  
-  it "should work correctly when subclassing" do
-    c = Class.new(@c)
-    s = 'blah'.dup
-    s.force_encoding('US-ASCII')
-    o = c.load(:id=>1, :x=>s)
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal @e1
-    
-    c.plugin :force_encoding, 'UTF-16LE'
-    s = String.new
-    s.force_encoding('US-ASCII')
-    o = c.load(:id=>1, :x=>s)
-    o.x.must_equal ''
-    o.x.encoding.must_equal Encoding.find('UTF-16LE')
-    
-    @c.plugin :force_encoding, 'UTF-32LE'
-    s = String.new
-    s.force_encoding('US-ASCII')
-    o = @c.load(:id=>1, :x=>s)
-    o.x.must_equal ''
-    o.x.encoding.must_equal Encoding.find('UTF-32LE')
-    
-    s = String.new
-    s.force_encoding('US-ASCII')
-    o = c.load(:id=>1, :x=>s)
-    o.x.must_equal ''
-    o.x.encoding.must_equal Encoding.find('UTF-16LE')
-  end
-  
-  it "should work when saving new model instances" do
-    o = @c.new
-    ds = DB[:a]
-    def ds.first
-      s = 'blah'.dup
-      s.force_encoding('US-ASCII')
-      {:id=>1, :x=>s}
-    end
-    @c.dataset = ds
-    o.save
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal @e1
-  end
-  
-  it "should work when refreshing model instances" do
-    o = @c.load(:id=>1, :x=>'as'.dup)
-    ds = DB[:a]
-    def ds.first
-      s = 'blah'.dup
-      s.force_encoding('US-ASCII')
-      {:id=>1, :x=>s}
-    end
-    @c.dataset = ds
-    o.refresh
-    o.x.must_equal 'blah'
-    o.x.encoding.must_equal @e1
-  end
-end 
-else
-  skip_warn "force_encoding plugin: only works on ruby 1.9+"
-end

data/spec/extensions/from_block_spec.rb

@@ -1,21 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "from_block extension" do
-  before do
-    @db = Sequel.mock
-    @db.extension(:from_block)
-  end
-
-  it "should make Database#from blocks apply to FROM" do
-    @db.from{f}.sql.must_equal 'SELECT * FROM f'
-    @db.from{[f, g(f)]}.sql.must_equal 'SELECT * FROM f, g(f)'
-  end
-
-  it "should handle from blocks with method arguments" do
-    @db.from(:f){g(f)}.sql.must_equal 'SELECT * FROM f, g(f)'
-  end
-
-  it "should handle from without block" do
-    @db.from(:f).sql.must_equal 'SELECT * FROM f'
-  end
-end

data/spec/extensions/graph_each_spec.rb

@@ -1,119 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe Sequel::Dataset, " graphing" do
-  before do
-    @db = Sequel.mock(:columns=>proc do |sql|
-      case sql
-      when /points/
-        [:id, :x, :y]
-      when /lines/
-        [:id, :x, :y, :graph_id]
-      else
-        [:id, :name, :x, :y, :lines_x]
-      end
-    end).extension(:graph_each)
-    @ds1 = @db.from(:points)
-    @ds2 = @db.from(:lines)
-    @ds3 = @db.from(:graphs)
-    [@ds1, @ds2, @ds3].each{|ds| ds.columns}
-    @db.sqls
-  end
-
-  it "#graph_each should handle graph using currently selected columns as the basis for the selected columns in a new graph" do
-    ds = @ds1.select(:id).graph(@ds2, :x=>:id)
-    ds._fetch = {:id=>1, :lines_id=>2, :x=>3, :y=>4, :graph_id=>5}
-    ds.all.must_equal [{:points=>{:id=>1}, :lines=>{:id=>2, :x=>3, :y=>4, :graph_id=>5}}]
-
-    ds = @ds1.select(:id, :x).graph(@ds2, :x=>:id)
-    ds._fetch = {:id=>1, :x=>-1, :lines_id=>2, :lines_x=>3, :y=>4, :graph_id=>5}
-    ds.all.must_equal [{:points=>{:id=>1, :x=>-1}, :lines=>{:id=>2, :x=>3, :y=>4, :graph_id=>5}}]
-
-    ds = @ds1.select(Sequel.identifier(:id), Sequel.qualify(:points, :x)).graph(@ds2, :x=>:id)
-    ds._fetch = {:id=>1, :x=>-1, :lines_id=>2, :lines_x=>3, :y=>4, :graph_id=>5}
-    ds.all.must_equal [{:points=>{:id=>1, :x=>-1}, :lines=>{:id=>2, :x=>3, :y=>4, :graph_id=>5}}]
-
-    ds = @ds1.select(Sequel.identifier(:id).qualify(:points), Sequel.identifier(:x).as(:y)).graph(@ds2, :x=>:id)
-    ds._fetch = {:id=>1, :y=>-1, :lines_id=>2, :x=>3, :lines_y=>4, :graph_id=>5}
-    ds.all.must_equal [{:points=>{:id=>1, :y=>-1}, :lines=>{:id=>2, :x=>3, :y=>4, :graph_id=>5}}]
-
-    ds = @ds1.select(:id, Sequel.identifier(:x).qualify(Sequel.identifier(:points)).as(Sequel.identifier(:y))).graph(@ds2, :x=>:id)
-    ds._fetch = {:id=>1, :y=>-1, :lines_id=>2, :x=>3, :lines_y=>4, :graph_id=>5}
-    ds.all.must_equal [{:points=>{:id=>1, :y=>-1}, :lines=>{:id=>2, :x=>3, :y=>4, :graph_id=>5}}]
-  end
-
-  it "#graph_each should split the result set into component tables" do
-    @db.fetch = [[{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7}],
-      [{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graphs_id=>8, :name=>9, :graphs_x=>10, :graphs_y=>11, :graphs_lines_x=>12}],
-      [{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graph_id_0=>8, :graph_x=>9, :graph_y=>10, :graph_graph_id=>11}]]
-
-    @ds1.graph(@ds2, :x=>:id).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}}]
-    @ds1.graph(@ds2, :x=>:id).graph(@ds3, :id=>:graph_id).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graphs=>{:id=>8, :name=>9, :x=>10, :y=>11, :lines_x=>12}}]
-    @ds1.graph(@ds2, :x=>:id).graph(@ds2, {:y=>:points__id}, :table_alias=>:graph).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graph=>{:id=>8, :x=>9, :y=>10, :graph_id=>11}}]
-  end
-
-  it "#graph_each should split the result set into component tables when using first" do
-    @db.fetch = [[{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7}],
-      [{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graphs_id=>8, :name=>9, :graphs_x=>10, :graphs_y=>11, :graphs_lines_x=>12}],
-      [{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graph_id_0=>8, :graph_x=>9, :graph_y=>10, :graph_graph_id=>11}]]
-
-    @ds1.graph(@ds2, :x=>:id).first.must_equal(:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7})
-    @ds1.graph(@ds2, :x=>:id).graph(@ds3, :id=>:graph_id).first.must_equal(:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graphs=>{:id=>8, :name=>9, :x=>10, :y=>11, :lines_x=>12})
-    @ds1.graph(@ds2, :x=>:id).graph(@ds2, {:y=>:points__id}, :table_alias=>:graph).first.must_equal(:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graph=>{:id=>8, :x=>9, :y=>10, :graph_id=>11})
-  end
-
-  it "#graph_each should give a nil value instead of a hash when all values for a table are nil" do
-    @db.fetch = [[{:id=>1,:x=>2,:y=>3,:lines_id=>nil,:lines_x=>nil,:lines_y=>nil,:graph_id=>nil}],
-      [{:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graphs_id=>nil, :name=>nil, :graphs_x=>nil, :graphs_y=>nil, :graphs_lines_x=>nil},
-      {:id=>2,:x=>4,:y=>5,:lines_id=>nil,:lines_x=>nil,:lines_y=>nil,:graph_id=>nil, :graphs_id=>nil, :name=>nil, :graphs_x=>nil, :graphs_y=>nil, :graphs_lines_x=>nil},
-      {:id=>3,:x=>5,:y=>6,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7, :graphs_id=>7, :name=>8, :graphs_x=>9, :graphs_y=>10, :graphs_lines_x=>11},
-      {:id=>3,:x=>5,:y=>6,:lines_id=>7,:lines_x=>5,:lines_y=>8,:graph_id=>9, :graphs_id=>9, :name=>10, :graphs_x=>10, :graphs_y=>11, :graphs_lines_x=>12}]]
-
-    @ds1.graph(@ds2, :x=>:id).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :lines=>nil}]
-    @ds1.graph(@ds2, :x=>:id).graph(@ds3, :id=>:graph_id).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graphs=>nil},
-      {:points=>{:id=>2, :x=>4, :y=>5}, :lines=>nil, :graphs=>nil},
-      {:points=>{:id=>3, :x=>5, :y=>6}, :lines=>{:id=>4, :x=>5, :y=>6, :graph_id=>7}, :graphs=>{:id=>7, :name=>8, :x=>9, :y=>10, :lines_x=>11}},
-      {:points=>{:id=>3, :x=>5, :y=>6}, :lines=>{:id=>7, :x=>5, :y=>8, :graph_id=>9}, :graphs=>{:id=>9, :name=>10, :x=>10, :y=>11, :lines_x=>12}}]
-  end
-
-  it "#graph_each should not give a nil value instead of a hash when any value for a table is false" do
-    @db.fetch = {:id=>1,:x=>2,:y=>3,:lines_id=>nil,:lines_x=>false,:lines_y=>nil,:graph_id=>nil}
-    @ds1.graph(@ds2, :x=>:id).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :lines=>{:id=>nil, :x=>false, :y=>nil, :graph_id=>nil}}]
-  end
-
-  it "#graph_each should not included tables graphed with the :select => false option in the result set" do
-    @db.fetch = {:id=>1,:x=>2,:y=>3,:graphs_id=>8, :name=>9, :graphs_x=>10, :graphs_y=>11, :lines_x=>12}
-    @ds1.graph(:lines, {:x=>:id}, :select=>false).graph(:graphs, :id=>:graph_id).all.must_equal [{:points=>{:id=>1, :x=>2, :y=>3}, :graphs=>{:id=>8, :name=>9, :x=>10, :y=>11, :lines_x=>12}}]
-  end
-
-  it "#graph_each should only include the columns selected with #set_graph_aliases and #add_graph_aliases, if called" do
-    @db.fetch = [nil, [{:x=>2,:y=>3}], nil, [{:x=>2}], [{:x=>2, :q=>18}]]
-
-    @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y]).all.must_equal [{:points=>{:x=>2}, :lines=>{:y=>3}}]
-    ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x])
-    ds.all.must_equal [{:points=>{:x=>2}, :lines=>nil}]
-    ds = ds.add_graph_aliases(:q=>[:points, :r, 18])
-    ds.all.must_equal [{:points=>{:x=>2, :r=>18}, :lines=>nil}]
-  end
-
-  it "#graph_each should correctly map values when #set_graph_aliases is used with a third argument for each entry" do
-    @db.fetch = [nil, {:x=>2,:y=>3}]
-    @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :z1, 2], :y=>[:lines, :z2, Sequel.function(:random)]).all.must_equal [{:points=>{:z1=>2}, :lines=>{:z2=>3}}]
-  end
-
-  it "#graph_each should correctly map values when #set_graph_aliases is used with a single argument for each entry" do
-    @db.fetch = [nil, {:x=>2,:y=>3}]
-    @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points], :y=>[:lines]).all.must_equal [{:points=>{:x=>2}, :lines=>{:y=>3}}]
-  end
-
-  it "#graph_each should correctly map values when #set_graph_aliases is used with a symbol for each entry" do
-    @db.fetch = [nil, {:x=>2,:y=>3}]
-    @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>:points, :y=>:lines).all.must_equal [{:points=>{:x=>2}, :lines=>{:y=>3}}]
-  end
-
-  it "#graph_each should run the row_proc for graphed datasets" do
-    @ds1.row_proc = proc{|h| h.keys.each{|k| h[k] *= 2}; h}
-    @ds2.row_proc = proc{|h| h.keys.each{|k| h[k] *= 3}; h}
-    @db.fetch = {:id=>1,:x=>2,:y=>3,:lines_id=>4,:lines_x=>5,:lines_y=>6,:graph_id=>7}
-    @ds1.graph(@ds2, :x=>:id).all.must_equal [{:points=>{:id=>2, :x=>4, :y=>6}, :lines=>{:id=>12, :x=>15, :y=>18, :graph_id=>21}}]
-  end
-end

data/spec/extensions/hash_aliases_spec.rb

@@ -1,24 +0,0 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-describe "hash_aliases extension" do
-  before do
-    @ds = Sequel.mock.dataset.extension(:hash_aliases)
-  end
-
-  it "should make from treat hash arguments as alias specifiers" do
-    @ds.from(:a=>:b).sql.must_equal "SELECT * FROM a AS b"
-  end
-
-  it "should not affect other arguments to from" do
-    @ds.from(:a, :b).sql.must_equal "SELECT * FROM a, b"
-  end
-
-  it "should make select treat hash arguments as alias specifiers" do
-    @ds.select(:a=>:b).sql.must_equal "SELECT a AS b"
-    @ds.select{{:a=>:b}}.sql.must_equal "SELECT a AS b"
-  end
-
-  it "should not affect other arguments to select" do
-    @ds.select(:a, :b).sql.must_equal "SELECT a, b"
-  end
-end