sequel 4.49.0 → 5.3.0

data/spec/extensions/column_conflicts_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "column_conflicts plugin" do
   before do

data/spec/extensions/column_select_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ColumnSelect" do
   def set_cols(*cols)
@@ -63,13 +63,13 @@ describe "Sequel::Plugins::ColumnSelect" do
     @Album.dataset.sql.must_equal 'SELECT name, artist FROM albums'
   end
 
-  deprecated "should not add a explicit column selection on existing dataset with multiple tables" do
+  it "should work with implicit subqueries used for joined datasets" do
     @Album.dataset = @Album.db.from(:a1, :a2)
     @Album.plugin :column_select
-    @Album.dataset.sql.must_equal 'SELECT * FROM a1, a2'
+    @Album.dataset.sql.must_equal "SELECT a1.id, a1.a, a1.b, a1.c FROM (SELECT * FROM a1, a2) AS a1"
 
     @Album.dataset = @Album.db.from(:a1).cross_join(:a2)
-    @Album.dataset.sql.must_equal 'SELECT * FROM a1 CROSS JOIN a2'
+    @Album.dataset.sql.must_equal "SELECT a1.id, a1.a, a1.b, a1.c FROM (SELECT * FROM a1 CROSS JOIN a2) AS a1"
   end
 
   it "should add a explicit column selection on existing dataset with a subquery" do

data/spec/extensions/columns_introspection_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 Sequel.extension :columns_introspection
 

data/spec/extensions/columns_updated_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ColumnsUpdated" do
   before do

data/spec/extensions/composition_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Composition plugin" do
   before do
@@ -9,12 +9,6 @@ describe "Composition plugin" do
     DB.reset
   end
   
-  deprecated "should allow access to composition_module" do
-    @c.composition_module.must_be_kind_of Module
-    @c.composition_module = v = Module.new
-    @c.composition_module.must_equal v
-  end
-
   it ".composition should add compositions" do
     @o.wont_respond_to(:date)
     @c.composition :date, :mapping=>[:year, :month, :day]
@@ -59,11 +53,8 @@ describe "Composition plugin" do
 
   it "should set column values even when not validating" do
     @c.composition :date, :mapping=>[:year, :month, :day]
-    @c.load({}).set(:date=>Date.new(4, 8, 12)).save(:validate=>false)
-    sql = DB.sqls.last
-    sql.must_include("year = 4")
-    sql.must_include("month = 8")
-    sql.must_include("day = 12")
+    @c.load(id: 1).set(:date=>Date.new(4, 8, 12)).save(:validate=>false)
+    DB.sqls.must_equal ['UPDATE items SET year = 4, month = 8, day = 12 WHERE (id = 1)']
   end
 
   it ".compositions should return the reflection hash of compositions" do
@@ -87,10 +78,7 @@ describe "Composition plugin" do
     @c.composition :date, :composer=>proc{Date.new(year+1, month+2, day+3)}, :decomposer=>proc{[:year, :month, :day].each{|s| self.send("#{s}=", date.send(s) * 2)}}
     @o.date.must_equal Date.new(2, 4, 6)
     @o.save
-    sql = DB.sqls.last
-    sql.must_include("year = 4")
-    sql.must_include("month = 8")
-    sql.must_include("day = 12")
+    DB.sqls.must_equal ['UPDATE items SET year = 4, month = 8, day = 12 WHERE (id = 1)']
   end
 
   it "should allow call super in composition getter and setter method definition in class" do
@@ -193,9 +181,7 @@ describe "Composition plugin" do
     @o.date.month.must_equal 6
     @o.date = c.new(3, 4)
     @o.save
-    sql = DB.sqls.last
-    sql.must_include("year = 6")
-    sql.must_include("month = 12")
+    DB.sqls.must_equal ['UPDATE items SET year = 6, month = 12, day = 3 WHERE (id = 1)']
   end
 
   it ":mapping option should work with an array of two pairs of symbols" do
@@ -215,9 +201,7 @@ describe "Composition plugin" do
     @o.date.m.must_equal 6
     @o.date = c.new(3, 4)
     @o.save
-    sql = DB.sqls.last
-    sql.must_include("year = 6")
-    sql.must_include("month = 12")
+    DB.sqls.must_equal ['UPDATE items SET year = 6, month = 12, day = 3 WHERE (id = 1)']
   end
 
   it ":mapping option :composer should return nil if all values are nil" do
@@ -229,10 +213,7 @@ describe "Composition plugin" do
     @c.composition :date, :mapping=>[:year, :month, :day]
     @o.date = nil
     @o.save
-    sql = DB.sqls.last
-    sql.must_include("year = NULL")
-    sql.must_include("month = NULL")
-    sql.must_include("day = NULL")
+    DB.sqls.must_equal ['UPDATE items SET year = NULL, month = NULL, day = NULL WHERE (id = 1)']
   end
 
   it "should work with frozen instances" do
