sequel 5.107.0 → 5.109.0

data/lib/sequel/model/associations.rb

@@ -383,7 +383,7 @@ module Sequel
         end
 
         # Finalize the association by first attempting to populate the thread-safe cache,
-        # and then transfering the thread-safe cache value to the association itself,
+        # and then transferring the thread-safe cache value to the association itself,
         # so that a mutex is not needed to get the value.
         def finalize
           return unless cache = self[:cache]
@@ -1174,7 +1174,7 @@ module Sequel
         private
     
         # Use a correlated subquery to limit the dataset.  Note that this will not
-        # work correctly if the associated dataset uses qualified identifers in the WHERE clause,
+        # work correctly if the associated dataset uses qualified identifiers in the WHERE clause,
         # as they would reference the containing query instead of the subquery.
         def apply_correlated_subquery_limit_strategy(ds)
           table = ds.first_source_table
@@ -1191,7 +1191,7 @@ module Sequel
         end
 
         # Use a LATERAL subquery to limit the dataset.  Note that this will not
-        # work correctly if the associated dataset uses qualified identifers in the WHERE clause,
+        # work correctly if the associated dataset uses qualified identifiers in the WHERE clause,
         # as they would reference the containing query instead of the subquery.
         #
         # This does not contain the conditions that are necessary to join to the
@@ -1821,7 +1821,7 @@ module Sequel
         # The following options can be supplied:
         # === Multiple Types
         # :adder :: Proc used to define the private _add_* method for doing the database work
-        #           to associate the given object to the current object (*_to_many assocations).
+        #           to associate the given object to the current object (*_to_many associations).
         #           Set to nil to not define a add_* method for the association.
         # :after_add :: Symbol, Proc, or array of both/either specifying a callback to call
         #               after a new item is added to the association.
@@ -1852,7 +1852,7 @@ module Sequel
         # :class_namespace :: If :class is given as a string or symbol, sets the default namespace in which to look for
         #                     the class.  <tt>class: 'Foo', class_namespace: 'Bar'</tt> looks for <tt>::Bar::Foo</tt>.)
         # :clearer :: Proc used to define the private _remove_all_* method for doing the database work
-        #             to remove all objects associated to the current object (*_to_many assocations).
+        #             to remove all objects associated to the current object (*_to_many associations).
         #             Set to nil to not define a remove_all_* method for the association.
         # :clone :: Merge the current options and block into the options and block used in defining
         #           the given association.  Can be used to DRY up a bunch of similar associations that
@@ -1939,10 +1939,10 @@ module Sequel
         #               or add_/remove_/remove_all_ methods (for one_to_many and many_to_many associations).
         # :reciprocal :: the symbol name of the reciprocal association,
         #                if it exists.  By default, Sequel will try to determine it by looking at the
-        #                associated model's assocations for a association that matches
+        #                associated model's associations for a association that matches
         #                the current association's key(s).  Set to nil to not use a reciprocal.
         # :remover :: Proc used to define the private _remove_* method for doing the database work
-        #             to remove the association between the given object and the current object (*_to_many assocations).
+        #             to remove the association between the given object and the current object (*_to_many associations).
         #             Set to nil to not define a remove_* method for the association.
         # :select :: the columns to select.  Defaults to the associated class's table_name.* in an association
         #            that uses joins, which means it doesn't include the attributes from the
@@ -1950,7 +1950,7 @@ module Sequel
         #            use this option, but beware that the join table attributes can clash with
         #            attributes from the model table, so you should alias any attributes that have
         #            the same name in both the join table and the associated table.
-        # :setter :: Proc used to define the private _*= method for doing the work to setup the assocation
+        # :setter :: Proc used to define the private _*= method for doing the work to setup the association
         #            between the given object and the current object (*_to_one associations).
         #            Set to nil to not define a setter method for the association.
         # :subqueries_per_union :: The number of subqueries to use in each UNION query, for eager
@@ -2208,9 +2208,9 @@ module Sequel
         def association_module_delegate_def(name, opts, &block)
           mod = association_module(opts)
           mod.send(:define_method, name, &block)
-          # :nocov:
+          # simplecov:disable
           mod.send(:ruby2_keywords, name) if mod.respond_to?(:ruby2_keywords, true)
-          # :nocov:
+          # simplecov:enable
           mod.send(:alias_method, name, name)
         end
       
