sequel 4.43.0 → 4.44.0

data/lib/sequel/model/dataset_module.rb

@@ -39,7 +39,7 @@ module Sequel
       end
 
       meths = (<<-METHS).split.map(&:to_sym)
-        distinct grep group group_and_count group_append 
+        distinct eager grep group group_and_count group_append 
         limit offset order order_append order_prepend 
         select select_all select_append select_group server
       METHS

data/lib/sequel/plugins/active_model.rb

@@ -18,6 +18,9 @@ module Sequel
     #   # Make the Album class active_model compliant
     #   Album.plugin :active_model
     module ActiveModel
+      # The default string to join composite primary keys with in to_param.
+      DEFAULT_TO_PARAM_JOINER = '-'.freeze
+      
       # ActiveModel compliant error class
       class Errors < Sequel::Model::Errors
         # Add autovivification so that #[] always returns an array.
@@ -28,6 +31,14 @@ module Sequel
 
       module ClassMethods
         include ::ActiveModel::Naming
+
+        # Cache model_name and to_partial path value before freezing.
+        def freeze
+          model_name
+          _to_partial_path
+
+          super
+        end
         
         # Class level cache for to_partial_path.
         def _to_partial_path
@@ -36,9 +47,6 @@ module Sequel
       end
 
       module InstanceMethods
-        # The default string to join composite primary keys with in to_param.
-        DEFAULT_TO_PARAM_JOINER = '-'.freeze
-      
         # Record that an object was destroyed, for later use by
         # destroyed?
         def after_destroy

data/lib/sequel/plugins/association_dependencies.rb

@@ -73,6 +73,13 @@ module Sequel
           end
         end
 
+        # Freeze association dependencies when freezing model class.
+        def freeze
+          @association_dependencies.freeze.each_value(&:freeze)
+
+          super
+        end
+
         Plugins.inherited_instance_variables(self, :@association_dependencies=>:hash_dup)
       end
 

data/lib/sequel/plugins/auto_validations.rb

@@ -127,6 +127,16 @@ module Sequel
           @auto_validate_types
         end
 
+        # Freeze auto_validation settings when freezing model class.
+        def freeze
+          @auto_validate_not_null_columns.freeze
+          @auto_validate_explicit_not_null_columns.freeze
+          @auto_validate_max_length_columns.freeze
+          @auto_validate_unique_columns.freeze
+
+          super
+        end
+
         # Skip automatic validations for the given validation type (:not_null, :types, :unique).
         # If :all is given as the type, skip all auto validations.
         def skip_auto_validations(type)

data/lib/sequel/plugins/blacklist_security.rb

@@ -15,12 +15,25 @@ module Sequel
     #   # Make the Album class support the blacklist security features.
     #   Album.plugin :blacklist_security
     module BlacklistSecurity
+      # Special array subclass used for marking methods to be removed.
+      class ExceptionList < Array
+      end
+
       module ClassMethods
         # Which columns are specifically restricted in a call to set/update/new/etc.
         # (default: not set).  Some columns are restricted regardless of
         # this setting, such as the primary key column and columns in Model::RESTRICTED_SETTER_METHODS.
         attr_reader :restricted_columns
   
+        Plugins.inherited_instance_variables(self, :@restricted_columns=>:dup)
+
+        # Freeze restricted columns when freezing model class.
+        def freeze
+          @restricted_columns.freeze
+
+          super
+        end
+
         # Set the columns to restrict when using mass assignment (e.g. +set+).  Using this means that
         # attempts to call setter methods for the columns listed here will cause an
         # exception or be silently skipped (based on the +strict_param_setting+ setting).
@@ -53,10 +66,6 @@ module Sequel
       end
 
       module InstanceMethods
-        # Special array subclass used for marking methods to be removed.
-        class ExceptionList < Array
-        end
-
         # Set all values using the entries in the hash, except for the keys
         # given in except.  You should probably use +set_fields+ or +set_only+
         # instead of this method, as blacklist approaches to security are a bad idea.

data/lib/sequel/plugins/class_table_inheritance.rb

@@ -245,6 +245,17 @@ module Sequel
         # Alias to sti_model_map, for backwards compatibility.
         def cti_model_map; sti_model_map; end
 
