sequel 5.38.0 → 5.43.0

data/lib/sequel/plugins/composition.rb

@@ -143,10 +143,14 @@ module Sequel
                 compositions[name] = send(composer_meth)
               end
             end
-            define_method("#{name}=") do |v|
+            alias_method(name, name)
+
+            meth = :"#{name}="
+            define_method(meth) do |v|
               modified!
               compositions[name] = v
             end
+            alias_method(meth, meth)
           end
         end
 
@@ -167,8 +171,9 @@ module Sequel
 
         # Freeze compositions hash when freezing model instance.
         def freeze
-          compositions.freeze
+          compositions
           super
+          compositions.freeze
         end
 
         # For each composition, set the columns in the model class based

data/lib/sequel/plugins/constraint_validations.rb

@@ -220,7 +220,8 @@ module Sequel
               '%'
             when '%'
               '.*'
-            when '_'
+            else
+            #when '_'
               '.'
             end
           end

data/lib/sequel/plugins/dataset_associations.rb

@@ -62,7 +62,10 @@ module Sequel
           ret = super
           r = association_reflection(name)
           meth = r.returns_array? ? name : pluralize(name).to_sym
-          dataset_module{define_method(meth){associated(name)}}
+          dataset_module do
+            define_method(meth){associated(name)}
+            alias_method(meth, meth)
+          end
           ret
         end
 

data/lib/sequel/plugins/json_serializer.rb

@@ -133,21 +133,39 @@ module Sequel
         end
       end
       
-      # Helper class used for making sure that cascading options
-      # for model associations works correctly.  Cascaded options
-      # work by creating instances of this class, which take a
-      # literal JSON string and have +to_json+ return it.
+      # SEQUEL6: Remove
+      # :nocov:
       class Literal
-        # Store the literal JSON to use
         def initialize(json)
           @json = json
         end
         
-        # Return the literal JSON to use
         def to_json(*a)
           @json
         end
       end
+      # :nocov:
+      Sequel::Deprecation.deprecate_constant(self, :Literal)
+
+      # Convert the given object to a JSON data structure using the given arguments.
+      def self.object_to_json_data(obj, *args, &block)
+        if obj.is_a?(Array)
+          obj.map{|x| object_to_json_data(x, *args, &block)}
+        else
+          if obj.respond_to?(:to_json_data)
+            obj.to_json_data(*args, &block)
+          else
+            begin
+              Sequel.parse_json(Sequel.object_to_json(obj, *args, &block))
+            # :nocov:
+            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:
+            end
+          end
+        end
+      end
 
       module ClassMethods
         # The default opts to use when serializing model objects to JSON.
@@ -324,20 +342,7 @@ module Sequel
                 end
 
                 v = v.empty? ? [] : [v]
-
-                objs = public_send(k)
-
-                is_array = if r = model.association_reflection(k)
-                  r.returns_array?
-                else
-                  objs.is_a?(Array)
-                end
-                
-                h[key_name] = if is_array
-                  objs.map{|obj| Literal.new(Sequel.object_to_json(obj, *v))}
-                else
-                  Literal.new(Sequel.object_to_json(objs, *v))
-                end
+                h[key_name] = JsonSerializer.object_to_json_data(public_send(k), *v)
               end
             else
               Array(inc).each do |c|
@@ -347,7 +352,8 @@ module Sequel
                 else
                   key_name = c.to_s
                 end
-                h[key_name] = public_send(c)
+
+                h[key_name] = JsonSerializer.object_to_json_data(public_send(c))
               end
             end
           end
@@ -362,6 +368,15 @@ module Sequel
           h = yield h if block_given?
           Sequel.object_to_json(h, *a)
         end
+
+        # Convert the receiver to a JSON data structure using the given arguments.
+        def to_json_data(*args, &block)
+          if block
+            to_json(*args){|x| return block.call(x)}
+          else
+            to_json(*args){|x| return x}
+          end
+        end
       end
 
       module DatasetMethods
@@ -420,7 +435,7 @@ module Sequel
             else
               all
             end
