sequel 3.46.0 → 3.47.0

data/lib/sequel/extensions/pg_hstore.rb

@@ -76,7 +76,7 @@
 #   DB.extension :pg_hstore
 #
 # If you are not using the native postgres adapter, you probably
-# also want to use the typecast_on_load plugin in the model, and
+# also want to use the pg_typecast_on_load plugin in the model, and
 # set it to typecast the hstore column(s) on load.
 #
 # This extension requires the delegate and strscan libraries.
@@ -136,6 +136,13 @@ module Sequel
       end
 
       module DatabaseMethods
+        def self.extended(db)
+          db.instance_eval do
+            add_named_conversion_procs(conversion_procs, :hstore=>PG_NAMED_TYPES[:hstore])
+            @schema_type_classes[:hstore] = HStore
+          end
+        end
+
         # Handle hstores in bound variables
         def bound_variable_arg(arg, conn)
           case arg

data/lib/sequel/extensions/pg_hstore_ops.rb

@@ -29,7 +29,7 @@
 # This creates a Sequel::Postgres::HStoreOp object that can be used
 # for easier querying:
 #
-#   h - 'a'    # hstore_column - 'a'
+#   h - 'a'    # hstore_column - CAST('a' AS text)
 #   h['a']     # hstore_column -> 'a'
 #
 #   h.concat(:other_hstore_column)       # ||
@@ -82,6 +82,9 @@ module Sequel
       #
       #   hstore_op - 'a' # (hstore - 'a')
       def -(other)
+        if other.is_a?(String) && !other.is_a?(Sequel::LiteralString)
+          other = Sequel.cast_string(other)
+        end
         HStoreOp.new(super)
       end
 

data/lib/sequel/extensions/pg_inet.rb

@@ -11,7 +11,7 @@
 #   DB.extension :pg_inet
 #
 # If you are not using the native postgres adapter, you probably
-# also want to use the typecast_on_load plugin in the model, and
+# also want to use the pg_typecast_on_load plugin in the model, and
 # set it to typecast the inet/cidr column(s) on load.
 #
 # This extension integrates with the pg_array extension.  If you plan
@@ -33,12 +33,15 @@ module Sequel
   module Postgres
     # Methods enabling Database object integration with the inet/cidr types.
     module InetDatabaseMethods
-
       # Reset the conversion procs when extending the Database object, so
       # it will pick up the inet/cidr converter.  Also, extend the datasets
       # with support for literalizing the IPAddr types.
       def self.extended(db)
-        db.extend_datasets(InetDatasetMethods)
+        db.instance_eval do
+          extend_datasets(InetDatasetMethods)
+          copy_conversion_procs([869, 650, 1041, 651, 1040])
+          @schema_type_classes[:ipaddr] = IPAddr
+        end
       end
 
       # Convert an IPAddr arg to a string.  Probably not necessary, but done
@@ -52,16 +55,6 @@ module Sequel
         end
       end
 
-      # Make the column type detection recognize the inet and cidr types.
-      def schema_column_type(db_type)
-        case db_type
-        when 'inet', 'cidr'
-          :ipaddr
-        else
-          super
-        end
-      end
-
       private
 
       # Handle inet[]/cidr[] types in bound variables.
@@ -74,6 +67,16 @@ module Sequel
         end
       end
 
+      # Make the column type detection recognize the inet and cidr types.
+      def schema_column_type(db_type)
+        case db_type
+        when 'inet', 'cidr'
+          :ipaddr
+        else
+          super
+        end
+      end
+
       # Typecast the given value to an IPAddr object.
       def typecast_value_ipaddr(value)
         case value

data/lib/sequel/extensions/pg_interval.rb

@@ -16,7 +16,7 @@
 #   DB.extension :pg_interval
 #
 # If you are not using the native postgres adapter, you probably
-# also want to use the typecast_on_load plugin in the model, and
+# also want to use the pg_typecast_on_load plugin in the model, and
 # set it to typecast the interval type column(s) on load.
 #
 # This extension integrates with the pg_array extension.  If you plan
@@ -119,7 +119,11 @@ module Sequel
       # Reset the conversion procs if using the native postgres adapter,
       # and extend the datasets to correctly literalize ActiveSupport::Duration values.
       def self.extended(db)