@@ -2819,9 +2819,9 @@ module Sequel
           run_association_callbacks(opts, :after_add, o)
           o
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:add_associated_object) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Add/Set the current object to/as the given object's reciprocal association.
         def add_reciprocal_object(opts, o)
@@ -2964,9 +2964,9 @@ module Sequel
           associations[opts[:name]] = []
           ret
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:remove_all_associated_objects) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Remove the given associated object from the given association
         def remove_associated_object(opts, o, *args)
@@ -2988,9 +2988,9 @@ module Sequel
           run_association_callbacks(opts, :after_remove, o)
           o
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:remove_associated_object) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Check that the object from the associated table specified by the primary key
         # is currently associated to the receiver.  If it is associated, return the object, otherwise
@@ -3476,7 +3476,7 @@ module Sequel
         # :limit_strategy :: Use a strategy for handling limits on associations.
         #                    Appropriate :limit_strategy values are:
         #                    true :: Pick the most appropriate based on what the database supports
-        #                    :distinct_on :: Force use of DISTINCT ON stategy (*_one associations only)
+        #                    :distinct_on :: Force use of DISTINCT ON strategy (*_one associations only)
         #                    :correlated_subquery :: Force use of correlated subquery strategy (one_to_* associations only)
         #                    :window_function :: Force use of window function strategy
         #                    :ruby :: Don't modify the SQL, implement limits/offsets with array slicing

data/lib/sequel/model/base.rb

@@ -518,9 +518,9 @@ module Sequel
 
         m.configure(self, *args, &block) if m.respond_to?(:configure)
       end
-      # :nocov:
+      # simplecov:disable
       ruby2_keywords(:plugin) if respond_to?(:ruby2_keywords, true)
-      # :nocov:
+      # simplecov:enable
 
       # Returns primary key attribute hash.  If using a composite primary key
       # value such be an array with values for each primary key in the correct
@@ -828,9 +828,9 @@ ruby2_keywords :#{meth} if respond_to?(:ruby2_keywords, true)
 END
         else
           mod.send(:define_method, meth){|*args, &block| dataset.public_send(meth, *args, &block)}
-          # :nocov:
+          # simplecov:disable
           mod.send(:ruby2_keywords, meth) if respond_to?(:ruby2_keywords, true)
-          # :nocov:
+          # simplecov:enable
         end
         mod.send(:alias_method, meth, meth)
       end
@@ -1830,7 +1830,7 @@ END
         end
       end
 
-      # Internal destroy method, separted from destroy to
+      # Internal destroy method, separated from destroy to
       # allow running inside a transaction
       def _destroy(opts)
         called = false
@@ -1943,7 +1943,7 @@ END
               columns = opts[:columns]
               if columns.nil?
                 columns_updated = if opts[:changed]
-                  _save_update_changed_colums_hash
+                  _save_update_changed_columns_hash
                 else
                   _save_update_all_columns_hash
                 end
@@ -1995,10 +1995,18 @@ END
         v
       end
 
+      def _save_update_changed_colums_hash # :nodoc:
+        # SEQUEL6: Remove
+        # simplecov:disable
+        Sequel::Deprecation.deprecate("Model#_save_update_changed_colums_hash", "Use #_save_update_changed_columns_hash instead")
+        _save_update_changed_columns_hash
+        # simplecov:enable
+      end
+
       # Return a hash of values used when saving changed columns of an
       # existing object.  Defaults to all of the objects current values
       # that are recorded as modified.
-      def _save_update_changed_colums_hash
+      def _save_update_changed_columns_hash
         cc = changed_columns
         @values.reject{|k,v| !cc.include?(k)}
       end
@@ -2425,14 +2433,9 @@ END
     plugin self
     def_initialize_nil_instance_variables
 
-    singleton_class.send(:undef_method, :dup, :clone, :initialize_copy)
-    # :nocov:
-    if RUBY_VERSION >= '1.9.3'
-    # :nocov:
-      singleton_class.send(:undef_method, :initialize_clone, :initialize_dup)
-    end
+    singleton_class.send(:undef_method, :dup, :clone, :initialize_copy, :initialize_clone, :initialize_dup)
 