-            array.map{|obj| Literal.new(Sequel.object_to_json(obj, opts, &opts[:instance_block]))}
+            JsonSerializer.object_to_json_data(array, opts, &opts[:instance_block])
           else
             all
           end

data/lib/sequel/plugins/nested_attributes.rb

@@ -108,9 +108,10 @@ module Sequel
         #            array of the allowable fields.
         # :limit :: For *_to_many associations, a limit on the number of records
         #           that will be processed, to prevent denial of service attacks.
-        # :reject_if :: A proc that is given each attribute hash before it is
+        # :reject_if :: A proc that is called with each attribute hash before it is
         #               passed to its associated object. If the proc returns a truthy
         #               value, the attribute hash is ignored.
+        # :reject_nil :: Ignore nil objects passed to nested attributes setter methods.
         # :remove :: Allow disassociation of nested records (can remove the associated
         #            object from the parent object, but not destroy the associated object).
         # :require_modification :: Whether to require modification of nested objects when
@@ -145,9 +146,12 @@ module Sequel
         # class.
         def def_nested_attribute_method(reflection)
           @nested_attributes_module.class_eval do
-            define_method("#{reflection[:name]}_attributes=") do |v|
-              set_nested_attributes(reflection[:name], v)
+            meth = :"#{reflection[:name]}_attributes="
+            assoc = reflection[:name]
+            define_method(meth) do |v|
+              set_nested_attributes(assoc, v)
             end
+            alias_method meth, meth
           end
         end
       end
@@ -159,6 +163,7 @@ module Sequel
         def set_nested_attributes(assoc, obj, opts=OPTS)
           raise(Error, "no association named #{assoc} for #{model.inspect}") unless ref = model.association_reflection(assoc)
           raise(Error, "nested attributes are not enabled for association #{assoc} for #{model.inspect}") unless meta = ref[:nested_attributes]
+          return if obj.nil? && meta[:reject_nil]
           meta = meta.merge(opts)
           meta[:reflection] = ref
           if ref.returns_array?

data/lib/sequel/plugins/pg_array_associations.rb

@@ -520,7 +520,9 @@ module Sequel
         def many_to_pg_array_association_filter_expression(op, ref, obj)
           pk = ref.qualify(model.table_name, ref.primary_key)
           key = ref[:key]
+          # :nocov:
           expr = case obj
+          # :nocov:
           when Sequel::Model
             if (assoc_pks = obj.get_column_value(key)) && !assoc_pks.empty?
               Sequel[pk=>assoc_pks.to_a]
@@ -540,7 +542,9 @@ module Sequel
         # Support filtering by pg_array_to_many associations using a subquery.
         def pg_array_to_many_association_filter_expression(op, ref, obj)
           key = ref.qualify(model.table_name, ref[:key_column])
+          # :nocov:
           expr = case obj
+          # :nocov:
           when Sequel::Model
             if pkv = obj.get_column_value(ref.primary_key_method)
               Sequel.pg_array_op(key).contains(Sequel.pg_array([pkv], ref.array_type))

data/lib/sequel/plugins/pg_auto_constraint_validations.rb

@@ -250,7 +250,9 @@ module Sequel
             messages = model.pg_auto_constraint_validations_messages
 
             unless override
+              # :nocov:
               case e
+              # :nocov:
               when Sequel::NotNullConstraintViolation
                 if column = info[:column]
                   add_pg_constraint_validation_error([m.call(column)], messages[:not_null])

data/lib/sequel/plugins/serialization.rb

@@ -127,7 +127,7 @@ module Sequel
         def serialize_attributes(format, *columns)
           if format.is_a?(Symbol)
             unless format = Sequel.synchronize{REGISTERED_FORMATS[format]}
-              raise(Error, "Unsupported serialization format: #{format} (valid formats: #{Sequel.synchronize{REGISTERED_FORMATS.keys}.map(&:inspect).join})")
+              raise(Error, "Unsupported serialization format: #{format} (valid formats: #{Sequel.synchronize{REGISTERED_FORMATS.keys}.inspect})")
             end
           end
           serializer, deserializer = format
