sequel 4.30.0 → 4.31.0

data/lib/sequel/plugins/prepared_statements_safe.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The prepared_statements_safe plugin modifies the model to reduce the number of

data/lib/sequel/plugins/prepared_statements_with_pk.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The prepared_statements_with_pk plugin allows Dataset#with_pk for model datasets

data/lib/sequel/plugins/rcte_tree.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # = Overview

data/lib/sequel/plugins/schema.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # Sequel's built in schema plugin allows you to define your schema

data/lib/sequel/plugins/scissors.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The scissors plugin adds class methods for update, delete, and destroy.

data/lib/sequel/plugins/serialization.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # Sequel's built in Serialization plugin allows you to keep serialized

data/lib/sequel/plugins/serialization_modification_detection.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # This plugin extends the serialization plugin and enables it to detect

data/lib/sequel/plugins/sharding.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The sharding plugin augments Sequel's default model sharding support

data/lib/sequel/plugins/single_table_inheritance.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The single_table_inheritance plugin allows storing all objects

data/lib/sequel/plugins/singular_table_names.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The singular_table_names plugin changes the default

data/lib/sequel/plugins/skip_create_refresh.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # SkipCreateRefresh is a simple plugin that make Sequel not

data/lib/sequel/plugins/split_values.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The split_values plugin splits the values hash retreived from the

data/lib/sequel/plugins/static_cache.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The static_cache plugin is designed for models that are not modified at all

data/lib/sequel/plugins/string_stripper.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # StringStripper is a plugin that strips all input strings

data/lib/sequel/plugins/subclasses.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The Subclasses plugin keeps track of all subclasses of the

data/lib/sequel/plugins/subset_conditions.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The subset_conditions plugin creates an additional *_conditions method

data/lib/sequel/plugins/table_select.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The table_select plugin changes the default selection for a

data/lib/sequel/plugins/tactical_eager_loading.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The tactical_eager_loading plugin allows you to eagerly load

data/lib/sequel/plugins/timestamps.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The timestamps plugin creates hooks that automatically set create and

data/lib/sequel/plugins/touch.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The touch plugin adds a touch method to model instances, which saves

data/lib/sequel/plugins/tree.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The Tree plugin adds additional associations and methods that allow you to 

data/lib/sequel/plugins/typecast_on_load.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The TypecastOnLoad plugin exists because most of Sequel's database adapters don't

data/lib/sequel/plugins/unlimited_update.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The unlimited_update plugin is designed to work around a

data/lib/sequel/plugins/update_or_create.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The update_or_create plugin adds a couple of methods that make it easier

data/lib/sequel/plugins/update_primary_key.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The update_primary_key plugin allows you to modify an object's

data/lib/sequel/plugins/update_refresh.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The update_refresh plugin makes the model class refresh

data/lib/sequel/plugins/uuid.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'securerandom'
 
 module Sequel

data/lib/sequel/plugins/validate_associated.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The validates_associated plugin allows you to validate associated

data/lib/sequel/plugins/validation_class_methods.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   extension :blank
 

data/lib/sequel/plugins/validation_helpers.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   module Plugins
     # The validation_helpers plugin contains instance method equivalents for most of the legacy
@@ -214,7 +216,7 @@ module Sequel
         #           a modified dataset that is filtered to include only rows with
         #           the same values as the current object for each column in the array.
         #
-        # If you want to to a case insensitive uniqueness validation on a database that
+        # If you want to do a case insensitive uniqueness validation on a database that
         # is case sensitive by default, you can use:
         #
         #   validates_unique :column, :where=>(proc do |ds, obj, cols|

data/lib/sequel/plugins/xml_serializer.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 require 'nokogiri'
 
 module Sequel

data/lib/sequel/sql.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   if RUBY_VERSION < '1.9.0'
   # :nocov:
@@ -137,7 +139,7 @@ module Sequel
       
       # Alias of +to_s+
       def sql_literal(ds)
