sequel 5.22.0 → 5.23.0

data/spec/extensions/named_timezones_spec.rb

@@ -9,7 +9,7 @@ Sequel.extension :thread_local_timezones
 Sequel.extension :named_timezones
 Sequel.datetime_class = Time
 
-describe "Sequel named_timezones extension" do
+describe "Sequel named_timezones extension with DateTime class" do
   before do
     @tz_in = TZInfo::Timezone.get('America/Los_Angeles')
     @tz_out = TZInfo::Timezone.get('America/New_York')
@@ -54,10 +54,12 @@ describe "Sequel named_timezones extension" do
   
   it "should convert datetimes coming out of the database from database_timezone to application_timezone" do
     dt = Sequel.database_to_application_timestamp('2009-06-01 06:20:30-0400')
+    dt.must_be_instance_of DateTime
     dt.must_equal @dt
     dt.offset.must_equal(-7/24.0)
     
     dt = Sequel.database_to_application_timestamp('2009-06-01 10:20:30+0000')
+    dt.must_be_instance_of DateTime
     dt.must_equal @dt
     dt.offset.must_equal(-7/24.0)
   end
@@ -68,7 +70,9 @@ describe "Sequel named_timezones extension" do
 
   it "should support tzinfo_disambiguator= to handle ambiguous timezones automatically" do
     Sequel.tzinfo_disambiguator = proc{|datetime, periods| periods.first}
-    Sequel.database_to_application_timestamp('2004-10-31T01:30:00').must_equal DateTime.parse('2004-10-30T22:30:00-07:00')
+    dt = Sequel.database_to_application_timestamp('2004-10-31T01:30:00')
+    dt.must_equal DateTime.parse('2004-10-30T22:30:00-07:00')
+    dt.offset.must_equal(-7/24.0)
   end
 
   it "should assume datetimes coming out of the database that don't have an offset as coming from database_timezone" do
@@ -108,4 +112,107 @@ describe "Sequel named_timezones extension" do
     tz2.must_equal @tz_in
   end
 end
+
+describe "Sequel named_timezones extension with Time class" do
+  before do
+    @tz_in = TZInfo::Timezone.get('America/Los_Angeles')
+    @tz_out = TZInfo::Timezone.get('America/New_York')
+    @db = Sequel.mock
+    Sequel.application_timezone = 'America/Los_Angeles'
+    Sequel.database_timezone = 'America/New_York'
+  end
+  after do
+    Sequel.tzinfo_disambiguator = nil
+    Sequel.default_timezone = nil
+    Sequel.datetime_class = Time
+  end
+  
+  it "should convert string arguments to *_timezone= to TZInfo::Timezone instances" do
+    Sequel.application_timezone.must_equal @tz_in
+    Sequel.database_timezone.must_equal @tz_out
+  end
+    
+  it "should convert string arguments for Database#timezone= to TZInfo::Timezone instances for database-specific timezones" do
+    @db.extension :named_timezones
+    @db.timezone = 'America/Los_Angeles'
+    @db.timezone.must_equal @tz_in
+  end
+    
+  it "should accept TZInfo::Timezone instances in *_timezone=" do
+    Sequel.application_timezone = @tz_in
+    Sequel.database_timezone = @tz_out
+    Sequel.application_timezone.must_equal @tz_in
+    Sequel.database_timezone.must_equal @tz_out
+  end
+    
+  it "should convert datetimes going into the database to named database_timezone" do
+    ds = @db[:a].with_extend do
+      def supports_timestamp_timezones?; true; end
+      def supports_timestamp_usecs?; false; end
+    end
+    ds.insert([Time.new(2009,6,1,3,20,30, RUBY_VERSION >= '2.6' ? @tz_in : -25200), Time.new(2009,6,1,3,20,30,-25200), Time.new(2009,6,1,6,20,30,-14400)])
+    @db.sqls.must_equal ["INSERT INTO a VALUES ('2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400', '2009-06-01 06:20:30-0400')"]
+  end
+  
+  it "should convert datetimes coming out of the database from database_timezone to application_timezone" do
+    dt = Sequel.database_to_application_timestamp('2009-06-01 06:20:30-0400')
+    dt.must_be_instance_of Time
+    dt.must_equal Time.new(2009,6,1,3,20,30,-25200)
+    dt.utc_offset.must_equal -25200
+    
+    dt = Sequel.database_to_application_timestamp('2009-06-01 10:20:30+0000')
+    dt.must_be_instance_of Time
+    dt.must_equal Time.new(2009,6,1,3,20,30,-25200)
+    dt.utc_offset.must_equal -25200
+  end
+    
+  it "should raise an error for ambiguous timezones by default" do
+    proc{Sequel.database_to_application_timestamp('2004-10-31T01:30:00')}.must_raise(Sequel::InvalidValue)
+  end
+
+  it "should support tzinfo_disambiguator= to handle ambiguous timezones automatically" do
+    Sequel.tzinfo_disambiguator = proc{|datetime, periods| periods.first}
+    Sequel.database_to_application_timestamp('2004-10-31T01:30:00').must_equal Time.new(2004, 10, 30, 22, 30, 0, -25200)
+    dt = Sequel.database_to_application_timestamp('2004-10-31T01:30:00')
+    dt.must_equal Time.new(2004, 10, 30, 22, 30, 0, -25200)
+    dt.utc_offset.must_equal -25200
+  end
+
+  it "should assume datetimes coming out of the database that don't have an offset as coming from database_timezone" do
+    dt = Sequel.database_to_application_timestamp('2009-06-01 06:20:30')
+    dt.must_be_instance_of Time
+    dt.must_equal Time.new(2009,6,1,3,20,30, -25200)
+    dt.utc_offset.must_equal -25200
+    
+    dt = Sequel.database_to_application_timestamp('2009-06-01 10:20:30')
+    dt.must_be_instance_of Time
+    dt.must_equal Time.new(2009,6,1,7,20,30, -25200)
+    dt.utc_offset.must_equal -25200
+  end
+  
+  it "should work with the thread_local_timezones extension" do
+    q, q1, q2 = Queue.new, Queue.new, Queue.new
+    tz1, tz2 = nil, nil
+    t1 = Thread.new do
+      Sequel.thread_application_timezone = 'America/New_York'
+      q2.push nil
+      q.pop
+      tz1 = Sequel.application_timezone
+    end
+    t2 = Thread.new do
+      Sequel.thread_application_timezone = 'America/Los_Angeles'
+      q2.push nil
+      q1.pop
+      tz2 = Sequel.application_timezone
+    end
+    q2.pop
+    q2.pop
+    q.push nil
+    q1.push nil
+    t1.join
+    t2.join
+    tz1.must_equal @tz_out
+    tz2.must_equal @tz_in
+  end
+end
 end