@@ -154,7 +154,10 @@ module Sequel
                   deserialized_values[column] = deserialize_value(column, super())
                 end
               end
-              define_method("#{column}=") do |v| 
+              alias_method(column, column)
+
+              setter = :"#{column}="
+              define_method(setter) do |v| 
                 cc = changed_columns
                 if !cc.include?(column) && (new? || get_column_value(column) != v)
                   cc << column
@@ -164,6 +167,7 @@ module Sequel
 
                 deserialized_values[column] = v
               end
+              alias_method(setter, setter)
             end
           end
         end
@@ -177,8 +181,9 @@ module Sequel
 
         # Freeze the deserialized values
         def freeze
-          deserialized_values.freeze
+          deserialized_values
           super
+          deserialized_values.freeze
         end
 
         # Serialize deserialized values before saving

data/lib/sequel/plugins/serialization_modification_detection.rb

@@ -50,8 +50,8 @@ module Sequel
         # Freeze the original deserialized values when freezing the instance.
         def freeze
           @original_deserialized_values ||= {}
-          @original_deserialized_values.freeze
           super
+          @original_deserialized_values.freeze
         end
 
         private

data/lib/sequel/plugins/single_table_inheritance.rb

@@ -251,6 +251,8 @@ module Sequel
           super
         end
 
+        private
+
         # Don't allow use of prepared statements.
         def use_prepared_statements_for?(type)
           false

data/lib/sequel/plugins/tree.rb

@@ -45,6 +45,7 @@ module Sequel
 
         model.instance_exec do
           @parent_column = opts[:key]
+          @qualified_parent_column = Sequel.deep_qualify(table_name, opts[:key])
           @tree_order = opts[:order]
           @parent_association_name = parent
           @children_association_name = children
@@ -59,17 +60,21 @@ module Sequel
         # The column symbol or array of column symbols on which to order the tree.
         attr_accessor :tree_order
         
-        # The symbol for the column containing the value pointing to the
-        # parent of the leaf.
+        # The symbol or array of symbols for the column containing the value pointing to the
+        # parent of the node.
         attr_accessor :parent_column
 
+        # The qualified identifier or array of qualified identifiers for the column
+        # containing the value pointing to the parent of the node.
+        attr_accessor :qualified_parent_column
+
         # The association name for the parent association
         attr_reader :parent_association_name
 
         # The association name for the children association
         attr_reader :children_association_name
 
-        Plugins.inherited_instance_variables(self, :@parent_column=>nil, :@tree_order=>nil, :@parent_association_name=>nil, :@children_association_name=>nil)
+        Plugins.inherited_instance_variables(self, :@parent_column=>nil, :@qualified_parent_column=>nil, :@tree_order=>nil, :@parent_association_name=>nil, :@children_association_name=>nil)
         Plugins.def_dataset_methods(self, [:roots, :roots_dataset])
 
         # Should freeze tree order if it is an array when freezing the model class.
@@ -151,7 +156,7 @@ module Sequel
         #
         #   TreeClass.roots_dataset # => Sequel::Dataset instance
         def roots_dataset
-          ds = where(Sequel.or(Array(model.parent_column).zip([])))
+          ds = where(Sequel.or(Array(model.qualified_parent_column).zip([])))
           ds = ds.order(*model.tree_order) if model.tree_order
           ds
         end

data/lib/sequel/plugins/validation_helpers.rb

@@ -36,6 +36,7 @@ module Sequel
     # :message :: The message to use.  Can be a string which is used directly, or a
     #             proc which is called.  If the validation method takes a argument before the array of attributes,
     #             that argument is passed as an argument to the proc.
+    # :skip_invalid :: Do not try to validate columns that are already invalid.
     #
     # The default validation options for all models can be modified by
     # overridding the Model#default_validation_helpers_options private method.
@@ -281,14 +282,17 @@ module Sequel
           DEFAULT_OPTIONS[type]
         end
 