-    # :nocov:
+    # simplecov:disable
     if defined?(Sequel::Postgres::SEQUEL_PG_VERSION_INTEGER) && Sequel::Postgres::SEQUEL_PG_VERSION_INTEGER >= 11800
       # Automatically optimize model loading when sequel/core was loaded,
       # then sequel/adapters/postgres (with sequel_pg), then sequel/model
@@ -2442,6 +2445,6 @@ END
         # nothing
       end
     end
-    # :nocov:
+    # simplecov:enable
   end
 end

data/lib/sequel/model/inflections.rb

@@ -28,7 +28,7 @@ module Sequel
     @plurals, @singulars, @uncountables = [], [], []
 
     class << self
-      # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for plurization.
+      # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for pluralization.
       attr_reader :plurals
 
       # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for singularization.

data/lib/sequel/model/plugins.rb

@@ -31,9 +31,9 @@ module Sequel
     def self.def_dataset_methods(mod, meths)
       Array(meths).each do |meth|
         mod.class_eval("def #{meth}(*args, &block); dataset.#{meth}(*args, &block) end", __FILE__, __LINE__)
-        # :nocov:
+        # simplecov:disable
         mod.send(:ruby2_keywords, meth) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
       end
     end
 

data/lib/sequel/model.rb

@@ -70,9 +70,9 @@ module Sequel
     require_relative "model/base"
     require_relative "model/exceptions"
     require_relative "model/errors"
-    # :nocov:
+    # simplecov:disable
     if !defined?(::SEQUEL_NO_ASSOCIATIONS) && !ENV.has_key?('SEQUEL_NO_ASSOCIATIONS')
-    # :nocov:
+    # simplecov:enable
       require_relative 'model/associations'
       plugin Model::Associations
     end

data/lib/sequel/plugins/association_pks.rb

@@ -20,7 +20,7 @@ module Sequel
     #   # Persist changes
     #
     # Note that it uses the singular form of the association name. Also note
-    # that the setter both associates to new primary keys not in the assocation
+    # that the setter both associates to new primary keys not in the association
     # and disassociates from primary keys not provided to the method.
     #
     # This plugin makes modifications directly to the underlying tables,

data/lib/sequel/plugins/association_proxies.rb

@@ -64,7 +64,7 @@ module Sequel
         array = [].freeze
 
         if RUBY_VERSION < '2.6'
-          # :nocov:
+          # simplecov:disable
 
           # Default proc used to determine whether to send the method to the dataset.
           # If the array would respond to it, sends it to the array instead of the dataset.
@@ -75,7 +75,7 @@ module Sequel
             end
             !array_method
           end
-          # :nocov:
+          # simplecov:enable
         else
           DEFAULT_PROXY_TO_DATASET = proc{|opts| !array.respond_to?(opts[:method])}
         end
@@ -99,9 +99,9 @@ module Sequel
           end
           v.public_send(meth, *args, &block)
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
       end
 
       module ClassMethods

data/lib/sequel/plugins/auto_restrict_eager_graph.rb

@@ -1,5 +1,7 @@
 # frozen-string-literal: true
 
+# SEQUEL6: Merge into default associations code
+
 module Sequel
   module Plugins
     # The auto_restrict_eager_graph plugin will automatically disallow the use

data/lib/sequel/plugins/caching.rb

@@ -29,6 +29,13 @@ module Sequel
     #
     # You should not use this plugin if you are using sharding and there are different
     # rows for the same primary key on different shards.
+    #
+    # Note that if you are using a composite key, and multiple columns in the composite
+    # key could potentially contain the character ",", you should override the
+    # +composite_cache_key+ class method to return an an unambiguous string identifying
+    # the specific primary key argument given. For consistency, if you would like to
+    # modify the cache key string used for scalar primary keys, you can override the
+    # +scalar_cache_key+ class method.
     # 
     # Usage:
     #
@@ -53,7 +60,7 @@ module Sequel
       end
 
       module ClassMethods
-        # If true, ignores exceptions when gettings cached records (the memcached API).
+        # If true, ignores exceptions when getting cached records (the memcached API).
         attr_reader :cache_ignore_exceptions
         
         # The cache store object for the model, which should implement the
@@ -81,8 +88,26 @@ module Sequel
 
         # Return a key string for the given primary key.
         def cache_key(pk)
