sequel 5.17.0 → 5.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ba219a366f7927beb723a4440c7d497d62b9a2d3b066c44ea5368253a668698
-  data.tar.gz: 570fde96f4cce21da26853210b29eef64e1c6adbf911d085faf5ebf907b0f013
+  metadata.gz: 8f181e0ec05e457e72b2517202bbd159a6a066c9dd946201de44576b64bca302
+  data.tar.gz: f554f6268798f72c667851c6d952f960564e70ebb1e2d3d1208db74bbcd98834
 SHA512:
-  metadata.gz: dd6070cf9080a359fd506a5ea8a9d1aaedb2a293c0ed4a123795a55a76e3e9b6ae9720da2f03ec5d1f904258a6fb12c462a2bd661a8ff79c5d0fbd27488664cd
-  data.tar.gz: 402bade89fccfe94c5f29a9a7767fe7cca1bd0549e37fe8591268507b8025365b2ff7af7ef36dfa6a281607d44f4d6fb683dbff801d55003c546981bca1b932d
+  metadata.gz: 474c441a62bb901abaf12968ec62cdd239f9679ce4cb1743cd58e7ec6032cb1e26d128fd49bbe7c3edfce9a0fb63b33975aa6426ebb8ee79f1309a09967ffef5
+  data.tar.gz: 8717400fcb03235ad51ab208d35e9accca05018c6531da025bbcefb8f4b557345e1afbbfd65862f2c213ca4b05826db72c5ecc6b8abdda5920af83dcd8fe35d9

data/CHANGELOG