-        # Skip validating any attribute that matches one of the allow_* options.
+        # Skip validating any attribute that matches one of the allow_* options,
+        # or already has an error if the skip_invalid option is given.
+        #
         # Otherwise, yield the attribute, value, and passed option :message to
         # the block.  If the block returns anything except nil or false, add it as
         # an error message for that attributes.
         def validatable_attributes(atts, opts)
-          am, an, ab, m = opts.values_at(:allow_missing, :allow_nil, :allow_blank, :message)
+          am, an, ab, m, si = opts.values_at(:allow_missing, :allow_nil, :allow_blank, :message, :skip_invalid)
           from_values = opts[:from] == :values
           Array(atts).each do |a|
+            next if si && errors.on(a)
             next if am && !values.has_key?(a)
             v = from_values ? values[a] : get_column_value(a)
             next if an && v.nil?

data/lib/sequel/timezones.rb

@@ -10,9 +10,14 @@ module Sequel
   Timezones = SequelMethods
   Deprecation.deprecate_constant(self, :Timezones)
   
-  # Sequel doesn't pay much attention to timezones by default, but you can set it
-  # handle timezones if you want.  There are three separate timezone settings, application_timezone,
-  # database_timezone, and typecast_timezone.  All three timezones have getter and setter methods.
+  # Sequel doesn't pay much attention to timezones by default, but you can set it to
+  # handle timezones if you want.  There are three separate timezone settings:
+  #
+  # * application_timezone
+  # * database_timezone
+  # * typecast_timezone
+  #
+  # All three timezones have getter and setter methods.
   # You can set all three timezones to the same value at once via <tt>Sequel.default_timezone=</tt>.
   #
   # The only timezone values that are supported by default are <tt>:utc</tt> (convert to UTC),

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 = 38
+  MINOR = 43
 
   # The tiny version of Sequel.  Usually 0, only bumped for bugfix
   # releases that fix regressions from previous versions.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel
 version: !ruby/object:Gem::Version
-  version: 5.38.0
+  version: 5.43.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-01 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -117,9 +117,8 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 - MIT-LICENSE
-- doc/association_basics.rdoc
-- doc/model_dataset_method_design.rdoc
 - doc/advanced_associations.rdoc
+- doc/association_basics.rdoc
 - doc/bin_sequel.rdoc
 - doc/cheat_sheet.rdoc
 - doc/code_order.rdoc
@@ -127,36 +126,30 @@ extra_rdoc_files:
 - doc/dataset_basics.rdoc
 - doc/dataset_filtering.rdoc
 - doc/extensions.rdoc
+- doc/fork_safety.rdoc
 - doc/mass_assignment.rdoc
 - doc/migration.rdoc
-- doc/opening_databases.rdoc
+- doc/model_dataset_method_design.rdoc
 - doc/model_hooks.rdoc
 - doc/model_plugins.rdoc
-- doc/object_model.rdoc
-- doc/sql.rdoc
 - doc/mssql_stored_procedures.rdoc
-- doc/thread_safety.rdoc
+- doc/object_model.rdoc
+- doc/opening_databases.rdoc
 - doc/postgresql.rdoc
-- doc/querying.rdoc
 - doc/prepared_statements.rdoc
+- doc/querying.rdoc
 - doc/reflection.rdoc
-- doc/security.rdoc
-- doc/virtual_rows.rdoc
 - doc/schema_modification.rdoc
+- doc/security.rdoc
 - doc/sharding.rdoc
+- doc/sql.rdoc
 - doc/testing.rdoc
-- doc/validations.rdoc
+- doc/thread_safety.rdoc
 - doc/transactions.rdoc
-- doc/release_notes/5.5.0.txt
-- doc/release_notes/5.6.0.txt
+- doc/validations.rdoc
+- doc/virtual_rows.rdoc
 - doc/release_notes/5.0.0.txt
 - doc/release_notes/5.1.0.txt
-- doc/release_notes/5.2.0.txt
-- doc/release_notes/5.3.0.txt
-- doc/release_notes/5.4.0.txt
-- doc/release_notes/5.8.0.txt
-- doc/release_notes/5.7.0.txt
-- doc/release_notes/5.9.0.txt
 - doc/release_notes/5.10.0.txt
 - doc/release_notes/5.11.0.txt
 - doc/release_notes/5.12.0.txt