-          raise(Error, 'no primary key for this record') unless pk.is_a?(Array) ? pk.all? : pk
-          "#{cache_key_prefix}:#{Array(pk).join(',')}"
+          case pk
+          when Array
+            raise(Error, 'no primary key for this record') unless pk.all?
+            "#{cache_key_prefix}:#{composite_cache_key(pk)}"
+          else
+            raise(Error, 'no primary key for this record') unless pk
+            "#{cache_key_prefix}:#{scalar_cache_key(pk)}"
+          end
+        end
+
+        # Return an appropriate cache key string for a valid scalar primary key.
+        # By default, converts the primary key to a string.
+        def scalar_cache_key(pk)
+          pk.to_s
+        end
+
+        # Return an appropriate cache key string for a valid composite primary key.
+        # By default, joins with the parts of the compsite key with ",".
+        def composite_cache_key(pk)
+          pk.join(',')
         end
         
         Plugins.inherited_instance_variables(self, :@cache_store=>nil, :@cache_ttl=>nil, :@cache_ignore_exceptions=>nil)

data/lib/sequel/plugins/class_table_inheritance.rb

@@ -79,7 +79,7 @@ module Sequel
     # subclass instances that only have column entries for the columns in the
     # superclass table.  Calling the column method on the subclass instance for
     # a column not in the superclass table will cause a query to the database
-    # to get the value for that column.  If the subclass instance was retreived
+    # to get the value for that column.  If the subclass instance was retrieved
     # using Dataset#all, the query to the database will attempt to load the column
     # values for all subclass instances that were retrieved.  For example:
     #

data/lib/sequel/plugins/column_encryption.rb

@@ -1,8 +1,8 @@
 # frozen-string-literal: true
 
-# :nocov:
+# simplecov:disable
 raise(Sequel::Error, "Sequel column_encryption plugin requires ruby 2.3 or greater") unless RUBY_VERSION >= '2.3'
-# :nocov:
+# simplecov:enable
 
 require 'openssl'
 
@@ -22,13 +22,13 @@ begin
   cipher.key = '1'*32
   cipher.auth_data = ''
   cipher.auth_tag = auth_tag
-  # :nocov:
+  # simplecov:disable
   unless (cipher.update(cipher_text) << cipher.final) == '2'
     raise OpenSSL::Cipher::CipherError
   end
 rescue RuntimeError, OpenSSL::Cipher::CipherError
   raise LoadError, "Sequel column_encryption plugin requires a working aes-256-gcm cipher"
-  # :nocov:
+  # simplecov:enable
 end
 
 require 'securerandom'
@@ -279,7 +279,7 @@ module Sequel
     #
     # = Unsupported Features
     #
-    # The following features are delibrately not supported:
+    # The following features are deliberately not supported:
     #
     # == Compression
     #
@@ -475,12 +475,12 @@ module Sequel
           def decode64(str)
             str.unpack1("m0")
           end
-        # :nocov:
+        # simplecov:disable
         else
           def decode64(str)
             str.unpack("m0")[0]
           end
-        # :nocov:
+        # simplecov:enable
         end
 
         def urlsafe_encode64(bin)
@@ -493,7 +493,7 @@ module Sequel
           decode64(str.tr("-_", "+/"))
         end
 
-        # An array of strings, one for each configured encryption key, to find encypted values matching
+        # An array of strings, one for each configured encryption key, to find encrypted values matching
         # the given data and search format.
         def _search_prefixes(data, search_type)
           @key_map.map do |key_id, (key, _)|
@@ -610,7 +610,7 @@ module Sequel
         end
       end
 
-      # This stores four callables for handling encyption, decryption, data searching,
+      # This stores four callables for handling encryption, decryption, data searching,
       # and key searching.  One of these is created for each encrypted column.
       ColumnEncryptionMetadata = Struct.new(:encryptor, :decryptor, :data_searcher, :key_searcher) # :nodoc:
 
@@ -702,7 +702,7 @@ module Sequel
 
       module InstanceMethods
         # Reencrypt the model if needed.  Looks at all of the models encrypted columns
-        # and if any were encypted with older keys or a different format, reencrypt
+        # and if any were encrypted with older keys or a different format, reencrypt
         # with the current key and format and save the object.  Returns the object
         # if reencryption was needed, or nil if reencryption was not needed.
         def reencrypt

data/lib/sequel/plugins/concurrent_eager_loading.rb