-        db.extend_datasets(IntervalDatasetMethods)
+        db.instance_eval do
+          extend_datasets(IntervalDatasetMethods)
+          copy_conversion_procs([1186, 1187])
+          @schema_type_classes[:interval] = ActiveSupport::Duration
+        end
       end
 
       # Handle ActiveSupport::Duration values in bound variables.

data/lib/sequel/extensions/pg_json.rb

@@ -43,7 +43,7 @@
 #   DB.extension :pg_json
 #
 # If you are not using the native postgres adapter, you probably
-# also want to use the typecast_on_load plugin in the model, and
+# also want to use the pg_typecast_on_load plugin in the model, and
 # set it to typecast the json column(s) on load.
 #
 # This extension integrates with the pg_array extension.  If you plan
@@ -93,6 +93,13 @@ module Sequel
 
     # Methods enabling Database object integration with the json type.
     module JSONDatabaseMethods
+      def self.extended(db)
+        db.instance_eval do
+          copy_conversion_procs([114, 199])
+          @schema_type_classes[:json] = [JSONHash, JSONArray]
+        end
+      end
+
       # Parse the given string as json, returning either a JSONArray
       # or JSONHash instance, and raising an error if the JSON
       # parsing does not yield an array or hash.
@@ -123,16 +130,6 @@ module Sequel
         end
       end
 
-      # Make the column type detection recognize the json type.
-      def schema_column_type(db_type)
-        case db_type
-        when 'json'
-          :json
-        else
-          super
-        end
-      end
-
       private
 
       # Handle json[] types in bound variables.
@@ -145,6 +142,16 @@ module Sequel
         end
       end
 
+      # Make the column type detection recognize the json type.
+      def schema_column_type(db_type)
+        case db_type
+        when 'json'
+          :json
+        else
+          super
+        end
+      end
+
       # Given a value to typecast to the json column
       # * If given a JSONArray or JSONHash, just return the value
       # * If given an Array, return a JSONArray

data/lib/sequel/extensions/pg_range.rb

@@ -46,7 +46,7 @@
 #   DB.extension :pg_range
 #
 # If you are not using the native postgres adapter, you probably
-# also want to use the typecast_on_load plugin in the model, and
+# also want to use the pg_typecast_on_load plugin in the model, and
 # set it to typecast the range type column(s) on load.
 #
 # This extension integrates with the pg_array extension.  If you plan
@@ -185,7 +185,22 @@ module Sequel
         # Reset the conversion procs if using the native postgres adapter,
         # and extend the datasets to correctly literalize ruby Range values.
         def self.extended(db)
-          db.extend_datasets(DatasetMethods)
+          db.instance_eval do
+            extend_datasets(DatasetMethods)
+            copy_conversion_procs([3904, 3906, 3912, 3926, 3905, 3907, 3913, 3927])
+            [:int4range, :numrange, :tsrange, :tstzrange, :daterange, :int8range].each do |v|
+              @schema_type_classes[v] = PGRange
+            end
+          end
+
+          procs = db.conversion_procs
+          procs[3908] = Parser.new("tsrange", procs[1114])
+          procs[3910] = Parser.new("tstzrange", procs[1184])
+          if defined?(PGArray::Creator)
+            procs[3909] = PGArray::Creator.new("tsrange", procs[3908])
+            procs[3911] = PGArray::Creator.new("tstzrange", procs[3910])
+          end
+
         end
 
         # Define a private range typecasting method for the given type that uses

data/lib/sequel/extensions/pg_range_ops.rb

@@ -29,12 +29,12 @@
 # for easier querying:
 #
 #   r.contains(:other)      # range @> other
-#   r.contained_by(:other)  # range <@ other 
+#   r.contained_by(:other)  # range <@ other
 #   r.overlaps(:other)      # range && other
 #   r.left_of(:other)       # range << other
 #   r.right_of(:other)      # range >> other
-#   r.starts_before(:other) # range &< other
-#   r.ends_after(:other)    # range &> other
+#   r.starts_after(:other)  # range &> other
+#   r.ends_before(:other)   # range &< other
 #   r.adjacent_to(:other)   # range -|- other
 #
 #   r.lower            # lower(range)
@@ -66,8 +66,8 @@ module Sequel
         :contained_by => ["(".freeze, " <@ ".freeze, ")".freeze].freeze,
         :left_of => ["(".freeze, " << ".freeze, ")".freeze].freeze,
         :right_of => ["(".freeze, " >> ".freeze, ")".freeze].freeze,
