sequel 4.49.0 → 5.3.0

data/spec/core/object_graph_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe Sequel::Dataset, "graphing" do
   before do
@@ -212,11 +212,8 @@ describe Sequel::Dataset, "graphing" do
       ds.sql.must_equal 'SELECT points.id, points.x, points.y, lines.id AS lines_id, lines.x AS lines_x, lines.y AS lines_y, lines.graph_id FROM points LEFT OUTER JOIN lines ON ((lines.x = points.id) AND (lines.y = points.id))'
     end
 
-    deprecated "should not add columns if graph is called after set_graph_aliases" do
-      ds = @ds1.set_graph_aliases([[:x,[:points, :x]], [:y,[:lines, :y]]])
-      ds.sql.must_equal 'SELECT points.x, lines.y FROM points'
-      ds = ds.graph(:lines, :x=>:id)
-      ds.sql.must_equal 'SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
+    it "should raise Error if set_graph_aliases is called on an ungraphed dataset" do
+      proc{@ds1.set_graph_aliases([[:x,[:points, :x]], [:y,[:lines, :y]]])}.must_raise Sequel::Error
     end
 
     it "should allow graphing of multiple datasets" do
@@ -243,15 +240,6 @@ describe Sequel::Dataset, "graphing" do
   end
 
   describe "#set_graph_aliases" do
-    deprecated "should not modify the current dataset's opts" do
-      o1 = @ds1.opts
-      o2 = o1.dup
-      ds1 = @ds1.set_graph_aliases(:x=>[:graphs,:id])
-      @ds1.opts.must_equal o1
-      @ds1.opts.must_equal o2
-      ds1.opts.wont_equal o1
-    end
-
     it "should not modify the current dataset's opts" do
       o1 = @ds1.opts
       o2 = o1.dup
@@ -264,69 +252,32 @@ describe Sequel::Dataset, "graphing" do
     it "should specify the graph mapping" do
       ds = @ds1.graph(:lines, :x=>:id)
       ds.sql.must_equal 'SELECT points.id, points.x, points.y, lines.id AS lines_id, lines.x AS lines_x, lines.y AS lines_y, lines.graph_id FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ds = ds.set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y])
-      ['SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
-      'SELECT lines.y, points.x FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ].must_include(ds.sql)
+      ds.set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y]).sql.must_equal 'SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     end
 
     it "should allow a third entry to specify an expression to use other than the default" do
-      ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x, 1], :y=>[:lines, :y, Sequel.function(:random)])
-      ['SELECT 1 AS x, random() AS y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
-      'SELECT random() AS y, 1 AS x FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ].must_include(ds.sql)
+      @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x, 1], :y=>[:lines, :y, Sequel.function(:random)]).sql.must_equal 'SELECT 1 AS x, random() AS y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     end
 
     it "should allow a single array entry to specify a table, assuming the same column as the key" do
-      ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points], :y=>[:lines])
-      ['SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
-      'SELECT lines.y, points.x FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ].must_include(ds.sql)
+      @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points], :y=>[:lines]).sql.must_equal 'SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     end
 
     it "should allow hash values to be symbols specifying table, assuming the same column as the key" do
-      ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>:points, :y=>:lines)
-      ['SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
-      'SELECT lines.y, points.x FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ].must_include(ds.sql)
+      @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>:points, :y=>:lines).sql.must_equal 'SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     end
 
-    deprecated "should only alias columns if necessary" do
-      ds = @ds1.set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y])
-      ['SELECT points.x, lines.y FROM points',
-      'SELECT lines.y, points.x FROM points'
-      ].must_include(ds.sql)
-
-      ds = @ds1.set_graph_aliases(:x1=>[:points, :x], :y=>[:lines, :y])
-      ['SELECT points.x AS x1, lines.y FROM points',
-      'SELECT lines.y, points.x AS x1 FROM points'
-      ].must_include(ds.sql)
+    it "should only alias columns if necessary" do
+      @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y]).sql.must_equal 'SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     end
 
     it "should only alias columns if necessary" do