+        # Freeze CTI information when freezing model class.
+        def freeze
+          @cti_models.freeze
+          @cti_tables.freeze
+          @cti_instance_dataset.freeze
+          @cti_table_columns.freeze
+          @cti_table_map.freeze
+
+          super
+        end
+
         Plugins.inherited_instance_variables(self, :@cti_models=>nil, :@cti_tables=>nil, :@cti_table_columns=>nil, :@cti_instance_dataset=>nil, :@cti_table_map=>nil)
 
         def inherited(subclass)

data/lib/sequel/plugins/column_conflicts.rb

@@ -60,6 +60,14 @@ module Sequel
           columns.find_all{|c| mod.method_defined?("#{c}=")}.each{|c| set_column_conflict!(c)}
         end
 
+        # Freeze column conflict information when freezing model class.
+        def freeze
+          @get_column_conflicts.freeze
+          @set_column_conflicts.freeze
+
+          super
+        end
+
         # Set the given column as one with a getter method conflict.
         def get_column_conflict!(column)
           @get_column_conflicts[column.to_sym] = @get_column_conflicts[column.to_s] = column.to_sym

data/lib/sequel/plugins/composition.rb

@@ -58,7 +58,10 @@ module Sequel
     module Composition
       # Define the necessary class instance variables.
       def self.apply(model)
-        model.instance_eval{@compositions = {}}
+        model.instance_eval do
+          @compositions = {}
+          include(@composition_module ||= Module.new)
+        end
       end
 
       module ClassMethods
@@ -130,7 +133,6 @@ module Sequel
         
         # Define getter and setter methods for the composition object.
         def define_composition_accessor(name, opts=OPTS)
-          include(@composition_module ||= Module.new) unless composition_module
           composer = opts[:composer]
           composition_module.class_eval do
             define_method(name) do 
@@ -148,6 +150,14 @@ module Sequel
             end
           end
         end
+
+        # Freeze composition information when freezing model class.
+        def freeze
+          compositions.freeze.each_value(&:freeze)
+          composition_module.freeze
+
+          super
+        end
       end
 
       module InstanceMethods

data/lib/sequel/plugins/constraint_validations.rb

@@ -90,6 +90,18 @@ module Sequel
         Plugins.inherited_instance_variables(self, :@constraint_validations_table=>nil, :@constraint_validation_options=>:hash_dup)
         Plugins.after_set_dataset(self, :parse_constraint_validations)
 
+        # Freeze constraint validations data when freezing model class.
+        def freeze
+          @constraint_validations.freeze.each(&:freeze)
+          @constraint_validation_reflections.freeze.each_value do |v|
+            v.freeze
+            v.each(&:freeze)
+          end
+          @constraint_validation_options.freeze.each_value(&:freeze)
+
+          super
+        end
+
         private
 
         # If the database has not already parsed constraint validation

data/lib/sequel/plugins/csv_serializer.rb

@@ -95,6 +95,15 @@ module Sequel
           end
         end
 
+        # Freeze csv serializier opts when freezing model class
+        def freeze
+          @csv_serializer_opts.freeze.each_value do |v|
+            v.freeze if v.is_a?(Array) || v.is_a?(Hash)
+          end
+
+          super
+        end
+
         # Attempt to parse a single instance from the given CSV string
         def from_csv(csv, opts = {})
           new.from_csv(csv, opts)

data/lib/sequel/plugins/defaults_setter.rb

@@ -36,6 +36,12 @@ module Sequel
         
         Plugins.after_set_dataset(self, :set_default_values)
 
+        # Freeze default values when freezing model class
+        def freeze
+          @default_values.freeze
+          super
+        end
+
         private
 
         # Parse the cached database schema for this model and set the default values appropriately.

data/lib/sequel/plugins/force_encoding.rb

@@ -58,15 +58,16 @@ module Sequel
         
         # Force the encoding for all string values in the given row hash.
         def force_hash_encoding(row)
-          fe = model.forced_encoding
-          row.values.each{|v| v.force_encoding(fe) if v.is_a?(String)} if fe
+          if fe = model.forced_encoding
+            row.each_value{|v| v.force_encoding(fe) if v.is_a?(String) && !v.is_a?(Sequel::SQL::Blob)}
+          end
           row
         end
         
         # Force the encoding of all returned strings to the model's forced_encoding.
         def typecast_value(column, value)
           s = super
-          if s.is_a?(String) && (fe = model.forced_encoding)
+          if s.is_a?(String) && !s.is_a?(Sequel::SQL::Blob) && (fe = model.forced_encoding)
             s = s.dup if s.frozen?
             s.force_encoding(fe)
           end