-        s = ''
+        s = String.new
         to_s_append(ds, s)
         s
       end

data/lib/sequel/timezones.rb

@@ -1,3 +1,5 @@
+# frozen-string-literal: true
+
 module Sequel
   @application_timezone = nil
   @database_timezone = nil

data/lib/sequel/version.rb

@@ -1,9 +1,11 @@
+# frozen-string-literal: true
+
 module Sequel
   # The major version of Sequel.  Only bumped for major changes.
   MAJOR = 4
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 30
+  MINOR = 31
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.
   TINY  = 0

data/spec/adapters/mysql_spec.rb

@@ -640,6 +640,10 @@ describe "MySQL foreign key support" do
     DB.create_table!(:testfk){primary_key :id; foreign_key :fk, :testfk}
   end
 
+  it "should create table with self referential with non-autoincrementing key without :key" do
+    DB.create_table!(:testfk){Integer :id, :primary_key=>true; foreign_key :fk, :testfk}
+  end
+
   it "should create table with self referential with composite keys without :key" do
     DB.create_table!(:testfk){Integer :id; Integer :id2; Integer :fk; Integer :fk2; primary_key([:id, :id2]); foreign_key([:fk, :fk2], :testfk)}
   end

data/spec/adapters/postgres_spec.rb

@@ -2289,6 +2289,30 @@ describe 'PostgreSQL array handling' do
     end
   end
 
+  it 'retrieve arrays with explicit bounds' do
+    @db.create_table!(:items) do
+      column :n, 'integer[]'
+    end
+    @ds.insert(:n=>"[0:1]={2,3}")
+    rs = @ds.all
+    rs.must_equal [{:n=>[2,3]}]
+    rs.first.values.each{|v| v.class.must_equal(Sequel::Postgres::PGArray)}
+    rs.first.values.each{|v| v.to_a.must_be_kind_of(Array)}
+    @ds.delete
+    @ds.insert(rs.first)
+    @ds.all.must_equal rs
+
+    @ds.delete
+    @ds.insert(:n=>"[0:1][0:0]={{2},{3}}")
+    rs = @ds.all
+    rs.must_equal [{:n=>[[2], [3]]}]
+    rs.first.values.each{|v| v.class.must_equal(Sequel::Postgres::PGArray)}
+    rs.first.values.each{|v| v.to_a.must_be_kind_of(Array)}
+    @ds.delete
+    @ds.insert(rs.first)
+    @ds.all.must_equal rs
+  end if DB.adapter_scheme == :postgres || DB.adapter_scheme == :jdbc
+
   it 'use arrays in bound variables' do
     @db.create_table!(:items) do
       column :i, 'int4[]'
@@ -2347,7 +2371,7 @@ describe 'PostgreSQL array handling' do
     @ds.get(:i).must_equal a
     @ds.filter(:i=>:$i).call(:first, :i=>a).must_equal(:i=>a)
     @ds.filter(:i=>:$i).call(:first, :i=>Sequel.pg_array([Sequel.blob("b\0")], 'bytea')).must_equal nil
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'with models' do
     @db.create_table!(:items) do
@@ -2535,7 +2559,7 @@ describe 'PostgreSQL hstore handling' do
     @ds.get(:i).must_equal @h
     @ds.filter(:i=>:$i).call(:first, :i=>@h).must_equal(:i=>@h)
     @ds.filter(:i=>:$i).call(:first, :i=>{}).must_equal nil
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'with models and associations' do
     @db.create_table!(:items) do
@@ -2808,7 +2832,7 @@ describe 'PostgreSQL json type' do
       j = Sequel.pg_array([pg_json.call('a'=>1), pg_json.call(['b', 2])], json_type)
       @ds.call(:insert, {:i=>j}, {:i=>:$i})
       @ds.get(:i).must_equal j
-    end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+    end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
     it 'operations/functions with pg_json_ops' do
       Sequel.extension :pg_json_ops