-        :starts_before => ["(".freeze, " &< ".freeze, ")".freeze].freeze,
-        :ends_after => ["(".freeze, " &> ".freeze, ")".freeze].freeze,
+        :ends_before => ["(".freeze, " &< ".freeze, ")".freeze].freeze,
+        :starts_after => ["(".freeze, " &> ".freeze, ")".freeze].freeze,
         :adjacent_to => ["(".freeze, " -|- ".freeze, ")".freeze].freeze,
         :overlaps => ["(".freeze, " && ".freeze, ")".freeze].freeze,
       }
@@ -79,6 +79,8 @@ module Sequel
       OPERATORS.keys.each do |f|
         class_eval("def #{f}(v); operator(:#{f}, v) end", __FILE__, __LINE__)
       end
+      alias starts_before ends_before
+      alias ends_after starts_after
 
       # These operators are already supported by the wrapper, but for ranges they
       # return ranges, so wrap the results in another RangeOp.

data/lib/sequel/extensions/pg_row.rb

@@ -66,6 +66,18 @@
 #
 #   DB[:table].insert(:address=>DB.row_type(:address, :street=>'123 Sesame St.', :city=>'Some City', :zip=>'12345'))
 #
+# Note that registering row types without providing an explicit :converter option
+# creates anonymous classes.  This results in ruby being unable to Marshal such
+# objects.  You can work around this by assigning the anonymous class to a constant.
+# To get a list of such anonymous classes, you can use the following code:
+#
+#   DB.conversion_procs.select{|k,v| v.is_a?(Sequel::Postgres::PGRow::Parser) && \
+#     v.converter && (v.converter.name.nil? || v.converter.name == '') }.map{|k,v| v}
+# 
+# If you are not using the native postgres adapter, you probably
+# also want to use the pg_typecast_on_load plugin in the model, and
+# set it to typecast the composite type column(s) on load.
+#
 # This extension requires both the strscan and delegate libraries.
 
 require 'delegate'
@@ -98,7 +110,7 @@ module Sequel
         # This is done so that instances of this subclass are
         # automatically casted to the database type when literalizing.
         def self.subclass(db_type)
-          sc = Class.new(self) do
+          Class.new(self) do
             @db_type = db_type
           end
         end
@@ -146,7 +158,7 @@ module Sequel
         # Create a new subclass of this class with the given database
         # type and columns.
         def self.subclass(db_type, columns)
-          sc = Class.new(self) do
+          Class.new(self) do
             @db_type = db_type
             @columns = columns
           end
@@ -196,6 +208,8 @@ module Sequel
         end
       end
 
+      ROW_TYPE_CLASSES = [HashRow, ArrayRow]
+
       # This parser-like class splits the PostgreSQL
       # row-valued/composite type output string format
       # into an array of strings.  Note this class makes
@@ -377,6 +391,7 @@ module Sequel
             @row_types = {}
             @row_schema_types = {}
             extend(@row_type_method_module = Module.new)
+            copy_conversion_procs([2249, 2287])
           end
         end
 
@@ -431,11 +446,12 @@ module Sequel
 
           # Get column names and oids for each of the members of the composite type.
           res = from(:pg_attribute).
+            join(:pg_type, :oid=>:atttypid).
             where(:attrelid=>rel_oid).
             where{attnum > 0}.
             exclude(:attisdropped).
             order(:attnum).
-            select_map([:attname, :atttypid])
+            select_map([:attname, Sequel.case({0=>:atttypid}, :pg_type__typbasetype, :pg_type__typbasetype).as(:atttypid)])
           if res.empty?
             raise Error, "no columns for row type #{db_type.inspect} in database"
           end
@@ -471,6 +487,7 @@ module Sequel
 
           @row_types[db_type] = opts.merge(:parser=>parser)
           @row_schema_types[schema_type_string] = schema_type_symbol 
+          @schema_type_classes[schema_type_symbol] = ROW_TYPE_CLASSES
           @row_type_method_module.class_eval do
             meth = :"typecast_value_#{schema_type_symbol}"
             define_method(meth) do |v|
@@ -523,15 +540,6 @@ module Sequel
           end
         end
 