-      ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y])
-      ['SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
-      'SELECT lines.y, points.x FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ].must_include(ds.sql)
-
-      ds = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x1=>[:points, :x], :y=>[:lines, :y])
-      ['SELECT points.x AS x1, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)',
-      'SELECT lines.y, points.x AS x1 FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
-      ].must_include(ds.sql)
+      @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:points, :x], :y=>[:lines, :y]).sql.must_equal 'SELECT points.x, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
+      @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x1=>[:points, :x], :y=>[:lines, :y]).sql.must_equal 'SELECT points.x AS x1, lines.y FROM points LEFT OUTER JOIN lines ON (lines.x = points.id)'
     end
   end
 
   describe "#add_graph_aliases" do
-    deprecated "should not modify the current dataset's opts" do
-      ds1 = @ds1.set_graph_aliases(:x=>[:graphs,:id])
-      o1 = ds1.opts
-      o2 = o1.dup
-      ds2 = ds1.add_graph_aliases(:y=>[:blah,:id])
-      ds1.opts.must_equal o1
-      ds1.opts.must_equal o2
-      ds2.opts.wont_equal o1
-    end
-
     it "should not modify the current dataset's opts" do
       ds1 = @ds1.graph(:lines, :x=>:id).set_graph_aliases(:x=>[:graphs,:id])
       o1 = ds1.opts

data/spec/core/placeholder_literalizer_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Dataset::PlaceholderLiteralizer" do
   before do
@@ -56,12 +56,6 @@ describe "Dataset::PlaceholderLiteralizer" do
     @db.sqls.must_equal ["SELECT * FROM items WHERE (id = 1)", "SELECT * FROM items WHERE a(b)"]
   end
   
-  deprecated "should handle calls with a literal strings used as filter arguments" do
-    loader = @c.loader(@ds){|pl, ds| ds.where(pl.arg)}
-    loader.first("a = 1").must_equal @h
-    @db.sqls.must_equal ["SELECT * FROM items WHERE (a = 1)"]
-  end
-  
   it "should handle calls with a literal strings used as filter arguments" do
     loader = @c.loader(@ds){|pl, ds| ds.where(pl.arg)}
     loader.first(Sequel.lit("a = 1")).must_equal @h
@@ -83,13 +77,6 @@ describe "Dataset::PlaceholderLiteralizer" do
     @db.sqls.must_equal ["SELECT * FROM items WHERE ((a = 1) AND (b = 1))", "SELECT * FROM items WHERE ((a = 2) AND (b = 2))"]
   end
   
-  deprecated "should handle calls with a placeholder used multiple times in different capacities" do
-    loader = @c.loader(@ds){|pl, ds| a = pl.arg; ds.where(a).where(:b=>a)}
-    loader.first("a = 1").must_equal @h
-    loader.first(["a = ?", 2]).must_equal @h
-    @db.sqls.must_equal ["SELECT * FROM items WHERE ((a = 1) AND (b = 'a = 1'))", "SELECT * FROM items WHERE ((a = 2) AND (b IN ('a = ?', 2)))"]
-  end
-  
   it "should handle calls with a placeholder used multiple times in different capacities" do
     loader = @c.loader(@ds){|pl, ds| a = pl.arg; ds.select(a).where(:b=>a)}
     loader.first("a").must_equal @h

data/spec/core/schema_generator_spec.rb

@@ -1,27 +1,39 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe Sequel::Schema::CreateTableGenerator do
   before do
     @generator = Sequel::Schema::CreateTableGenerator.new(Sequel.mock) do
-      string :title
-      column :body, :text
-      foreign_key :parent_id
-      primary_key :id
-      check 'price > 100'
-      constraint(:xxx) {{:yyy => :zzz}}
-      index :title
-      index [:title, :body], :unique => true
-      foreign_key :node_id, :nodes
-      foreign_key :deferrable_node_id, :nodes, :deferrable => true
-      primary_key [:title, :parent_id], :name => :cpk
-      foreign_key [:node_id, :prop_id], :nodes_props, :name => :cfk
+      string(:title).must_be_nil
+      column(:body, :text).must_be_nil
+      foreign_key(:parent_id).must_be_nil
+      primary_key(:id).must_be_nil
+      check('price > 100').must_be_nil
+      constraint(:xxx){{:yyy => :zzz}}.must_be_nil
+      index(:title).must_be_nil
+      index([:title, :body], :unique => true).must_be_nil
+      foreign_key(:node_id, :nodes).must_be_nil
+      foreign_key(:deferrable_node_id, :nodes, :deferrable => true).must_be_nil
+      primary_key([:title, :parent_id], :name => :cpk).must_be_nil
+      foreign_key([:node_id, :prop_id], :nodes_props, :name => :cfk).must_be_nil
     end
     @columns, @indexes, @constraints = @generator.columns, @generator.indexes, @generator.constraints
   end
   
   it "should respond to everything" do
     @generator.respond_to?(:foo).must_equal true