@@ -2996,7 +3020,7 @@ describe 'PostgreSQL inet/cidr types' do
     @ds.filter(:i=>:$i, :c=>:$c, :m=>:$m).call(:first, :i=>[@ipv4], :c=>[@ipv4nm], :m=>['12:34:56:78:90:ab']).must_equal(:i=>[@ipv4], :c=>[@ipv4nm], :m=>['12:34:56:78:90:ab'])
     @ds.filter(:i=>:$i, :c=>:$c, :m=>:$m).call(:first, :i=>[], :c=>[], :m=>[]).must_equal nil
     @ds.filter(:i=>:$i, :c=>:$c, :m=>:$m).call(:delete, :i=>[@ipv4], :c=>[@ipv4nm], :m=>['12:34:56:78:90:ab']).must_equal 1
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'with models' do
     @db.create_table!(:items) do
@@ -3145,7 +3169,7 @@ describe 'PostgreSQL range types' do
     @ds.filter(h).call(:first, @pgra).each{|k, v| v.must_be :==, @ra[k].to_a}
     @ds.filter(h).call(:first, r2).must_equal nil
     @ds.filter(h).call(:delete, @ra).must_equal 1
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'with models' do
     @db.create_table!(:items){primary_key :id; int4range :i4; int8range :i8; numrange :n; daterange :d; tsrange :t; tstzrange :tz}
@@ -3318,7 +3342,7 @@ describe 'PostgreSQL interval types' do
     @ds.call(:insert, {:i=>d}, {:i=>:$i})
     @ds.get(:i).must_equal d
     @ds.filter(:i=>:$i).call(:first, :i=>d).must_equal(:i=>d)
-    @ds.filter(:i=>:$i).call(:first, :i=>'0').must_equal nil
+    @ds.filter(:i=>Sequel.cast(:$i, :interval)).call(:first, :i=>'0').must_equal nil
     @ds.filter(:i=>:$i).call(:delete, :i=>d).must_equal 1
 
     @db.create_table!(:items){column :i, 'interval[]'}
@@ -3326,7 +3350,7 @@ describe 'PostgreSQL interval types' do
     @ds.filter(:i=>:$i).call(:first, :i=>[d]).must_equal(:i=>[d])
     @ds.filter(:i=>:$i).call(:first, :i=>[]).must_equal nil
     @ds.filter(:i=>:$i).call(:delete, :i=>[d]).must_equal 1
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'with models' do
     @db.create_table!(:items) do
@@ -3443,7 +3467,7 @@ describe 'PostgreSQL row-valued/composite types' do
     @ds.delete
     @ds.call(:insert, {:address=>Sequel.pg_row([nil, nil, nil])}, {:address=>:$address, :id=>1})
     @ds.get(:address).must_equal(:street=>nil, :city=>nil, :zip=>nil)
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'use arrays of row types in bound variables' do
     @ds = @db[:company]
@@ -3455,7 +3479,7 @@ describe 'PostgreSQL row-valued/composite types' do
     @ds.delete
     @ds.call(:insert, {:employees=>Sequel.pg_array([@db.row_type(:person, [1, Sequel.pg_row([nil, nil, nil])])])}, {:employees=>:$employees, :id=>1})
     @ds.get(:employees).must_equal [{:address=>{:city=>nil, :zip=>nil, :street=>nil}, :id=>1}]
-  end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+  end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
   it 'operations/functions with pg_row_ops' do
     @ds.insert(:id=>1, :address=>Sequel.pg_row(['123 Sesame St', 'Somewhere', '12345']))
@@ -3581,7 +3605,7 @@ describe 'PostgreSQL row-valued/composite types' do
       @ds.get(:address).must_equal @a
       @ds.filter(:address=>Sequel.cast(:$address, :address)).call(:first, :address=>@a)[:id].must_equal 1
       @ds.filter(:address=>Sequel.cast(:$address, :address)).call(:first, :address=>Address.new(:street=>'123 Sesame St', :city=>'Somewhere', :zip=>'12356')).must_equal nil