data/spec/extensions/pg_json_spec.rb

@@ -241,6 +241,18 @@ describe "pg_json extension" do
     Sequel.pg_json_wrap(false).must_equal false
     Sequel.pg_json_wrap(nil).class.must_equal Sequel::Postgres::JSONNull
     Sequel.pg_json_wrap(nil).must_be_nil
+
+    c = Class.new(Hash).new
+    Sequel.pg_json_wrap(c).class.must_equal Sequel::Postgres::JSONHash
+    Sequel.pg_json_wrap(c).must_equal(c)
+
+    c = Class.new(Array).new
+    Sequel.pg_json_wrap(c).class.must_equal Sequel::Postgres::JSONArray
+    Sequel.pg_json_wrap(c).must_equal c
+
+    c = Class.new(String).new('a')
+    Sequel.pg_json_wrap(c).class.must_equal Sequel::Postgres::JSONString
+    Sequel.pg_json_wrap(c).must_equal c
   end
 
   it "Sequel.pg_json_wrap should fail when passed an unsupported object" do

data/spec/extensions/pg_range_spec.rb

@@ -429,12 +429,12 @@ describe "pg_range extension" do
       @R.new(nil, nil).wont_equal @R.new(nil, nil, :empty=>true)
     end
 
-    it "should only consider empty PGRanges equal if they have the same bounds" do
+    it "should only consider PGRanges equal if they have the same bounds" do
       @R.new(1, 2).must_equal @R.new(1, 2)
       @R.new(1, 2).wont_equal @R.new(1, 3)
     end
 
-    it "should only consider empty PGRanges equal if they have the same bound exclusions" do
+    it "should only consider PGRanges equal if they have the same bound exclusions" do
       @R.new(1, 2, :exclude_begin=>true).must_equal @R.new(1, 2, :exclude_begin=>true)
       @R.new(1, 2, :exclude_end=>true).must_equal @R.new(1, 2, :exclude_end=>true)
       @R.new(1, 2, :exclude_begin=>true).wont_equal @R.new(1, 2, :exclude_end=>true)
@@ -450,6 +450,9 @@ describe "pg_range extension" do
 
     it "should not consider a PGRange equal with a Range if it can't be expressed as a range" do
       @R.new(nil, nil).wont_be :==, (1..2)
+      if startless_range_support
+        @R.new(nil, nil, :exclude_begin=>true).wont_be :==, eval('nil..nil')
+      end
     end
 
     it "should consider PGRanges equal with a endless Range they represent" do

data/spec/extensions/spec_helper.rb

@@ -16,6 +16,11 @@ require_relative "../../lib/sequel"
 
 require_relative '../deprecation_helper'
 