@@ -1,3 +1,21 @@
+=== 5.18.0 (2019-03-01)
+
+* Use singleton .call methods on plain objects instead of procs/methods for faster type conversion (jeremyevans)
+
+* Add Sequel::SQL::Blob.call to avoid indirection when converting values from the database (jeremyevans)
+
+* Use while instead of each for inner loops in sqlite and jdbc adapters for better performance (jeremyevans)
+
+* Make after_initialize plugin not make the argument to Model.call optional (jeremyevans)
+
+* Allow Dataset#paged_each to be called without a block in the postgres and mysql2 adapters (jeremyevans)
+
+* Remove flow-control exceptions in connection_expiration and connection_validator extensions (jeremyevans)
+
+* Add throw_failures plugin for throwing ValidationFailed and HookFailed exceptions instead of raising them, up to 10x performance increase on JRuby (jeremyevans)
+
+* Support tzinfo 2 in addition to tzinfo 1 in the named_timezones extension (jeremyevans) (#1596)
+
 === 5.17.0 (2019-02-01)
 
 * Support skip_auto_validations instance method in auto_validations plugin (oldgreen, jeremyevans) (#1592)

data/MIT-LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2007-2008 Sharon Rosner
-Copyright (c) 2008-2018 Jeremy Evans
+Copyright (c) 2008-2019 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

data/doc/release_notes/5.18.0.txt

@@ -0,0 +1,69 @@
+= New Features
+
+* A throw_failures plugin has been added for throwing ValidationFailed
+  and HookFailed exceptions instead of raising them.  This can improve
+  performance by up to 10x on JRuby and 10-15% on CRuby.  However,
+  you would need to modify your exception handling from:
+
+    begin
+      # model.save
+    rescue Sequel::ValidationFailed => e
+      # handle failure
+    end
+
+  to:
+
+    e = catch(Sequel::ValidationFailed) do
+      # model.save
+    end
+    if e.is_a?(Sequel::ValidationFailed)
+      # handle failure
+    end
+
+  The throw_failures plugin will still work if you are not catching
+  the exception, falling back to the default behavior of raising
+  the exception.
+
+* SQL::Blob.call has been added, so that SQL::Blob can be used
+  directly as a callable to create a new instance, resulting in
+  better performance in cases where a callable is needed.
+
+= Other Improvements
+
+* Type conversion is many adapters is now faster by switching from
+  Proc/Method instances to using singleton call methods on plain
+  objects.  This can improve performance of row fetching by up to
+  10% in some cases.
+
+* Row fetching is slightly faster in the jdbc and sqlite adapters,
+  by switching from each to while.
+
+* tzinfo 2 is now supported when using the named_timezones extension.
+  tzinfo 1 remains supported.
+
+* The optimized Dataset#paged_each methods in the postgres and mysql2
+  adapters now support being called without a block, returning an
+  Enumerator in that case, to mirror the behavior of the default
+  Dataset#paged_each method.
+
+* Sequel no longer uses flow-control exceptions in the
+  connection_expiration and connection_validator extensions,
+  significantly improving performance on JRuby.
+
+* The after_initialize plugin no longer makes the argument to
+  Model.call optional.
+
+= Backwards Compatibility
+
+* Some internal by not private constants and methods previously used
+  for type conversion in adapters have been removed:
+
+  * JDBC::Oracle.OracleDecimal
+  * JDBC::Oracle.OracleClob
+  * JDBC::Postgres.RubyPGArray
+  * JDBC::Postgres.RubyPGHstore
+  * JDBC::SqlAnywhere.SqlAnywhereBoolean
+  * JDBC::SQLServer.MSSQLRubyTime
+  * MySQL::TYPE_TRANSLATOR
+  * Postgres::TYPE_TRANSLATOR
+

data/doc/testing.rdoc

@@ -161,6 +161,7 @@ SEQUEL_FREEZE_DATABASE :: Freeze the database before running the integration spe
 SEQUEL_IDENTIFIER_MANGLING :: Use the identifier_mangling extension when running the specs
 SEQUEL_INTEGER64 :: Use the integer64 extension when running the adapter or integration specs
 SEQUEL_MODEL_PREPARED_STATEMENTS :: Use the prepared_statements plugin when running the specs
+SEQUEL_MODEL_THROW_FAILURES :: Use the throw_failures plugin when running the specs
 SEQUEL_NO_CACHE_ASSOCIATIONS :: Don't cache association metadata when running the specs
 SEQUEL_NO_CHECK_SQLS :: Don't check for specific SQL syntax when running the specs
 SEQUEL_CHECK_PENDING :: Try running all specs (note, can cause lockups for some adapters), and raise errors for skipped specs that don't fail

data/lib/sequel/adapters/jdbc.rb

@@ -57,45 +57,53 @@ module Sequel
     end
 
     class TypeConvertor
+      CONVERTORS = convertors = {}
       %w'Boolean Float Double Int Long Short'.each do |meth|
-        class_eval("def #{meth}(r, i) v = r.get#{meth}(i); v unless r.wasNull end", __FILE__, __LINE__)
+        x = convertors[meth.to_sym] = Object.new
+        class_eval("def x.call(r, i) v = r.get#{meth}(i); v unless r.wasNull end", __FILE__, __LINE__)
       end
       %w'Object Array String Time Date Timestamp BigDecimal Blob Bytes Clob'.each do |meth|
-        class_eval("def #{meth}(r, i) r.get#{meth}(i) end", __FILE__, __LINE__)
+        x = convertors[meth.to_sym] = Object.new
+        class_eval("def x.call(r, i) r.get#{meth}(i) end", __FILE__, __LINE__)
       end
-      def RubyTime(r, i)
+      x = convertors[:RubyTime] = Object.new
+      def x.call(r, i)
         if v = r.getTime(i)
           Sequel.string_to_time("#{v.to_string}.#{sprintf('%03i', v.getTime.divmod(1000).last)}")
         end
       end
-      def RubyDate(r, i)
+      x = convertors[:RubyDate] = Object.new
+      def x.call(r, i)
         if v = r.getDate(i)
           Date.civil(v.getYear + 1900, v.getMonth + 1, v.getDate)
         end
       end
-      def RubyTimestamp(r, i)
+      x = convertors[:RubyTimestamp] = Object.new
+      def x.call(r, i)
         if v = r.getTimestamp(i)
           Sequel.database_to_application_timestamp([v.getYear + 1900, v.getMonth + 1, v.getDate, v.getHours, v.getMinutes, v.getSeconds, v.getNanos])
         end
       end
-      def RubyBigDecimal(r, i)
+      x = convertors[:RubyBigDecimal] = Object.new
+      def x.call(r, i)
         if v = r.getBigDecimal(i)
           ::Kernel::BigDecimal(v.to_string)
         end
       end
-      def RubyBlob(r, i)
+      x = convertors[:RubyBlob] = Object.new
+      def x.call(r, i)
         if v = r.getBytes(i)
           Sequel::SQL::Blob.new(String.from_java_bytes(v))
         end
       end
-      def RubyClob(r, i)
+      x = convertors[:RubyClob] = Object.new
+      def x.call(r, i)
         if v = r.getClob(i)
           v.getSubString(1, v.length)
         end
       end
 
-      o = new
-      MAP = Hash.new(o.method(:Object))
+      MAP = Hash.new(convertors[:Object])
       types = Java::JavaSQL::Types
 
       {
@@ -113,7 +121,7 @@ module Sequel
         :TINYINT => :Short,
         :VARCHAR => :String,
       }.each do |type, meth|
-        MAP[types.const_get(type)] = o.method(meth) 
+        MAP[types.const_get(type)] = convertors[meth]
       end
       BASIC_MAP = MAP.dup
 
@@ -130,13 +138,11 @@ module Sequel
         :TIMESTAMP => :Timestamp,
         :VARBINARY => :Blob,
       }.each do |type, meth|
-        BASIC_MAP[types.const_get(type)] = o.method(meth) 
-        MAP[types.const_get(type)] = o.method(:"Ruby#{meth}") 
+        BASIC_MAP[types.const_get(type)] = convertors[meth]
+        MAP[types.const_get(type)] = convertors[:"Ruby#{meth}"]
       end
-
       MAP.freeze
       BASIC_MAP.freeze
-      freeze
     end
 
     class Database < Sequel::Database
@@ -785,11 +791,14 @@ module Sequel
           i += 1
           cols << [output_identifier(meta.getColumnLabel(i)), i, convert ? type_convertor(map, meta, meta.getColumnType(i), i) : basic_type_convertor(map, meta, meta.getColumnType(i), i)]
         end
+        max = i
         self.columns = cols.map{|c| c[0]}
 
         while result.next
           row = {}
-          cols.each do |n, j, pr|
+          i = -1
+          while (i += 1) < max
+            n, j, pr = cols[i]
             row[n] = pr.call(result, j)
           end
           yield row

data/lib/sequel/adapters/jdbc/oracle.rb

@@ -16,8 +16,8 @@ module Sequel
 
     module Oracle
       JAVA_BIG_DECIMAL_CONSTRUCTOR = java.math.BigDecimal.java_class.constructor(Java::long).method(:new_instance)
-
-      def self.OracleDecimal(r, i)
+      ORACLE_DECIMAL = Object.new
+      def ORACLE_DECIMAL.call(r, i)
         if v = r.getBigDecimal(i)
           i = v.long_value
           if v == JAVA_BIG_DECIMAL_CONSTRUCTOR.call(i)
@@ -28,7 +28,8 @@ module Sequel
         end
       end 
 
-      def self.OracleClob(r, i)
+      ORACLE_CLOB = Object.new
+      def ORACLE_CLOB.call(r, i)
         return unless clob = r.getClob(i)
         str = clob.getSubString(1, clob.length)
         clob.freeTemporary if clob.isTemporary
@@ -110,8 +111,8 @@ module Sequel
 
         def setup_type_convertor_map
           super
-          @type_convertor_map[:OracleDecimal] = Oracle.method(:OracleDecimal)
-          @type_convertor_map[:OracleClob] = Oracle.method(:OracleClob)
+          @type_convertor_map[:OracleDecimal] = ORACLE_DECIMAL
+          @type_convertor_map[:OracleClob] = ORACLE_CLOB
         end
       end
       

data/lib/sequel/adapters/jdbc/postgresql.rb

@@ -14,24 +14,6 @@ module Sequel
     end
 
     module Postgres
-      # Return PostgreSQL array types as ruby Arrays instead of
-      # JDBC PostgreSQL driver-specific array type. Only used if the
-      # database does not have a conversion proc for the type.
-      def self.RubyPGArray(r, i)
-        if v = r.getArray(i)
-          v.array.to_ary
-        end
-      end 
-
-      # Return PostgreSQL hstore types as ruby Hashes instead of
-      # Java HashMaps.  Only used if the database does not have a
-      # conversion proc for the type.
-      def self.RubyPGHstore(r, i)
-        if v = r.getObject(i)
-          v.to_hash
-        end
-      end 
-
       module DatabaseMethods
         include Sequel::Postgres::DatabaseMethods
 
@@ -213,9 +195,27 @@ module Sequel
 
         STRING_TYPE = Java::JavaSQL::Types::VARCHAR
         ARRAY_TYPE = Java::JavaSQL::Types::ARRAY
-        ARRAY_METHOD = Postgres.method(:RubyPGArray)
         PG_SPECIFIC_TYPES = [ARRAY_TYPE, Java::JavaSQL::Types::OTHER, Java::JavaSQL::Types::STRUCT, Java::JavaSQL::Types::TIME_WITH_TIMEZONE, Java::JavaSQL::Types::TIME].freeze
-        HSTORE_METHOD = Postgres.method(:RubyPGHstore)
+
+        # Return PostgreSQL array types as ruby Arrays instead of
+        # JDBC PostgreSQL driver-specific array type. Only used if the
+        # database does not have a conversion proc for the type.
+        ARRAY_METHOD = Object.new
+        def ARRAY_METHOD.call(r, i)
+          if v = r.getArray(i)
+            v.array.to_ary
+          end
+        end 
+
+        # Return PostgreSQL hstore types as ruby Hashes instead of
+        # Java HashMaps.  Only used if the database does not have a
+        # conversion proc for the type.
+        HSTORE_METHOD = Object.new
+        def HSTORE_METHOD.call(r, i)
+          if v = r.getObject(i)
+            v.to_hash
+          end
+        end 
 
         def type_convertor(map, meta, type, i)
           case type

data/lib/sequel/adapters/jdbc/sqlanywhere.rb

@@ -30,11 +30,6 @@ module Sequel
     end
 
     module SqlAnywhere
-      def self.SqlAnywhereBoolean(r, i)
-        v = r.getShort(i)
-        v != 0 unless r.wasNull
-      end
-
       module DatabaseMethods
         include Sequel::SqlAnywhere::DatabaseMethods
         include Sequel::JDBC::Transactions
@@ -58,7 +53,11 @@ module Sequel
         private
 
         SMALLINT_TYPE = Java::JavaSQL::Types::SMALLINT
-        BOOLEAN_METHOD = SqlAnywhere.method(:SqlAnywhereBoolean)
+        BOOLEAN_METHOD = Object.new
+        def BOOLEAN_METHOD.call(r, i)
+          v = r.getShort(i)
+          v != 0 unless r.wasNull
+        end
 
         def type_convertor(map, meta, type, i)
           if convert_smallint_to_bool && type == SMALLINT_TYPE

data/lib/sequel/adapters/jdbc/sqlite.rb

@@ -78,12 +78,14 @@ module Sequel
           super
           @type_convertor_map[Java::JavaSQL::Types::INTEGER] = @type_convertor_map[Java::JavaSQL::Types::BIGINT]
           @basic_type_convertor_map[Java::JavaSQL::Types::INTEGER] = @basic_type_convertor_map[Java::JavaSQL::Types::BIGINT]
-          @type_convertor_map[Java::JavaSQL::Types::DATE] = lambda do |r, i|
+          x = @type_convertor_map[Java::JavaSQL::Types::DATE] = Object.new
+          def x.call(r, i)
             if v = r.getString(i)
               Sequel.string_to_date(v)
             end
           end
-          @type_convertor_map[Java::JavaSQL::Types::BLOB] = lambda do |r, i|
+          x = @type_convertor_map[Java::JavaSQL::Types::BLOB] = Object.new
+          def x.call(r, i)
             if v = r.getBytes(i)
               Sequel::SQL::Blob.new(String.from_java_bytes(v))
             elsif !r.wasNull

data/lib/sequel/adapters/jdbc/sqlserver.rb

@@ -15,7 +15,8 @@ module Sequel
     end
 
     module SQLServer
-      def self.MSSQLRubyTime(r, i)
+      MSSQL_RUBY_TIME = Object.new
+      def MSSQL_RUBY_TIME.call(r, i)
         # MSSQL-Server TIME should be fetched as string to keep the precision intact, see:
         # https://docs.microsoft.com/en-us/sql/t-sql/data-types/time-transact-sql#a-namebackwardcompatibilityfordownlevelclientsa-backward-compatibility-for-down-level-clients
         if v = r.getString(i)
@@ -29,7 +30,7 @@ module Sequel
         def setup_type_convertor_map
           super
           map = @type_convertor_map
-          map[Java::JavaSQL::Types::TIME] = SQLServer.method(:MSSQLRubyTime)
+          map[Java::JavaSQL::Types::TIME] = MSSQL_RUBY_TIME
 
           # Work around constant lazy loading in some drivers
           begin

data/lib/sequel/adapters/mysql.rb

@@ -8,19 +8,22 @@ require_relative 'utils/mysql_prepared_statements'
 
 module Sequel
   module MySQL
-    TYPE_TRANSLATOR = tt = Class.new do
-      def boolean(s) s.to_i != 0 end
-      def integer(s) s.to_i end
-      def float(s) s.to_f end
-    end.new.freeze
+    boolean = Object.new
+    def boolean.call(s) s.to_i != 0 end
+    TYPE_TRANSLATOR_BOOLEAN = boolean.freeze
+    integer = Object.new
+    def integer.call(s) s.to_i end
+    TYPE_TRANSLATOR_INTEGER = integer.freeze
+    float = Object.new
+    def float.call(s) s.to_f end
 
     # Hash with integer keys and callable values for converting MySQL types.
     MYSQL_TYPES = {}
     {
       [0, 246] => ::Kernel.method(:BigDecimal),
-      [2, 3, 8, 9, 13, 247, 248] => tt.method(:integer),
-      [4, 5] => tt.method(:float),
-      [249, 250, 251, 252] => ::Sequel::SQL::Blob.method(:new)
+      [2, 3, 8, 9, 13, 247, 248] => integer,
+      [4, 5] => float,
+      [249, 250, 251, 252] => ::Sequel::SQL::Blob
     }.each do |k,v|
       k.each{|n| MYSQL_TYPES[n] = v}
     end
@@ -131,7 +134,7 @@ module Sequel
       # Modify the type translator used for the tinyint type based
       # on the value given.
       def convert_tinyint_to_bool=(v)
-        @conversion_procs[1] = TYPE_TRANSLATOR.method(v ? :boolean : :integer)
+        @conversion_procs[1] = v ? TYPE_TRANSLATOR_BOOLEAN : TYPE_TRANSLATOR_INTEGER
         @convert_tinyint_to_bool = v
       end
 

data/lib/sequel/adapters/mysql2.rb

@@ -245,6 +245,9 @@ module Sequel
       # it hasn't been disabled.
       def paged_each(opts=OPTS, &block)
         if STREAMING_SUPPORTED && opts[:stream] != false
+          unless block_given?
+            return enum_for(:paged_each, opts)
+          end
           stream.each(&block)
         else
           super

data/lib/sequel/adapters/postgres.rb

@@ -508,7 +508,7 @@ module Sequel
         @use_iso_date_format = typecast_value_boolean(@opts.fetch(:use_iso_date_format, true))
         initialize_postgres_adapter
         add_conversion_proc(17, method(:unescape_bytea)) if USES_PG
-        add_conversion_proc(1082, TYPE_TRANSLATOR.method(:date)) if @use_iso_date_format
+        add_conversion_proc(1082, TYPE_TRANSLATOR_DATE) if @use_iso_date_format
         self.convert_infinite_timestamps = @opts[:convert_infinite_timestamps]
       end
 
@@ -612,6 +612,9 @@ module Sequel
       
       # Use a cursor for paging.
       def paged_each(opts=OPTS, &block)
+        unless block_given?
+          return enum_for(:paged_each, opts)
+        end
         use_cursor(opts).each(&block)
       end
 

data/lib/sequel/adapters/shared/postgres.rb

@@ -23,43 +23,47 @@ module Sequel
     PLUS_INFINITY   = 1.0/0.0
     MINUS_INFINITY  = -1.0/0.0
 
-    TYPE_TRANSLATOR = tt = Class.new do
-      def boolean(s) s == 't' end
-      def integer(s) s.to_i end
-      def float(s) 
-        case s
-        when 'NaN'
-          NAN
-        when 'Infinity'
-          PLUS_INFINITY
-        when '-Infinity'
-          MINUS_INFINITY
-        else
-          s.to_f 
-        end
+    boolean = Object.new
+    def boolean.call(s) s == 't' end
+    integer = Object.new
+    def integer.call(s) s.to_i end
+    float = Object.new
+    def float.call(s) 
+      case s
+      when 'NaN'
+        NAN
+      when 'Infinity'
+        PLUS_INFINITY
+      when '-Infinity'
+        MINUS_INFINITY
+      else
+        s.to_f 
       end
-      def date(s) ::Date.new(*s.split('-').map(&:to_i)) end
-      def bytea(str)
-        str = if str =~ /\A\\x/
-          # PostgreSQL 9.0+ bytea hex format
-          str[2..-1].gsub(/(..)/){|s| s.to_i(16).chr}
-        else
-          # Historical PostgreSQL bytea escape format
-          str.gsub(/\\(\\|'|[0-3][0-7][0-7])/) {|s|
-            if s.size == 2 then s[1,1] else s[1,3].oct.chr end
-          }
-        end
-        ::Sequel::SQL::Blob.new(str)
-      end
-    end.new.freeze
+    end
+    date = Object.new
+    def date.call(s) ::Date.new(*s.split('-').map(&:to_i)) end
+    TYPE_TRANSLATOR_DATE = date.freeze
+    bytea = Object.new
+    def bytea.call(str)
+      str = if str =~ /\A\\x/
+        # PostgreSQL 9.0+ bytea hex format
+        str[2..-1].gsub(/(..)/){|s| s.to_i(16).chr}
+      else
+        # Historical PostgreSQL bytea escape format
+        str.gsub(/\\(\\|'|[0-3][0-7][0-7])/) {|s|
+          if s.size == 2 then s[1,1] else s[1,3].oct.chr end
+        }
+      end
+      ::Sequel::SQL::Blob.new(str)
+    end
 
     CONVERSION_PROCS = {}
 
     {
-      [16] => tt.method(:boolean),
-      [17] => tt.method(:bytea),
-      [20, 21, 23, 26] => tt.method(:integer),
-      [700, 701] => tt.method(:float),
+      [16] => boolean,
+      [17] => bytea,
+      [20, 21, 23, 26] => integer,
+      [700, 701] => float,
       [1700] => ::Kernel.method(:BigDecimal),
       [1083, 1266] => ::Sequel.method(:string_to_time),
       [1082] => ::Sequel.method(:string_to_date),

data/lib/sequel/adapters/sqlite.rb

@@ -7,67 +7,72 @@ module Sequel
   module SQLite
     FALSE_VALUES = (%w'0 false f no n' + [0]).freeze
 
-    tt = Class.new do
-      def blob(s)
-        Sequel::SQL::Blob.new(s.to_s)
-      end
+    blob = Object.new
+    def blob.call(s)
+      Sequel::SQL::Blob.new(s.to_s)
+    end
 
-      def boolean(s)
-        s = s.downcase if s.is_a?(String)
-        !FALSE_VALUES.include?(s)
-      end
+    boolean = Object.new
+    def boolean.call(s)
+      s = s.downcase if s.is_a?(String)
+      !FALSE_VALUES.include?(s)
+    end
 
-      def date(s)
-        case s
-        when String
-          Sequel.string_to_date(s)
-        when Integer
-          Date.jd(s)
-        when Float
-          Date.jd(s.to_i)
-        else
-          raise Sequel::Error, "unhandled type when converting to date: #{s.inspect} (#{s.class.inspect})"
-        end
+    date = Object.new
+    def date.call(s)
+      case s
+      when String
+        Sequel.string_to_date(s)
+      when Integer
+        Date.jd(s)
+      when Float
+        Date.jd(s.to_i)
+      else
+        raise Sequel::Error, "unhandled type when converting to date: #{s.inspect} (#{s.class.inspect})"
       end
+    end
 
-      def integer(s)
-        s.to_i
-      end
+    integer = Object.new
+    def integer.call(s)
+      s.to_i
+    end
 
-      def float(s)
-        s.to_f
-      end
+    float = Object.new
+    def float.call(s)
+      s.to_f
+    end
 
-      def numeric(s)
-        s = s.to_s unless s.is_a?(String)
-        BigDecimal(s) rescue s
-      end
+    numeric = Object.new
+    def numeric.call(s)
+      s = s.to_s unless s.is_a?(String)
+      BigDecimal(s) rescue s
+    end
 
-      def time(s)
-        case s
-        when String
-          Sequel.string_to_time(s)
-        when Integer
-          Sequel::SQLTime.create(s/3600, (s % 3600)/60, s % 60)
-        when Float
-          s, f = s.divmod(1)
-          Sequel::SQLTime.create(s/3600, (s % 3600)/60, s % 60, (f*1000000).round)
-        else
-          raise Sequel::Error, "unhandled type when converting to date: #{s.inspect} (#{s.class.inspect})"
-        end
+    time = Object.new
+    def time.call(s)
+      case s
+      when String
+        Sequel.string_to_time(s)
+      when Integer
+        Sequel::SQLTime.create(s/3600, (s % 3600)/60, s % 60)
+      when Float
+        s, f = s.divmod(1)
+        Sequel::SQLTime.create(s/3600, (s % 3600)/60, s % 60, (f*1000000).round)
+      else
+        raise Sequel::Error, "unhandled type when converting to date: #{s.inspect} (#{s.class.inspect})"
       end
-    end.new
+    end
 
     # Hash with string keys and callable values for converting SQLite types.
     SQLITE_TYPES = {}
     {
-      %w'date' => tt.method(:date),
-      %w'time' => tt.method(:time),
-      %w'bit bool boolean' => tt.method(:boolean),
-      %w'integer smallint mediumint int bigint' => tt.method(:integer),
-      %w'numeric decimal money' => tt.method(:numeric),
-      %w'float double real dec fixed' + ['double precision'] => tt.method(:float),
-      %w'blob' => tt.method(:blob)
+      %w'date' => date,
+      %w'time' => time,
+      %w'bit bool boolean' => boolean,
+      %w'integer smallint mediumint int bigint' => integer,
+      %w'numeric decimal money' => numeric,
+      %w'float double real dec fixed' + ['double precision'] => float,
+      %w'blob' => blob
     }.each do |k,v|
       k.each{|n| SQLITE_TYPES[n] = v}
     end
@@ -317,10 +322,13 @@ module Sequel
           cps = db.conversion_procs
           type_procs = result.types.map{|t| cps[base_type_name(t)]}
           cols = result.columns.map{|c| i+=1; [output_identifier(c), i, type_procs[i]]}
+          max = i+1
           self.columns = cols.map(&:first)
           result.each do |values|
             row = {}
-            cols.each do |name,id,type_proc|
+            i = -1
+            while (i += 1) < max
+              name, id, type_proc = cols[i]
               v = values[id]
               if type_proc && v
                 v = type_proc.call(v)

data/lib/sequel/extensions/connection_expiration.rb

@@ -32,6 +32,7 @@
 module Sequel
   module ConnectionExpiration
     class Retry < Error; end
+    Sequel::Deprecation.deprecate_constant(self, :Retry)
 
     # The number of seconds that need to pass since
     # connection creation before expiring a connection.
@@ -72,7 +73,8 @@ module Sequel
     # If it is expired, disconnect the connection, and retry with a new
     # connection.
     def acquire(*a)
-      begin
+      conn = nil
+      1.times do
         if (conn = super) &&
            (cet = sync{@connection_expiration_timestamps[conn]}) &&
            Sequel.elapsed_seconds_since(cet[0]) > cet[1]
@@ -84,10 +86,8 @@ module Sequel
           end
 
           disconnect_connection(conn)
-          raise Retry
+          redo
         end
-      rescue Retry
-        retry
       end
 
       conn

data/lib/sequel/extensions/connection_validator.rb

@@ -51,6 +51,7 @@
 module Sequel
   module ConnectionValidator
     class Retry < Error; end
+    Sequel::Deprecation.deprecate_constant(self, :Retry)
 
     # The number of seconds that need to pass since
     # connection checkin before attempting to validate
@@ -94,7 +95,9 @@ module Sequel
     # test the connection for validity.  If it is not valid,
     # disconnect the connection, and retry with a new connection.
     def acquire(*a)
-      begin
+      conn = nil
+
+      1.times do
         if (conn = super) &&
            (timer = sync{@connection_timestamps.delete(conn)}) &&
            Sequel.elapsed_seconds_since(timer) > @connection_validation_timeout &&
@@ -107,10 +110,8 @@ module Sequel
           end
 
           disconnect_connection(conn)
-          raise Retry
+          redo
         end
-      rescue Retry
-        retry
       end
 
       conn

data/lib/sequel/extensions/named_timezones.rb

@@ -63,24 +63,41 @@ module Sequel
 
     private 
     
-    # Assume the given DateTime has a correct time but a wrong timezone.  It is
-    # currently in UTC timezone, but it should be converted to the input_timezone.
-    # Keep the time the same but convert the timezone to the input_timezone.
-    # Expects the input_timezone to be a TZInfo::Timezone instance.
-    def convert_input_datetime_other(v, input_timezone)
-      local_offset = input_timezone.period_for_local(v, &tzinfo_disambiguator_for(v)).utc_total_offset_rational
-      (v - local_offset).new_offset(local_offset)
-    end
+    # Handle both TZInfo 1 and TZInfo 2
+    if defined?(TZInfo::VERSION) && TZInfo::VERSION > '2'
+      # :nodoc:
+      def convert_input_datetime_other(v, input_timezone)
+        local_offset = Rational(input_timezone.period_for_local(v, &tzinfo_disambiguator_for(v)).utc_total_offset, 86400)
+        (v - local_offset).new_offset(local_offset)
+      end
 
-    # Convert the given DateTime to use the given output_timezone.
-    # Expects the output_timezone to be a TZInfo::Timezone instance.
-    def convert_output_datetime_other(v, output_timezone)
-      # TZInfo converts times, but expects the given DateTime to have an offset
-      # of 0 and always leaves the timezone offset as 0
-      v = output_timezone.utc_to_local(v.new_offset(0))
-      local_offset = output_timezone.period_for_local(v, &tzinfo_disambiguator_for(v)).utc_total_offset_rational
-      # Convert timezone offset from UTC to the offset for the output_timezone
-      (v - local_offset).new_offset(local_offset)
+      def convert_output_datetime_other(v, output_timezone)
+        v = output_timezone.utc_to_local(v.new_offset(0))
+
+        # Force DateTime output instead of TZInfo::DateTimeWithOffset
+        DateTime.jd(v.jd, v.hour, v.minute, v.second + v.sec_fraction, v.offset, v.start)
+      end
+      # :nodoc:
+    else
+      # Assume the given DateTime has a correct time but a wrong timezone.  It is
+      # currently in UTC timezone, but it should be converted to the input_timezone.
+      # Keep the time the same but convert the timezone to the input_timezone.
+      # Expects the input_timezone to be a TZInfo::Timezone instance.
+      def convert_input_datetime_other(v, input_timezone)
+        local_offset = input_timezone.period_for_local(v, &tzinfo_disambiguator_for(v)).utc_total_offset_rational
+        (v - local_offset).new_offset(local_offset)
+      end
+
+      # Convert the given DateTime to use the given output_timezone.
+      # Expects the output_timezone to be a TZInfo::Timezone instance.
+      def convert_output_datetime_other(v, output_timezone)
+        # TZInfo 1 converts times, but expects the given DateTime to have an offset
+        # of 0 and always leaves the timezone offset as 0
+        v = output_timezone.utc_to_local(v.new_offset(0))
+        local_offset = output_timezone.period_for_local(v, &tzinfo_disambiguator_for(v)).utc_total_offset_rational
+        # Convert timezone offset from UTC to the offset for the output_timezone
+        (v - local_offset).new_offset(local_offset)
+      end
     end
     
     # Returns TZInfo::Timezone instance if given a String.

data/lib/sequel/model/base.rb

@@ -1459,7 +1459,7 @@ module Sequel
         raise Sequel::Error, "can't save frozen object" if frozen?
         set_server(opts[:server]) if opts[:server] 
         unless _save_valid?(opts)
-          raise(ValidationFailed.new(self)) if raise_on_failure?(opts)
+          raise(validation_failed_error) if raise_on_failure?(opts)
           return
         end
         checked_save_failure(opts){checked_transaction(opts){_save(opts)}}
@@ -1916,6 +1916,11 @@ module Sequel
         Errors
       end
 
+      # A HookFailed exception for the given message tied to the current instance.
+      def hook_failed_error(msg)
+        HookFailed.new(msg, self)
+      end
+  
       # Clone constructor -- freeze internal data structures if the original's
       # are frozen.
       def initialize_clone(other)
@@ -1965,9 +1970,9 @@ module Sequel
           "a hook failed"
         end
 
-        raise HookFailed.new(msg, self)
+        raise hook_failed_error(msg)
       end
-  
+
       # Get the ruby class or classes related to the given column's type.
       def schema_type_class(column)
         if (sch = db_schema[column]) && (type = sch[:type])
@@ -2060,6 +2065,11 @@ module Sequel
       def use_transaction?(opts = OPTS)
         opts.fetch(:transaction, use_transactions)
       end
+
+      # An ValidationFailed exception instance to raise for this instance.
+      def validation_failed_error
+        ValidationFailed.new(self)
+      end
     end
 
     # DatasetMethods contains methods that all model datasets have.

data/lib/sequel/plugins/after_initialize.rb

@@ -15,7 +15,7 @@ module Sequel
     module AfterInitialize
       module ClassMethods
         # Call after_initialize for model objects loaded from the database.
-        def call(h={})
+        def call(_)
           v = super
           v.after_initialize
           v

data/lib/sequel/plugins/nested_attributes.rb

@@ -70,10 +70,21 @@ module Sequel
     #
     # Then you can do:
     #
-    #   artist.update_fields(params['artist'], %w'name albums_artists')
+    #   artist.update_fields(params['artist'], %w'name albums_attributes')
+    #
+    # Note that Rails 5+ does not use a Hash for submitted parameters, and therefore
+    # the above will not work.  With Rails 5+, you have to use:
+    #
+    #   artist.update_fields(params.to_unsafe_h['artist'], %w'name albums_attributes')
     #
     # To save changes to the artist, create the first album and associate it to the artist,
     # and update the other existing associated album.
+    #
+    # You can pass options for individual nested attributes, which will override the default
+    # nested attributes options for that association.  This is useful for per-call filtering
+    # of the allowed fields:
+    #
+    #   a.set_nested_attributes(:albums, params['artist'], :fields=>%w'name')
     module NestedAttributes
       # Depend on the validate_associated plugin.
       def self.apply(model)

data/lib/sequel/plugins/throw_failures.rb

@@ -0,0 +1,110 @@
+# frozen-string-literal: true
+
+module Sequel
+  module Plugins
+    # The throw_failures plugin throws HookFailed and ValidationFailed exceptions instead
+    # of raising them.  If there is no matching catch block, the UncaughtThrowError will be rescued
+    # and the HookFailed or ValidationFailed exception will be raised normally.
+    #
+    # If you are setting up the catch blocks to handle these failures, in the failure case this
+    # plugin is about 10-15% faster on CRuby and 10x faster on JRuby.  If you are not
+    # setting up the catch blocks, in the failure case this plugin is about 30% slower on CRuby
+    # and 2x slower on JRuby.  So this plugin should only be used if you are setting up catch
+    # blocks manually.
+    #
+    # This plugin will setup catch blocks automatically for internally rescued HookFailed
+    # exceptions when the model is configured to not raise exceptions on failure (by default,
+    # the exceptions are internally rescued in that case.
+    #
+    # To set up the catch blocks, use the class of the exception:
+    #
+    #   ret = catch(Sequel::ValidationFailed) do
+    #     model_instance.save
+    #   end
+    #   if ret.is_a?(Sequel::ValidationFailed)
+    #     # handle failure
+    #   else
+    #     # handle success
+    #   end
+    #
+    # Usage:
+    #
+    #   # Make all model subclass instances throw HookFailed and ValidationFailed exceptions
+    #   # (called before loading subclasses)
+    #   Sequel::Model.plugin :throw_failures
+    #
+    #   # Make the Album class throw HookFailed and ValidationFailed exceptions
+    #   Album.plugin :throw_failures
+    module ThrowFailures
+      module InstanceMethods
+        # Catch any thrown HookFailed exceptions.
+        def valid?(opts = OPTS)
+          catch_hook_failures{super} || false
+        end
+
+        private
+
+        # Catch any HookFailed exceptions thrown inside the block, and return
+        # nil if there were any.
+        def catch_hook_failures
+          called = ret = nil
+          caught = catch(HookFailed) do
+            ret = yield
+            called = true
+          end
+          ret if called
+        end
+
+        # Catch any thrown HookFailed exceptions if not raising on failure.
+        def checked_save_failure(opts)
+          if raise_on_failure?(opts)
+            super
+          else
+            catch_hook_failures{super}
+          end
+        end
+
+        if RUBY_VERSION >= '2.2' && (!defined?(JRUBY_VERSION) || JRUBY_VERSION > '9.1')
+          # Throw HookFailed with the generated error.  If the throw is not
+          # caught, just return the originally generated error.
+          def hook_failed_error(msg)
+            e = super
+            throw HookFailed, e
+          rescue UncaughtThrowError
+            e
+          end
+
+          # Throw ValidationFailed with the generated error.  If the throw is not
+          # caught, just return the originally generated error.
+          def validation_failed_error
+            e = super
+            throw ValidationFailed, e
+          rescue UncaughtThrowError
+            e
+          end
+        else
+          # UncaughtThrowError was added in Ruby 2.2.  Older Ruby versions
+          # used ArgumentError with "uncaught throw" at the start of the message
+
+          # :nocov:
+          def hook_failed_error(msg)
+            e = super
+            throw HookFailed, e
+          rescue ArgumentError => e2
+            raise e2 unless e2.message.start_with?('uncaught throw')
+            e
+          end
+
+          def validation_failed_error
+            e = super
+            throw ValidationFailed, e
+          rescue ArgumentError => e2
+            raise e2 unless e2.message.start_with?('uncaught throw')
+            e
+          end
+          # :nocov:
+        end
+      end
+    end
+  end
+end

data/lib/sequel/sql.rb

@@ -1020,6 +1020,11 @@ module Sequel
       include SQL::AliasMethods
       include SQL::CastMethods
 
+      class << self
+        # Alias new to call for usage in conversion procs
+        alias call new
+      end
+
       # Return a LiteralString with the same content if no args are given, otherwise
       # return a SQL::PlaceholderLiteralString with the current string and the given args.
       def lit(*args)

data/lib/sequel/version.rb

@@ -6,7 +6,7 @@ module Sequel
 
   # The minor version of Sequel.  Bumped for every non-patch level
   # release, generally around once a month.
-  MINOR = 17
+  MINOR = 18
 
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.

data/spec/adapters/spec_helper.rb

@@ -20,6 +20,7 @@ Sequel::Database.extension :duplicate_column_handler if ENV['SEQUEL_DUPLICATE_CO
 Sequel::Database.extension :columns_introspection if ENV['SEQUEL_COLUMNS_INTROSPECTION']
 Sequel::Model.cache_associations = false if ENV['SEQUEL_NO_CACHE_ASSOCIATIONS']
 Sequel::Model.plugin :prepared_statements if ENV['SEQUEL_MODEL_PREPARED_STATEMENTS']
+Sequel::Model.plugin :throw_failures if ENV['SEQUEL_MODEL_THROW_FAILURES']
 Sequel::Model.cache_anonymous_models = false
 
 require_relative '../guards_helper'

data/spec/core/database_spec.rb

@@ -2681,10 +2681,11 @@ describe "Database extensions" do
     x = []
     Sequel::Database.register_extension(:a, Module.new{define_singleton_method(:extended){|_| x << :a}})
     Sequel::Database.register_extension(:b, Module.new{define_singleton_method(:extended){|_| x << :b}})
+    m = Mutex.new
     c = Class.new(Sequel::Database) do
       def dataset_class_default; Sequel::Dataset end
       define_method(:connect) do |_|
-        x << :c
+        m.synchronize{x << :c}
         :connect
       end
     end

data/spec/core/expression_filters_spec.rb

@@ -1280,8 +1280,12 @@ describe "Sequel::SQL::Wrapper" do
   end
 end
 
-describe "Sequel::SQL::Blob#to_sequel_blob" do
-  it "should return self" do
+describe "Sequel::SQL::Blob" do
+  it ".call should be an alias for .new" do
+    Sequel::SQL::Blob.call('a').must_equal Sequel::SQL::Blob.new('a')
+  end
+
+  it "#to_sequel_blob should return self" do
     c = Sequel::SQL::Blob.new('a')
     c.to_sequel_blob.must_be_same_as(c)
   end

data/spec/extensions/after_initialize_spec.rb

@@ -21,4 +21,8 @@ describe "Sequel::Plugins::AfterInitialize" do
   it "should have after_initialize hook be called for objects loaded from the database" do
     @c.call(:id=>1, :name=>'foo').values.must_equal(:id=>3, :name=>'foofoo')
   end
+
+  it "should not allow .call to be called without arguments" do
+    proc{@c.call}.must_raise ArgumentError
+  end
 end

data/spec/extensions/named_timezones_spec.rb

@@ -73,11 +73,13 @@ describe "Sequel named_timezones extension" do
 
   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 DateTime
     dt.must_equal @dt
     dt.offset.must_equal(-7/24.0)
     
     dt = Sequel.database_to_application_timestamp('2009-06-01 10:20:30')
-    dt.must_equal @dt + 1/6.0
+    dt.must_be_instance_of DateTime
+    dt.must_equal(@dt + 1/6.0)
     dt.offset.must_equal(-7/24.0)
   end
   

data/spec/extensions/spec_helper.rb

@@ -60,3 +60,4 @@ end
 if ENV['SEQUEL_NO_CACHE_ASSOCIATIONS']
   Sequel::Model.cache_associations = false
 end
+Sequel::Model.plugin :throw_failures if ENV['SEQUEL_MODEL_THROW_FAILURES']

data/spec/extensions/throw_failures_spec.rb

@@ -0,0 +1,74 @@
+require_relative "spec_helper"
+
+describe "throw_failures plugin" do
+  before do
+    @c = Class.new(Sequel::Model(:items)) do
+      plugin :throw_failures
+      columns :x
+      set_primary_key :x
+      unrestrict_primary_key
+      def before_create
+        super
+        cancel_action 'bc' if x == 2
+      end
+      def before_destroy
+        super
+        cancel_action 'bd' if x == 2
+      end
+      def validate
+        super
+        errors.add(:x, "3") if x == 3
+      end
+    end
+    DB.reset
+  end
+  
+  it "should work normally if no exceptions are thrown/raised" do
+    o = @c.create(:x=>1)
+    o.must_be_kind_of @c
+    o.valid?.must_equal true
+    o.destroy.must_equal o
+  end
+
+  it "should work normally when not rescuing exceptions internally when calling save" do
+    @c.new.set(:x => 2).save(:raise_on_failure=>false).must_be_nil
+    @c.raise_on_save_failure = false
+    @c.create(:x => 2).must_be_nil
+    @c.load(:x => 2).destroy(:raise_on_failure=>false).must_be_nil
+  end
+    
+  it "should work normally when not rescuing exceptions internally when calling valid?" do
+    @c.send(:define_method, :before_validation){cancel_action "bv"}
+    @c.new(:x => 2).valid?.must_equal false
+  end
+
+  it "should raise exceptions if no catch blocks have been setup and set to raise on failure" do
+    begin
+      @c.create(:x => 2)
+    rescue Sequel::HookFailed => e 
+      e.backtrace.wont_be_empty
+      1
+    end.must_equal 1
+
+    begin
+      @c.create(:x => 3)
+    rescue Sequel::ValidationFailed => e 
+      e.backtrace.wont_be_empty
+      1
+    end.must_equal 1
+  end
+
+  it "should allow catching exceptions instead of rescuing them" do
+    e = catch(Sequel::HookFailed){@c.create(:x => 2)}
+    e.must_be_kind_of Sequel::HookFailed
+    e.backtrace.must_be_nil
+
+    e = catch(Sequel::ValidationFailed){@c.create(:x => 3)}
+    e.must_be_kind_of Sequel::ValidationFailed
+    e.backtrace.must_be_nil
+
+    e = catch(Sequel::HookFailed){@c.load(:x => 2).destroy}
+    e.must_be_kind_of Sequel::HookFailed
+    e.backtrace.must_be_nil
+  end
+end

data/spec/integration/dataset_test.rb

@@ -149,6 +149,10 @@ describe "Simple Dataset operations" do
       rows.must_equal((1..100).map{|i| {:id=>i, :number=>i*10}}.reverse)
     end
 
+    rows = []
+    @ds.order(:number).limit(50, 25).paged_each(:rows_per_fetch=>3).each{|row| rows << row}
+    rows.must_equal((26..75).map{|i| {:id=>i, :number=>i*10}})
+
     rows = []
     @ds.order(:number).limit(50, 25).paged_each(:rows_per_fetch=>3){|row| rows << row}
     rows.must_equal((26..75).map{|i| {:id=>i, :number=>i*10}})

data/spec/integration/plugin_test.rb

@@ -140,7 +140,7 @@ describe "Class Table Inheritance Plugin" do
   end
   
   it "should update rows in all tables" do
-    Executive.first.update(:name=>'Ex2', :num_managers=>8, :num_staff=>9)
+    Executive[:id=>@i4].update(:name=>'Ex2', :num_managers=>8, :num_staff=>9)
     @db[:employees][:id=>@i4].must_equal(:id=>@i4, :name=>'Ex2', :kind=>'Executive')
     @db[:managers][:id=>@i4].must_equal(:id=>@i4, :num_staff=>9)
     @db[:executives][:id=>@i4].must_equal(:id=>@i4, :num_managers=>8)

data/spec/integration/spec_helper.rb

@@ -20,6 +20,7 @@ Sequel.split_symbols = true if ENV['SEQUEL_SPLIT_SYMBOLS']
 Sequel::Database.extension :columns_introspection if ENV['SEQUEL_COLUMNS_INTROSPECTION']
 Sequel::Model.cache_associations = false if ENV['SEQUEL_NO_CACHE_ASSOCIATIONS']
 Sequel::Model.plugin :prepared_statements if ENV['SEQUEL_MODEL_PREPARED_STATEMENTS']
+Sequel::Model.plugin :throw_failures if ENV['SEQUEL_MODEL_THROW_FAILURES']
 Sequel::Model.use_transactions = false
 Sequel::Model.cache_anonymous_models = false
 

data/spec/model/model_spec.rb

@@ -588,9 +588,12 @@ describe Sequel::Model, ".fetch" do
   end
 
   it "should return true for .empty? and not raise an error on empty selection" do
-    rows = @c.fetch("SELECT * FROM items WHERE FALSE")
-    @c.send(:define_method, :fetch_rows){|sql| yield({:count => 0})}
-    rows.empty?
+    @c.dataset = @c.dataset.with_extend do
+      def fetch_rows(sql)
+        yield({:count => 0})
+      end
+    end
+    @c.fetch("SELECT * FROM items WHERE FALSE").empty?
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.17.0
+  version: 5.18.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -201,6 +201,7 @@ extra_rdoc_files:
 - doc/release_notes/5.15.0.txt
 - doc/release_notes/5.16.0.txt
 - doc/release_notes/5.17.0.txt
+- doc/release_notes/5.18.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -288,6 +289,7 @@ files:
 - doc/release_notes/5.15.0.txt
 - doc/release_notes/5.16.0.txt
 - doc/release_notes/5.17.0.txt
+- doc/release_notes/5.18.0.txt
 - doc/release_notes/5.2.0.txt
 - doc/release_notes/5.3.0.txt
 - doc/release_notes/5.4.0.txt
@@ -534,6 +536,7 @@ files:
 - lib/sequel/plugins/subset_conditions.rb
 - lib/sequel/plugins/table_select.rb
 - lib/sequel/plugins/tactical_eager_loading.rb
+- lib/sequel/plugins/throw_failures.rb
 - lib/sequel/plugins/timestamps.rb
 - lib/sequel/plugins/touch.rb
 - lib/sequel/plugins/tree.rb
@@ -709,6 +712,7 @@ files:
 - spec/extensions/table_select_spec.rb
 - spec/extensions/tactical_eager_loading_spec.rb
 - spec/extensions/thread_local_timezones_spec.rb
+- spec/extensions/throw_failures_spec.rb
 - spec/extensions/timestamps_spec.rb
 - spec/extensions/to_dot_spec.rb
 - spec/extensions/touch_spec.rb