-    end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+    end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
     it 'use arrays of model objects in bound variables' do
       @ds = @db[:company]
@@ -3589,7 +3613,7 @@ describe 'PostgreSQL row-valued/composite types' do
       @ds.get(:company).must_equal Company.new(:id=>1, :employees=>@es)
       @ds.filter(:employees=>Sequel.cast(:$employees, 'person[]')).call(:first, :employees=>@es)[:id].must_equal 1
       @ds.filter(:employees=>Sequel.cast(:$employees, 'person[]')).call(:first, :employees=>Sequel.pg_array([@db.row_type(:person, [1, Sequel.pg_row(['123 Sesame St', 'Somewhere', '12356'])])])).must_equal nil
-    end if DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG
+    end if (DB.adapter_scheme == :postgres && SEQUEL_POSTGRES_USES_PG) || DB.adapter_scheme == :jdbc
 
     it 'model typecasting' do
       Person.plugin :pg_typecast_on_load, :address unless @native

data/spec/core/connection_pool_spec.rb

@@ -169,7 +169,7 @@ describe "A connection pool with a max size of 1" do
   before do
     @invoked_count = 0
     icp = proc{@invoked_count += 1}
-    @pool = Sequel::ConnectionPool.get_pool(mock_db.call{icp.call; 'herro'}, CONNECTION_POOL_DEFAULTS.merge(:max_connections=>1))
+    @pool = Sequel::ConnectionPool.get_pool(mock_db.call{icp.call; 'herro'.dup}, CONNECTION_POOL_DEFAULTS.merge(:max_connections=>1))
   end
   
   it "should let only one thread access the connection at any time" do

data/spec/extensions/association_pks_spec.rb

@@ -284,10 +284,11 @@ describe "Sequel::Plugins::AssociationPks" do
   it "should handle delaying setting of association pks until after saving for new objects, if :delay plugin option is used" do
     @Artist.one_to_many :albums, :clone=>:albums, :delay_pks=>true
     @Album.many_to_many :tags, :clone=>:tags, :delay_pks=>true
+    @Album.db_schema[:id][:type] = :integer
 
     ar = @Artist.new
     ar.album_pks.must_equal []
-    ar.album_pks = [1,2,3]
+    ar.album_pks = ["1","2","3"]
     ar.album_pks.must_equal [1,2,3]
     @db.sqls.must_equal []
 
@@ -320,11 +321,12 @@ describe "Sequel::Plugins::AssociationPks" do
   it "should handle delaying setting of association pks until after saving for existing objects, if :delay=>:all plugin option is used" do
     @Artist.one_to_many :albums, :clone=>:albums, :delay_pks=>:always
     @Album.many_to_many :tags, :clone=>:tags, :delay_pks=>:always
+    @Album.db_schema[:id][:type] = :integer
 
     ar = @Artist.load(:id=>1)
     ar.album_pks.must_equal [1,2,3]
     @db.sqls
-    ar.album_pks = [2,4]
+    ar.album_pks = ["2","4"]
     ar.album_pks.must_equal [2,4]
     @db.sqls.must_equal []
 

data/spec/extensions/caching_spec.rb

@@ -44,7 +44,7 @@ describe Sequel::Model, "caching" do
     end
    
     @dataset = @c.dataset = @c3.dataset = @c4.dataset
-    @dataset._fetch = {:name => 'sharon', :id => 1}
+    @dataset._fetch = {:name => 'sharon'.dup, :id => 1}
     @dataset.numrows = 1
     
     @c2 = Class.new(@c) do

data/spec/extensions/csv_serializer_spec.rb

@@ -1,5 +1,11 @@
 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
 describe "Sequel::Plugins::CsvSerializer" do
   before do
     artist = @Artist = Class.new(Sequel::Model(:artists))
@@ -171,3 +177,4 @@ describe "Sequel::Plugins::CsvSerializer" do
     @album.to_csv(:except=>[:id, :artist_id]).must_equal "RF\n"
   end
 end
+end