@@ -255,10 +236,7 @@ describe "Composition plugin" do
     o = c.load(:id=>1, :year=>1, :month=>2, :day=>3)
     o.date.must_equal Date.new(1, 2, 3)
     o.save
-    sql = DB.sqls.last
-    sql.must_include("year = 1")
-    sql.must_include("month = 2")
-    sql.must_include("day = 3")
+    DB.sqls.must_equal ['UPDATE items SET year = 1, month = 2, day = 3 WHERE (id = 1)']
   end
 
   it "should freeze composition metadata when freezing model class" do

data/spec/extensions/connection_expiration_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 connection_expiration_specs = shared_description do
   describe "connection expiration" do
@@ -109,13 +109,13 @@ end
 
 describe "Sequel::ConnectionExpiration with threaded pool" do
   before do
-    @db = Sequel.mock
+    @db = Sequel.mock(:test=>false)
   end
   include connection_expiration_specs
 end
 describe "Sequel::ConnectionExpiration with sharded threaded pool" do
   before do
-    @db = Sequel.mock(:servers=>{})
+    @db = Sequel.mock(:test=>false, :servers=>{})
   end
   include connection_expiration_specs
 end

data/spec/extensions/connection_validator_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 connection_validator_specs = shared_description do
   describe "connection validator" do
@@ -114,13 +114,13 @@ end
 
 describe "Sequel::ConnectionValidator with threaded pool" do
   before do
-    @db = Sequel.mock
+    @db = Sequel.mock(:test=>false)
   end
   include connection_validator_specs
 end
 describe "Sequel::ConnectionValidator with sharded threaded pool" do
   before do
-    @db = Sequel.mock(:servers=>{})
+    @db = Sequel.mock(:test=>false, :servers=>{})
   end
   include connection_validator_specs
 end

data/spec/extensions/constraint_validations_plugin_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ConstraintValidations" do
   def model_class(opts={})

data/spec/extensions/constraint_validations_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "constraint_validations extension" do
   def parse_insert(s)

data/spec/extensions/core_refinements_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 if (RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby') # || (RUBY_VERSION >= '2.3.0' && RUBY_ENGINE == 'jruby')
 Sequel.extension :core_refinements, :pg_array, :pg_hstore, :pg_row, :pg_range, :pg_row_ops, :pg_range_ops, :pg_array_ops, :pg_hstore_ops, :pg_json, :pg_json_ops
@@ -525,6 +525,4 @@ describe "Postgres extensions integration" do
     @db.literal((1..2).pg_range(:int4range)).must_equal "int4range(1,2,'[]')"
   end
 end
-else
-  skip_warn "core_refinements extension: only works on ruby 2.0+"
 end

data/spec/extensions/csv_serializer_spec.rb

@@ -1,11 +1,7 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-
-begin
-  csv_lib = RUBY_VERSION < '1.9' ? 'fastercsv' : 'csv'
-  require csv_lib
-rescue LoadError => e
-  skip_warn "csv_serializer plugin: can't load #{csv_lib} (#{e.class}: #{e})"
-else
+require_relative "spec_helper"
+
+require 'csv' 
+
 describe "Sequel::Plugins::CsvSerializer" do
   before do
     artist = @Artist = Class.new(Sequel::Model(:artists))
@@ -185,4 +181,3 @@ describe "Sequel::Plugins::CsvSerializer" do
     @Album.csv_serializer_opts[:only].frozen?.must_equal true
   end
 end
-end

data/spec/extensions/current_datetime_timestamp_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), 'spec_helper')
+require_relative "spec_helper"
 
 describe "current_datetime_timestamp extension" do
   before do

data/spec/extensions/dataset_associations_spec.rb

@@ -1,9 +1,10 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::DatasetAssociations" do
   before do
     @db = Sequel.mock(:host=>'postgres')
     @db.extend_datasets do
+      def quote_identifiers?; false end
       def supports_window_functions?; true; end
       def supports_distinct_on?; true; end
     end

data/spec/extensions/dataset_source_alias_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "dataset_source_alias extension" do
   before do

data/spec/extensions/date_arithmetic_spec.rb

@@ -1,10 +1,10 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 asd = begin
   require 'active_support/duration'
   true
-rescue LoadError => e
-  skip_warn "date_arithmetic extension (partial): can't load active_support/duration (#{e.class}: #{e})"
+rescue LoadError
+  warn "Skipping some tests of date_arithmetic extension: can't load active_support/duration"
   false
 end
 

data/spec/extensions/def_dataset_method_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, ".def_dataset_method" do
   before do

data/spec/extensions/defaults_setter_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::DefaultsSetter" do
   before do
@@ -9,7 +9,7 @@ describe "Sequel::Plugins::DefaultsSetter" do
     @c.instance_variable_set(:@db_schema, {:a=>{}})
     @c.plugin :defaults_setter
     @c.columns :a