-        # Make the column type detection handle registered row types.
-        def schema_column_type(db_type)
-          if type = @row_schema_types[db_type]
-            type
-          else
-            super
-          end
-        end
-
         private
 
         # Format composite types used in bound variable arrays.
@@ -546,6 +554,15 @@ module Sequel
             super
           end
         end
+
+        # Make the column type detection handle registered row types.
+        def schema_column_type(db_type)
+          if type = @row_schema_types[db_type]
+            type
+          else
+            super
+          end
+        end
       end
     end
 

data/lib/sequel/extensions/pretty_table.rb

@@ -24,4 +24,7 @@ module Sequel
       Sequel::PrettyTable.print(rows, cols.empty? ? ds.columns : cols)
     end
   end
+
+  Database.register_extension(:pretty_table){}
+  Dataset.register_extension(:pretty_table){}
 end

data/lib/sequel/extensions/query.rb

@@ -51,4 +51,7 @@ module Sequel
       end
     end
   end
+
+  Dataset.register_extension(:query){}
+  Database.register_extension(:query){}
 end

data/lib/sequel/extensions/schema_caching.rb

@@ -73,4 +73,6 @@ module Sequel
       load_schema_cache(file) if File.exist?(file)
     end
   end
+
+  Database.register_extension(:schema_caching){}
 end

data/lib/sequel/extensions/schema_dumper.rb

@@ -149,7 +149,7 @@ END_MIG
     # be :type.  The other options added should modify that type (e.g. :size).  If a
     # database type is not recognized, return it as a String type.
     def column_schema_to_ruby_type(schema)
-      case t = schema[:db_type].downcase
+      case schema[:db_type].downcase
       when /\A(medium|small)?int(?:eger)?(?:\((\d+)\))?( unsigned)?\z/o
         if !$1 && $2 && $2.to_i >= 10 && $3
           # Unsigned integer type with 10 digits can potentially contain values which
@@ -483,4 +483,6 @@ END_MIG
       end
     end
   end
+
+  Database.register_extension(:schema_dumper){}
 end

data/lib/sequel/extensions/select_remove.rb

@@ -36,4 +36,7 @@ module Sequel
       end
     end
   end
+
+  Database.register_extension(:select_remove){}
+  Dataset.register_extension(:select_remove){}
 end

data/lib/sequel/model.rb

@@ -72,7 +72,7 @@ module Sequel
 
     # Class methods added to model that call the method of the same name on the dataset
     DATASET_METHODS = (Dataset::ACTION_METHODS + Dataset::QUERY_METHODS +
-      [:each_page, :each_server, :print]) - [:and, :or, :[], :[]=, :columns, :columns!]
+      [:each_page, :each_server, :print, :destroy, :with_pk, :with_pk!]) - [:and, :or, :[], :[]=, :columns, :columns!]
     
     # Class instance variables to set to nil when a subclass is created, for -w compliance
     EMPTY_INSTANCE_VARIABLES = [:@overridable_methods_module, :@db]
@@ -114,7 +114,8 @@ module Sequel
       :@typecast_empty_string_to_nil=>nil, :@typecast_on_assignment=>nil,
       :@raise_on_typecast_failure=>nil, :@plugins=>:dup, :@setter_methods=>nil,
       :@use_after_commit_rollback=>nil, :@fast_pk_lookup_sql=>nil,
-      :@fast_instance_delete_sql=>nil}
+      :@fast_instance_delete_sql=>nil, :@default_eager_limit_strategy=>nil,
+      :@db=>nil, :@default_set_fields_options=>:dup}
 
     # Regular expression that determines if a method name is normal in the sense that
     # it could be used literally in ruby code without using send.  Used to
@@ -128,8 +129,13 @@ module Sequel
     @allowed_columns = nil
     @db = nil
     @db_schema = nil
+    @dataset = nil
     @dataset_method_modules = []
+    @default_eager_limit_strategy = nil
+    @default_set_fields_options = {}
     @overridable_methods_module = nil
+    @fast_pk_lookup_sql = nil
+    @fast_instance_delete_sql = nil
     @plugins = []
     @primary_key = :id
     @raise_on_save_failure = true

data/lib/sequel/model/associations.rb

@@ -663,10 +663,8 @@ module Sequel
       #                       milestones, allowing for further filtering/limiting/etc.
       #
       # If you want to override the behavior of the add_/remove_/remove_all_/ methods