data/lib/sequel/plugins/hook_class_methods.rb

@@ -82,6 +82,12 @@ module Sequel
             class_eval("def #{hook}; model.hook_blocks(:#{hook}){|b| return false if instance_eval(&b) == false}; end", __FILE__, __LINE__)
           end
         end
+
+        # Freeze hooks when freezing model class.
+        def freeze
+          @hooks.freeze.each_value(&:freeze)
+          super
+        end
     
         # Returns true if there are any hook blocks for the given hook.
         def has_hooks?(hook)

data/lib/sequel/plugins/input_transformer.rb

@@ -55,6 +55,15 @@ module Sequel
           @skip_input_transformer_columns[transformer_name] = []
         end
 
+        # Freeze input transformers when freezing model class
+        def freeze
+          @input_transformers.freeze
+          @input_transformer_order.freeze
+          @skip_input_transformer_columns.freeze.each_value(&:freeze)
+
+          super
+        end
+
         # Set columns that the transformer should skip.
         def skip_input_transformer(transformer_name, *columns)
           @skip_input_transformer_columns[transformer_name].concat(columns).uniq!

data/lib/sequel/plugins/insert_returning_select.rb

@@ -30,6 +30,14 @@ module Sequel
         # The dataset to use to insert new rows.  For internal use only.
         attr_reader :instance_insert_dataset
 
+        # Freeze instance insert dataset when freezing model class.
+        def freeze
+          super
+
+          @instance_insert_dataset.freeze if @instance_insert_dataset
+          self
+        end
+
         private
 
         # When reseting the instance dataset, also reset the instance_insert_dataset.

data/lib/sequel/plugins/instance_hooks.rb

@@ -29,10 +29,11 @@ module Sequel
     #   # Add the instance hook methods just to Album instances
     #   Album.plugin :instance_hooks
     module InstanceHooks
+      BEFORE_HOOKS = Sequel::Model::BEFORE_HOOKS
+      AFTER_HOOKS = Sequel::Model::AFTER_HOOKS
+      HOOKS = BEFORE_HOOKS + AFTER_HOOKS
+
       module InstanceMethods 
-        BEFORE_HOOKS = Sequel::Model::BEFORE_HOOKS
-        AFTER_HOOKS = Sequel::Model::AFTER_HOOKS
-        HOOKS = BEFORE_HOOKS + AFTER_HOOKS
         HOOKS.each{|h| class_eval(<<-END , __FILE__, __LINE__+1)}
           def #{h}_hook(&block)
             raise Sequel::Error, "can't add hooks to frozen object" if frozen?

data/lib/sequel/plugins/json_serializer.rb

@@ -152,6 +152,15 @@ module Sequel
         # The default opts to use when serializing model objects to JSON.
         attr_reader :json_serializer_opts
 
+        # Freeze json serializier opts when freezing model class
+        def freeze
+          @json_serializer_opts.freeze.each_value do |v|
+            v.freeze if v.is_a?(Array) || v.is_a?(Hash)
+          end
+
+          super
+        end
+
         # Attempt to parse a single instance from the given JSON string,
         # with options passed to InstanceMethods#from_json_node.
         def from_json(json, opts=OPTS)

data/lib/sequel/plugins/lazy_attributes.rb

@@ -42,6 +42,13 @@ module Sequel
         # be overridden and call super to get the lazy attribute behavior
         attr_accessor :lazy_attributes_module
 
+        # Freeze lazy attributes module when freezing model class.
+        def freeze
+          @lazy_attributes_module.freeze if @lazy_attributes_module
+
+          super
+        end
+
         # Remove the given attributes from the list of columns selected by default.
         # For each attribute given, create an accessor method that allows a lazy
         # lookup of the attribute.  Each attribute should be given as a symbol.

data/lib/sequel/plugins/many_through_many.rb

@@ -81,7 +81,7 @@ module Sequel
     module ManyThroughMany
       # The AssociationReflection subclass for many_through_many associations.
       class ManyThroughManyAssociationReflection < Sequel::Model::Associations::ManyToManyAssociationReflection
-        Sequel::Model::Associations::ASSOCIATION_TYPES[:many_through_many] = self
+        Sequel.synchronize{Sequel::Model::Associations::ASSOCIATION_TYPES[:many_through_many] = self}
 
         # many_through_many and one_through_many associations can be clones
         def cloneable?(ref)
@@ -102,6 +102,17 @@ module Sequel
           END
         end
 