-  end if RUBY_VERSION >= '1.9'
+  end
+
+  it "should respond adding types" do
+    c = Class.new(Sequel::Schema::CreateTableGenerator)
+    c2 = Class.new
+    def c2.to_s; 'Foo' end
+    c.add_type_method(c2)
+    gen = c.new(Sequel.mock) do
+      Foo :bar
+    end
+
+    gen.columns.first.values_at(:name, :type).must_equal [:bar, c2]
+  end
 
   it "should primary key column first" do
     @columns.first[:name].must_equal :id
@@ -117,38 +129,37 @@ describe Sequel::Schema::CreateTableGenerator do
   end
   
   it "creates indexes" do
-    @indexes[0][:columns].must_include(:title)
-    @indexes[1][:columns].must_include(:title)
-    @indexes[1][:columns].must_include(:body)
+    @indexes[0][:columns].must_equal [:title]
+    @indexes[1][:columns].must_equal [:title, :body]
   end
 end
 
 describe Sequel::Schema::AlterTableGenerator do
   before do
     @generator = Sequel::Schema::AlterTableGenerator.new(Sequel.mock) do
-      add_column :aaa, :text
-      drop_column :bbb
-      rename_column :ccc, :ho
-      set_column_type :ddd, :float
-      set_column_default :eee, 1
-      add_index [:fff, :ggg]
-      drop_index :hhh
-      drop_index :hhh, :name=>:blah_blah
-      add_full_text_index :blah
-      add_spatial_index :geom
-      add_index :blah, :type => :hash
-      add_index :blah, :where => {:something => true}
-      add_constraint :con1, 'fred > 100'
-      drop_constraint :con2
-      add_unique_constraint [:aaa, :bbb, :ccc], :name => :con3
-      add_primary_key :id
-      add_foreign_key :node_id, :nodes
-      add_primary_key [:aaa, :bbb]
-      add_foreign_key [:node_id, :prop_id], :nodes_props
-      add_foreign_key [:node_id, :prop_id], :nodes_props, :name => :fkey
-      drop_foreign_key :node_id
-      drop_foreign_key [:node_id, :prop_id]
-      drop_foreign_key [:node_id, :prop_id], :name => :fkey
+      add_column(:aaa, :text).must_be_nil
+      drop_column(:bbb).must_be_nil
+      rename_column(:ccc, :ho).must_be_nil
+      set_column_type(:ddd, :float).must_be_nil
+      set_column_default(:eee, 1).must_be_nil
+      add_index([:fff, :ggg]).must_be_nil
+      drop_index(:hhh).must_be_nil
+      drop_index(:hhh, :name=>:blah_blah).must_be_nil
+      add_full_text_index(:blah).must_be_nil
+      add_spatial_index(:geom).must_be_nil
+      add_index(:blah, :type => :hash).must_be_nil
+      add_index(:blah, :where => {:something => true}).must_be_nil
+      add_constraint(:con1, 'fred > 100').must_be_nil
+      drop_constraint(:con2).must_be_nil
+      add_unique_constraint([:aaa, :bbb, :ccc], :name => :con3).must_be_nil
+      add_primary_key(:id).must_be_nil
+      add_foreign_key(:node_id, :nodes).must_be_nil
+      add_primary_key([:aaa, :bbb]).must_be_nil
+      add_foreign_key([:node_id, :prop_id], :nodes_props).must_be_nil
+      add_foreign_key([:node_id, :prop_id], :nodes_props, :name => :fkey).must_be_nil
+      drop_foreign_key(:node_id).must_be_nil
+      drop_foreign_key([:node_id, :prop_id]).must_be_nil
+      drop_foreign_key([:node_id, :prop_id], :name => :fkey).must_be_nil
     end
   end