@@ -69,8 +69,8 @@ module Sequel
     # To keep things simple, you can use +Sequel.synchronize_with+ to only
     # use this mutex if it is available.  You want to use the mutex around the
     # code that initializes the associations (usually to +nil+ or <tt>[]</tt>),
-    # and also around the code that sets the associatied objects appropriately
-    # after they have been retreived.  You do not want to use the mutex around
+    # and also around the code that sets the associated objects appropriately
+    # after they have been retrieved.  You do not want to use the mutex around
     # the code that loads the objects, since that will prevent concurrent loading.
     # So after the changes, the custom eager loader would look like this:
     #

data/lib/sequel/plugins/csv_serializer.rb

@@ -73,23 +73,12 @@ module Sequel
         end
       end
 
-      # Avoid keyword argument separation warnings on Ruby 2.7, while still
-      # being compatible with 1.9.
-      if RUBY_VERSION >= "2.0"
-        instance_eval(<<-END, __FILE__, __LINE__+1)
-          def self.csv_call(*args, opts, &block)
-            CSV.send(*args, **opts, &block)
-          end
-        END
-      else
-        # :nocov:
-        # :nodoc:
-        def self.csv_call(*args, opts, &block)
-          CSV.send(*args, opts, &block)
-        end
-        # :nodoc:
-        # :nocov:
+      # simplecov:disable
+      def self.csv_call(*args, opts, &block)
+        Sequel::Deprecation.deprecate("Sequel::Plugins::CsvSerializer.csv_call will be removed in Sequel 6.")
+        CSV.send(*args, **opts, &block)
       end
+      # simplecov:enable
 
       module ClassMethods
         # The default opts to use when serializing model objects to CSV
@@ -97,7 +86,7 @@ module Sequel
 
         # Attempt to parse an array of instances from the given CSV string
         def array_from_csv(csv, opts = OPTS)
-          CsvSerializer.csv_call(:parse, csv, process_csv_serializer_opts(opts)).map do |row|
+          CSV.parse(csv, **process_csv_serializer_opts(opts)).map do |row|
             row = row.to_hash
             row.delete(nil)
             new(row)
@@ -147,7 +136,7 @@ module Sequel
         # :headers :: The headers to use for the CSV line. Use nil for a header
         #             to specify the column should be ignored.
         def from_csv(csv, opts = OPTS)
-          row = CsvSerializer.csv_call(:parse_line, csv, model.process_csv_serializer_opts(opts)).to_hash
+          row = CSV.parse_line(csv, **model.process_csv_serializer_opts(opts)).to_hash
           row.delete(nil)
           set(row)
         end
@@ -165,7 +154,7 @@ module Sequel
           opts = model.process_csv_serializer_opts(opts)
           headers = opts[:headers]
 
-          CsvSerializer.csv_call(:generate, model.process_csv_serializer_opts(opts)) do |csv|
+          CSV.generate(**model.process_csv_serializer_opts(opts)) do |csv|
             csv << headers.map{|k| public_send(k)}
           end
         end
@@ -184,7 +173,7 @@ module Sequel
           items = opts.delete(:array) || self
           headers = opts[:headers]
 
-          CsvSerializer.csv_call(:generate, opts) do |csv|
+          CSV.generate(**opts) do |csv|
             items.each do |object|
               csv << headers.map{|header| object.public_send(header)}
             end

data/lib/sequel/plugins/deprecated_associations.rb

@@ -105,9 +105,9 @@ module Sequel
                 end
                 super(*a, &b)
               end
-              # :nocov:
+              # simplecov:disable
               ruby2_keywords(name) if respond_to?(:ruby2_keywords, true)
-              # :nocov:
+              # simplecov:enable
               alias_method(name, name)
             end
           end

data/lib/sequel/plugins/eager_each.rb

@@ -77,7 +77,7 @@ module Sequel
 
         private
 
-        # Wether to use all when each is called, true when eager loading
+        # Whether to use all when each is called, true when eager loading
         # unless the flag has already been set.
         def use_eager_all?
           (opts[:eager] || opts[:eager_graph]) && !opts[:all_called]

data/lib/sequel/plugins/finder.rb

@@ -237,7 +237,7 @@ module Sequel
           end
         end
 
-        # Clear any finders when reseting the instance dataset
+        # Clear any finders when resetting the instance dataset
         def reset_instance_dataset
           Sequel.synchronize{@finders.clear} if @finders && !@finders.frozen?
           super