-      # or the association setter method, there are private instance methods created that are prepended
-      # with an underscore (e.g. _add_milestone or _portfolio=).  The private instance methods can be
-      # easily overridden, but you shouldn't override the public instance methods without
-      # calling super, as they deal with callbacks and caching.
+      # or the association setter method, use the :adder, :remover, :clearer, and/or :setter
+      # options.  These options override the default behavior.
       #
       # By default the classes for the associations are inferred from the association
       # name, so for example the Project#portfolio will return an instance of 
@@ -739,7 +737,9 @@ module Sequel
         #                  model object can be associated with many current model objects.
         #
         # The following options can be supplied:
-        # === All Types
+        # === 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).
         # :after_add :: Symbol, Proc, or array of both/either specifying a callback to call
         #               after a new item is added to the association.
         # :after_load :: Symbol, Proc, or array of both/either specifying a callback to call
@@ -764,6 +764,8 @@ module Sequel
         #           given, uses the association's name, which is camelized (and
         #           singularized unless the type is :many_to_one or :one_to_one).  If this is specified
         #           as a string or symbol, you must specify the full class name (e.g. "SomeModule::MyModel"). 
+        # :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).
         # :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
         #           all share the same options such as :class and :key, while changing the order and block used.
@@ -837,12 +839,16 @@ module Sequel
         #                if it exists.  By default, Sequel will try to determine it by looking at the
         #                associated model's assocations 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).
         # :select :: the columns to select.  Defaults to the associated class's
         #            table_name.* in a many_to_many association, which means it doesn't include the attributes from the
         #            join table.  If you want to include the join table attributes, you can
         #            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
+        #            between the given object and the current object (*_to_one associations).
         # :validate :: Set to false to not validate when implicitly saving any associated object.
         # === :many_to_one
         # :key :: foreign key in current model's table that references
@@ -990,13 +996,6 @@ module Sequel
           ds
         end
 
-        # Copy the association reflections to the subclass
-        def inherited(subclass)
-          super
-          subclass.instance_variable_set(:@association_reflections, association_reflections.dup)
-          subclass.default_eager_limit_strategy =  default_eager_limit_strategy
-        end
-      
         # Shortcut for adding a many_to_many association, see #associate
         def many_to_many(name, opts={}, &block)
           associate(:many_to_many, name, opts, &block)
@@ -1016,6 +1015,9 @@ module Sequel
         def one_to_one(name, opts={}, &block)
           associate(:one_to_one, name, opts, &block)
         end
+
+        Plugins.inherited_instance_variables(self, :@association_reflections=>:dup, :@default_eager_limit_strategy=>nil)
+        Plugins.def_dataset_methods(self, [:eager, :eager_graph])
         
         private
       
@@ -1034,7 +1036,7 @@ module Sequel
             oproc = lambda do |x|
               case x
               when Symbol
-                t, c, a = ds.send(:split_symbol, x)
+                t, c, _ = ds.send(:split_symbol, x)
                 if t && t.to_sym == table
                   SQL::QualifiedIdentifier.new(dsa, c)
                 else
@@ -1140,7 +1142,7 @@ module Sequel
             raise(Error, "mismatched number of right keys: #{rcks.inspect} vs #{rcpks.inspect}") unless rcks.length == rcpks.length
           end
           uses_lcks = opts[:uses_left_composite_keys] = lcks.length > 1
-          uses_rcks = opts[:uses_right_composite_keys] = rcks.length > 1
+          opts[:uses_right_composite_keys] = rcks.length > 1
           opts[:cartesian_product_number] ||= 1
           join_table = (opts[:join_table] ||= opts.default_join_table)
           left_key_alias = opts[:left_key_alias] ||= opts.default_associated_key_alias
@@ -1203,18 +1205,23 @@ module Sequel
       
           return if opts[:read_only]
       
-          association_module_private_def(opts._add_method, opts) do |o|
+          adder = opts[:adder] || proc do |o|
             h = {}
             lcks.zip(lcpks).each{|k, pk| h[k] = send(pk)}
             rcks.zip(opts.right_primary_key_methods).each{|k, pk| h[k] = o.send(pk)}
             _join_table_dataset(opts).insert(h)
           end