-    @pr = proc{|x| meta_def(db, :schema){|*| [[:id, {:primary_key=>true}], [:a, {:ruby_default => x, :primary_key=>false}]]}; c.dataset = c.dataset; c}
+    @pr = proc{|x| db.define_singleton_method(:schema){|*| [[:id, {:primary_key=>true}], [:a, {:ruby_default => x, :primary_key=>false}]]}; c.dataset = c.dataset; c}
   end
   after do
     Sequel.datetime_class = Time

data/spec/extensions/delay_add_association_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::DelayAddAssociation" do
   before do
@@ -16,7 +16,7 @@ describe "Sequel::Plugins::DelayAddAssociation" do
     @o.add_c(@c.load(:id=>2, :name=>'b'))
     @db.sqls.must_equal []
     @o.save
-    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "UPDATE cs SET c_id = 1 WHERE (id = 2)", "SELECT * FROM cs WHERE (id = 1) LIMIT 1"]
+    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "SELECT * FROM cs WHERE (id = 1) LIMIT 1", "UPDATE cs SET c_id = 1 WHERE (id = 2)"]
   end
 
   it "should immediately reflect changes in cached association" do
@@ -55,12 +55,11 @@ describe "Sequel::Plugins::DelayAddAssociation" do
     @o.add_c(:name=>'b')
     @db.sqls.must_equal []
     @o.save
-    sqls = @db.sqls
-    sqls.length.must_equal 4
-    sqls[0].must_equal "INSERT INTO cs (name) VALUES ('a')"
-    ["INSERT INTO cs (name, c_id) VALUES ('b', 1)", "INSERT INTO cs (c_id, name) VALUES (1, 'b')"].must_include sqls[1]
-    sqls[2].must_equal "SELECT * FROM cs WHERE (id = 2) LIMIT 1"
-    sqls[3].must_equal "SELECT * FROM cs WHERE (id = 1) LIMIT 1"
+    @db.sqls.must_equal [
+      "INSERT INTO cs (name) VALUES ('a')",
+      "SELECT * FROM cs WHERE (id = 1) LIMIT 1",
+      "INSERT INTO cs (name, c_id) VALUES ('b', 1)",
+      "SELECT * FROM cs WHERE (id = 2) LIMIT 1"]
   end
 
   it "should work when passing in primary keys" do
@@ -69,6 +68,6 @@ describe "Sequel::Plugins::DelayAddAssociation" do
     @o.add_c(2)
     @db.sqls.must_equal ["SELECT * FROM cs WHERE (id = 2) LIMIT 1"]
     @o.save
-    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "UPDATE cs SET c_id = 1 WHERE (id = 2)", "SELECT * FROM cs WHERE (id = 1) LIMIT 1"]
+    @db.sqls.must_equal ["INSERT INTO cs (name) VALUES ('a')", "SELECT * FROM cs WHERE (id = 1) LIMIT 1", "UPDATE cs SET c_id = 1 WHERE (id = 2)"]
   end
 end

data/spec/extensions/dirty_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::Dirty" do
   before do

data/spec/extensions/duplicate_columns_handler_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 mod = shared_description do
   it "should take action depending on :on_duplicate_columns if 2 or more columns have the same name" do

data/spec/extensions/eager_each_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::EagerEach" do
   before do
@@ -57,6 +57,6 @@ describe "Sequel::Plugins::EagerEach" do
   end
 
   it "should not attempt to eager load when getting the columns" do
-    ds = @c.eager(:children).with_extend{def all; raise; end}.columns!.must_equal [:id, :parent_id]
+    @c.eager(:children).with_extend{def all; raise; end}.columns!.must_equal [:id, :parent_id]
   end
 end

data/spec/extensions/empty_array_consider_nulls_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "filter_having extension" do
   before do

data/spec/extensions/error_splitter_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "Sequel::Plugins::ErrorSplitter" do
   before do

data/spec/extensions/error_sql_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "error_sql extension" do
   before do

data/spec/extensions/eval_inspect_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 Sequel.extension :eval_inspect
 

data/spec/extensions/finder_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe Sequel::Model, ".finder" do
   before do

data/spec/extensions/force_encoding_spec.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
-if RUBY_VERSION >= '1.9.0'
+require_relative "spec_helper"
+
 describe "force_encoding plugin" do
   before do
     @c = Class.new(Sequel::Model)
@@ -124,6 +124,3 @@ describe "force_encoding plugin" do
     o.x.encoding.must_equal @e1
   end
 end 
-else
-  skip_warn "force_encoding plugin: only works on ruby 1.9+"
-end

data/spec/extensions/freeze_datasets_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(File.expand_path(__FILE__)), "spec_helper")
+require_relative "spec_helper"
 
 describe "freeze_datasets extension" do
   before do

data/spec/extensions/graph_each_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
@@ -76,7 +76,7 @@ describe Sequel::Dataset, " graphing" do
   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}]]
+    @db.fetch = [[{:x=>2,:y=>3}], [{: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])
@@ -86,17 +86,17 @@ describe Sequel::Dataset, " graphing" do
   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}]
+    @db.fetch = [{: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}]
+    @db.fetch = [{: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}]
+    @db.fetch = [{: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