+        FINALIZE_SETTINGS = superclass::FINALIZE_SETTINGS.merge(
+          :associated_key_table=>:associated_key_table,
+          :edges=>:edges,
+          :final_edge=>:final_edge,
+          :final_reverse_edge=>:final_reverse_edge,
+          :reverse_edges=>:reverse_edges
+        ).freeze
+        def finalize_settings
+          FINALIZE_SETTINGS
+        end
+
         # The alias for the first join table.
         def join_table_alias
           final_reverse_edge[:alias]
@@ -181,7 +192,7 @@ module Sequel
       end
 
       class OneThroughManyAssociationReflection < ManyThroughManyAssociationReflection
-        Sequel::Model::Associations::ASSOCIATION_TYPES[:one_through_many] = self
+        Sequel.synchronize{Sequel::Model::Associations::ASSOCIATION_TYPES[:one_through_many] = self}
         include Sequel::Model::Associations::SingularAssociationReflection
       end
 

data/lib/sequel/plugins/nested_attributes.rb

@@ -85,6 +85,13 @@ module Sequel
         # call be overridden and call super to get the default behavior
         attr_accessor :nested_attributes_module
         
+        # Freeze nested_attributes_module when freezing model class.
+        def freeze
+          @nested_attributes_module.freeze if @nested_attributes_module
+
+          super
+        end
+
         # Allow nested attributes to be set for the given associations.  Options:
         # :destroy :: Allow destruction of nested records.
         # :fields :: If provided, should be an Array or proc. If it is an array,

data/lib/sequel/plugins/pg_array_associations.rb

@@ -75,7 +75,7 @@ module Sequel
     module PgArrayAssociations
       # The AssociationReflection subclass for many_to_pg_array associations.
       class ManyToPgArrayAssociationReflection < Sequel::Model::Associations::AssociationReflection
-        Sequel::Model::Associations::ASSOCIATION_TYPES[:many_to_pg_array] = self
+        Sequel.synchronize{Sequel::Model::Associations::ASSOCIATION_TYPES[:many_to_pg_array] = self}
 
         def array_type
           cached_fetch(:array_type) do
@@ -122,6 +122,13 @@ module Sequel
           nil
         end
 
+        FINALIZE_SETTINGS = superclass::FINALIZE_SETTINGS.merge(
+          :array_type=>:array_type
+        ).freeze
+        def finalize_settings
+          FINALIZE_SETTINGS
+        end
+
         # Handle silent failure of add/remove methods if raise_on_save_failure is false.
         def handle_silent_modification_failure?
           self[:raise_on_save_failure] == false
@@ -177,7 +184,7 @@ module Sequel
 
       # The AssociationReflection subclass for pg_array_to_many associations.
       class PgArrayToManyAssociationReflection < Sequel::Model::Associations::AssociationReflection
-        Sequel::Model::Associations::ASSOCIATION_TYPES[:pg_array_to_many] = self
+        Sequel.synchronize{Sequel::Model::Associations::ASSOCIATION_TYPES[:pg_array_to_many] = self}
 
         def array_type
           cached_fetch(:array_type) do
@@ -229,6 +236,15 @@ module Sequel
           nil
         end
 
+        FINALIZE_SETTINGS = superclass::FINALIZE_SETTINGS.merge(
+          :array_type=>:array_type,
+          :primary_key=>:primary_key,
+          :primary_key_method=>:primary_key_method
+        ).freeze
+        def finalize_settings
+          FINALIZE_SETTINGS
+        end
+
         # Handle silent failure of add/remove methods if raise_on_save_failure is false
         # and save_after_modify is true.
         def handle_silent_modification_failure?

data/lib/sequel/plugins/pg_row.rb

@@ -52,6 +52,9 @@ module Sequel
     #   DB[:company].insert(:name=>'MS', :address=>
     #     Address.load(:street=>'123 Foo St', :city=>'Bar Town', :zip=>'12345'))
     module PgRow
+      ROW = 'ROW'.freeze
+      CAST = '::'.freeze
+
       # When loading the extension, make sure the database has the pg_row extension
       # loaded, load the custom database extensions, and automatically register the
       # row type if the model has a dataset.
@@ -70,9 +73,6 @@ module Sequel
       end
 
       module InstanceMethods
-        ROW = 'ROW'.freeze
-        CAST = '::'.freeze
-
         # Literalize the model instance and append it to the sql.
         def sql_literal_append(ds, sql)
           sql << ROW