-          association_module_private_def(opts._remove_method, opts) do |o|
+          association_module_private_def(opts._add_method, opts, &adder) 
+
+          remover = opts[:remover] || proc do |o|
             _join_table_dataset(opts).where(lcks.zip(lcpks.map{|k| send(k)}) + rcks.zip(opts.right_primary_key_methods.map{|k| o.send(k)})).delete
           end
-          association_module_private_def(opts._remove_all_method, opts) do
+          association_module_private_def(opts._remove_method, opts, &remover)
+
+          clearer = opts[:clearer] || proc do
             _join_table_dataset(opts).where(lcks.zip(lcpks.map{|k| send(k)})).delete
           end
+          association_module_private_def(opts._remove_all_method, opts, &clearer)
       
           def_add_method(opts)
           def_remove_methods(opts)
@@ -1236,7 +1243,6 @@ module Sequel
             raise(Error, "mismatched number of keys: #{cks.inspect} vs #{cpks.inspect}") unless cks.length == cpks.length
           end
           uses_cks = opts[:uses_composite_keys] = cks.length > 1
-          qualify = opts[:qualify] != false
           opts[:cartesian_product_number] ||= 0
           opts[:dataset] ||= proc do
             opts.associated_dataset.where(opts.predicate_keys.zip(cks.map{|k| send(k)}))
@@ -1274,7 +1280,8 @@ module Sequel
           
           return if opts[:read_only]
       
-          association_module_private_def(opts._setter_method, opts){|o| cks.zip(opts.primary_key_methods).each{|k, pk| send(:"#{k}=", (o.send(pk) if o))}}
+          setter = opts[:setter] || proc{|o| cks.zip(opts.primary_key_methods).each{|k, pk| send(:"#{k}=", (o.send(pk) if o))}}
+          association_module_private_def(opts._setter_method, opts, &setter)
           association_module_def(opts.setter_method, opts){|o| set_associated_object(opts, o)}
         end
         
@@ -1369,7 +1376,7 @@ module Sequel
             validate = opts[:validate]
 
             if one_to_one
-              association_module_private_def(opts._setter_method, opts) do |o|
+              setter = opts[:setter] || proc do |o|
                 up_ds = _apply_association_options(opts, opts.associated_dataset.where(cks.zip(cpks.map{|k| send(k)})))
                 if o
                   up_ds = up_ds.exclude(o.pk_hash) unless o.new?
@@ -1380,21 +1387,27 @@ module Sequel
                   o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save") if o
                 end
               end
+              association_module_private_def(opts._setter_method, opts, &setter)
               association_module_def(opts.setter_method, opts){|o| set_one_to_one_associated_object(opts, o)}
             else 
-              association_module_private_def(opts._add_method, opts) do |o|
+              adder = opts[:adder] || proc do |o|
                 cks.zip(cpks).each{|k, pk| o.send(:"#{k}=", send(pk))}
                 o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
               end
-              def_add_method(opts)
+              association_module_private_def(opts._add_method, opts, &adder)
       
-              association_module_private_def(opts._remove_method, opts) do |o|
+              remover = opts[:remover] || proc do |o|
                 cks.each{|k| o.send(:"#{k}=", nil)}
                 o.save(:validate=>validate) || raise(Sequel::Error, "invalid associated object, cannot save")
               end
-              association_module_private_def(opts._remove_all_method, opts) do
+              association_module_private_def(opts._remove_method, opts, &remover)
+
+              clearer = opts[:clearer] || proc do
                 _apply_association_options(opts, opts.associated_dataset.where(cks.zip(cpks.map{|k| send(k)}))).update(ck_nil_hash)
               end
+              association_module_private_def(opts._remove_all_method, opts, &clearer)
+
+              def_add_method(opts)
               def_remove_methods(opts)
             end
           end
@@ -1511,8 +1524,8 @@ module Sequel
             else
               _load_associated_object(opts, dynamic_opts)
             end
-          else
-            [] if opts.returns_array?
+          elsif opts.returns_array?
+            []
           end
         end
         
@@ -1911,7 +1924,6 @@ module Sequel
           else
             alias_base = r[:graph_alias_base]
           end
-          assoc_name = r[:name]
           assoc_table_alias = ds.unused_table_alias(alias_base)
           loader = r[:eager_grapher]
           if !associations.empty?