+if ENV['SEQUEL_TZINFO_VERSION']
+  # Allow forcing specific TZInfo versions, useful when testing
+  gem 'tzinfo', ENV['SEQUEL_TZINFO_VERSION']
+end
+
 begin
   # Attempt to load ActiveSupport blank extension and inflector first, so Sequel
   # can override them.
@@ -26,7 +31,9 @@ rescue LoadError
   nil
 end
 
-Sequel.extension :core_refinements if RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby'
+if (RUBY_VERSION >= '2.0.0' && RUBY_ENGINE == 'ruby') || (RUBY_ENGINE == 'jruby' && (JRUBY_VERSION >= '9.3' || (JRUBY_VERSION.match(/\A9\.2\.(\d+)/) && $1.to_i >= 7)))
+  Sequel.extension :core_refinements
+end
 
 class << Sequel::Model
   attr_writer :db_schema

data/spec/integration/plugin_test.rb

@@ -2394,3 +2394,30 @@ describe "string_agg extension" do
     @ds.select_group(:id).select_append(Sequel.string_agg(:s).order(:s).distinct.as(:v)).map([:id, :v]).must_equal [[1, 'a,b,c'], [2, 'aa,bb']]
   end
 end
+
+describe "insert_conflict plugin" do
+  before(:all) do
+    @db = DB
+    @db.create_table!(:ic_test) do
+      primary_key :id
+      String :s, :unique=>true
+      Integer :o
+    end
+    @model = Class.new(Sequel::Model)
+    @model.set_dataset @db[:ic_test]
+    @model.plugin :insert_conflict
+  end
+  after(:all) do
+    @db.drop_table?(:ic_test)
+  end
+
+  it "should allow Model#insert_conflict to work" do
+    ic_opts = {:target=>:s, :update => {:o => Sequel[:excluded][:o]}}
+    @model.new(:s=>'A', :o=>1).insert_conflict(ic_opts).save
+    @model.select_order_map([:s, :o]).must_equal [['A', 1]]
+    @model.new(:s=>'A', :o=>2).insert_conflict(ic_opts).save
+    @model.select_order_map([:s, :o]).must_equal [['A', 2]]
+    @model.new(:s=>'B', :o=>3).insert_conflict(ic_opts).save
+    @model.select_order_map([:s, :o]).must_equal [['A', 2], ['B', 3]]
+  end
+end if (DB.database_type == :postgres && DB.server_version >= 90500) || (DB.database_type == :sqlite && DB.sqlite_version >= 32400)

data/spec/integration/schema_test.rb

@@ -750,10 +750,15 @@ describe "Database schema modifiers" do
     @db.create_table!(:items) do
       primary_key :id
       Integer :i, :default=>20
+      Integer :j, :default=>10
+      String :s, :default=>'a'
     end
-    @ds.insert(:i=>10)
+    @ds.insert(:i=>10, :j=>20, :s=>'b')
     @db.drop_column(:items, :i)
-    @db.schema(:items, :reload=>true).map{|x| x.first}.must_equal [:id]
+    @db.schema(:items, :reload=>true).map{|x| x.first}.must_equal [:id, :j, :s]
+    @ds.first.must_equal(:id=>1, :j=>20, :s=>'b')
+    @ds.insert
+    @ds.first(:id=>2).must_equal(:id=>2, :j=>10, :s=>'a')
   end
 
   it "should remove foreign key columns from tables correctly" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.22.0
+  version: 5.23.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -206,6 +206,7 @@ extra_rdoc_files:
 - doc/release_notes/5.20.0.txt
 - doc/release_notes/5.21.0.txt
 - doc/release_notes/5.22.0.txt
+- doc/release_notes/5.23.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -299,6 +300,7 @@ files:
 - doc/release_notes/5.20.0.txt
 - doc/release_notes/5.21.0.txt
 - doc/release_notes/5.22.0.txt
+- doc/release_notes/5.23.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt
 - doc/release_notes/5.5.0.txt
@@ -513,6 +515,7 @@ files:
 - lib/sequel/plugins/force_encoding.rb
 - lib/sequel/plugins/hook_class_methods.rb
 - lib/sequel/plugins/input_transformer.rb
+- lib/sequel/plugins/insert_conflict.rb
 - lib/sequel/plugins/insert_returning_select.rb
 - lib/sequel/plugins/instance_filters.rb
 - lib/sequel/plugins/instance_hooks.rb
@@ -644,6 +647,7 @@ files:
 - spec/extensions/index_caching_spec.rb
 - spec/extensions/inflector_spec.rb
 - spec/extensions/input_transformer_spec.rb
+- spec/extensions/insert_conflict_spec.rb
 - spec/extensions/insert_returning_select_spec.rb
 - spec/extensions/instance_filters_spec.rb
 - spec/extensions/instance_hooks_spec.rb