@@ -167,6 +160,7 @@ extra_rdoc_files:
 - doc/release_notes/5.17.0.txt
 - doc/release_notes/5.18.0.txt
 - doc/release_notes/5.19.0.txt
+- doc/release_notes/5.2.0.txt
 - doc/release_notes/5.20.0.txt
 - doc/release_notes/5.21.0.txt
 - doc/release_notes/5.22.0.txt
@@ -177,6 +171,7 @@ extra_rdoc_files:
 - doc/release_notes/5.27.0.txt
 - doc/release_notes/5.28.0.txt
 - doc/release_notes/5.29.0.txt
+- doc/release_notes/5.3.0.txt
 - doc/release_notes/5.30.0.txt
 - doc/release_notes/5.31.0.txt
 - doc/release_notes/5.32.0.txt
@@ -186,6 +181,17 @@ extra_rdoc_files:
 - doc/release_notes/5.36.0.txt
 - doc/release_notes/5.37.0.txt
 - doc/release_notes/5.38.0.txt
+- doc/release_notes/5.39.0.txt
+- doc/release_notes/5.4.0.txt
+- doc/release_notes/5.40.0.txt
+- doc/release_notes/5.41.0.txt
+- doc/release_notes/5.42.0.txt
+- doc/release_notes/5.43.0.txt
+- doc/release_notes/5.5.0.txt
+- doc/release_notes/5.6.0.txt
+- doc/release_notes/5.7.0.txt
+- doc/release_notes/5.8.0.txt
+- doc/release_notes/5.9.0.txt
 files:
 - CHANGELOG
 - MIT-LICENSE
@@ -200,6 +206,7 @@ files:
 - doc/dataset_basics.rdoc
 - doc/dataset_filtering.rdoc
 - doc/extensions.rdoc
+- doc/fork_safety.rdoc
 - doc/mass_assignment.rdoc
 - doc/migration.rdoc
 - doc/model_dataset_method_design.rdoc
@@ -245,7 +252,12 @@ files:
 - doc/release_notes/5.36.0.txt
 - doc/release_notes/5.37.0.txt
 - doc/release_notes/5.38.0.txt
+- doc/release_notes/5.39.0.txt
 - doc/release_notes/5.4.0.txt
+- doc/release_notes/5.40.0.txt
+- doc/release_notes/5.41.0.txt
+- doc/release_notes/5.42.0.txt
+- doc/release_notes/5.43.0.txt
 - doc/release_notes/5.5.0.txt
 - doc/release_notes/5.6.0.txt
 - doc/release_notes/5.7.0.txt
@@ -344,6 +356,7 @@ files:
 - lib/sequel/extensions/_pretty_table.rb
 - lib/sequel/extensions/any_not_empty.rb
 - lib/sequel/extensions/arbitrary_servers.rb
+- lib/sequel/extensions/async_thread_pool.rb
 - lib/sequel/extensions/auto_literal_strings.rb
 - lib/sequel/extensions/blank.rb
 - lib/sequel/extensions/caller_logging.rb
@@ -439,6 +452,7 @@ files:
 - lib/sequel/plugins/association_multi_add_remove.rb
 - lib/sequel/plugins/association_pks.rb
 - lib/sequel/plugins/association_proxies.rb
+- lib/sequel/plugins/async_thread_pool.rb
 - lib/sequel/plugins/auto_validations.rb
 - lib/sequel/plugins/before_after_save.rb
 - lib/sequel/plugins/blacklist_security.rb
@@ -447,6 +461,7 @@ files:
 - lib/sequel/plugins/caching.rb
 - lib/sequel/plugins/class_table_inheritance.rb
 - lib/sequel/plugins/column_conflicts.rb
+- lib/sequel/plugins/column_encryption.rb
 - lib/sequel/plugins/column_select.rb
 - lib/sequel/plugins/columns_updated.rb
 - lib/sequel/plugins/composition.rb
@@ -551,7 +566,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: The Database Toolkit for Ruby