data/lib/sequel/plugins/forbid_lazy_load.rb

@@ -9,7 +9,7 @@ module Sequel
     # The main reason for doing this is it makes it easier to detect
     # N+1 query issues. Note that Sequel also offers a
     # tactical_eager_loading plugin which will automatically eagerly
-    # load associations for all objects retrived in the same query
+    # load associations for all objects retrieved in the same query
     # if any object would attempt to lazily load an association. That
     # approach may be simpler if you are trying to prevent N+1 issues,
     # though it does retain more objects in memory.
@@ -125,9 +125,9 @@ module Sequel
         # an association, allow lazy loading that association, since the
         # lazy association load will use a hash table lookup and not a query.
         def allow_lazy_load_for_static_cache_associations
-          # :nocov:
+          # simplecov:disable
           if defined?(::Sequel::Plugins::StaticCache::ClassMethods)
-          # :nocov:
+          # simplecov:enable
             @association_reflections.each_value do |ref|
               if ref.associated_class.is_a?(::Sequel::Plugins::StaticCache::ClassMethods)
                 ref[:forbid_lazy_load] = false

data/lib/sequel/plugins/insert_conflict.rb

@@ -19,7 +19,7 @@ module Sequel
     #
     # This example will try to insert the album, but if there is an existing
     # album with the name 'Foo', this will update the copies_sold attribute
-    # for that album.  See the PostgreSQL and SQLite adapter documention for
+    # for that album.  See the PostgreSQL and SQLite adapter documentation for
     # the options you can pass to the insert_conflict method.
     #
     # You should not attempt to use this plugin to ignore conflicts when

data/lib/sequel/plugins/insert_returning_select.rb

@@ -32,7 +32,7 @@ module Sequel
 
         private
 
-        # When reseting the instance dataset, also reset the instance_insert_dataset.
+        # When resetting the instance dataset, also reset the instance_insert_dataset.
         def reset_instance_dataset
           ret = super
           return unless ds = @instance_dataset

data/lib/sequel/plugins/instance_filters.rb

@@ -80,6 +80,14 @@ module Sequel
           instance_filters << [args, block]
         end
       
+        # Clear instance filters when saving changes even if the
+        # object wasn't modified.
+        def save_changes(opts=OPTS)
+          ret = super
+          clear_instance_filters if ret.nil?
+          ret
+        end
+
         private
         
         # If there are any instance filters, make sure not to use the

data/lib/sequel/plugins/instance_hooks.rb

@@ -93,6 +93,25 @@ module Sequel
           super
         end
         
+        # Run and clear save/update/validation hooks when saving changes even if the
+        # object wasn't modified.
+        def save_changes(opts=OPTS)
+          ret = super
+          if ret.nil? && @instance_hooks
+            run_before_instance_hooks(:before_validation)
+            run_before_instance_hooks(:after_validation)
+            run_before_instance_hooks(:before_save)
+            run_before_instance_hooks(:before_update)
+            ret = super
+            run_before_instance_hooks(:after_update)
+            run_before_instance_hooks(:after_save)
+            [:before_validation, :after_validation, :before_save, :before_update, :after_update, :after_save].each do |type|
+              @instance_hooks.delete(type)
+            end
+          end
+          ret
+        end
+
         private
         
         # Add the block as an instance level hook.  For before hooks, add it to

data/lib/sequel/plugins/json_serializer.rb

@@ -128,7 +128,7 @@ module Sequel
       end
       
       # SEQUEL6: Remove
-      # :nocov:
+      # simplecov:disable
       class Literal
         def initialize(json)
           @json = json
@@ -138,7 +138,7 @@ module Sequel
           @json
         end
       end
-      # :nocov:
+      # simplecov:enable
       Sequel::Deprecation.deprecate_constant(self, :Literal)
 
       # Convert the given object to a JSON data structure using the given arguments.
@@ -151,11 +151,11 @@ module Sequel
           else
             begin
               Sequel.parse_json(Sequel.object_to_json(obj, *args, &block))
-            # :nocov:
+            # simplecov:disable
             rescue Sequel.json_parser_error_class
               # Support for old Ruby code that only supports parsing JSON object/array
               Sequel.parse_json(Sequel.object_to_json([obj], *args, &block))[0]
-            # :nocov:
+            # simplecov:enable
             end
           end
         end