sequel 5.39.0 → 5.66.0

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.
@@ -65,16 +66,13 @@ module Sequel
     #       integer: "is not a number"
     #
     # Note that if you want to support internationalization of Errors#full_messages,
-    # you need to override the method.  Here's an example:
+    # it is easiest to override Errors#full_message (note singular form and not plural form).
+    # Here's an example:
     #   
     #   class Sequel::Model::Errors
-    #     def full_messages
-    #       inject([]) do |m, kv|
-    #         att, errors = *kv
-    #         att.is_a?(Array) ? Array(att).map!{|v| I18n.t("attributes.#{v}")} : att = I18n.t("attributes.#{att}")
-    #         errors.each {|e| m << (e.is_a?(LiteralString) ? e : "#{Array(att).join(I18n.t('errors.joiner'))} #{e}")}
-    #         m
-    #       end
+    #     private
+    #     def full_message(attribute, error_msg)
+    #       "#{Array(attribute).join(I18n.t('errors.joiner'))} #{error_msg}"
     #     end
     #   end
     module ValidationHelpers
@@ -85,8 +83,11 @@ module Sequel
         :integer=>{:message=>lambda{"is not a number"}},
         :length_range=>{:message=>lambda{|range| "is too short or too long"}},
         :max_length=>{:message=>lambda{|max| "is longer than #{max} characters"}, :nil_message=>lambda{"is not present"}},
+        :max_value=>{:message=>lambda{|max| "is greater than maximum allowed value"}},
         :min_length=>{:message=>lambda{|min| "is shorter than #{min} characters"}},
+        :min_value=>{:message=>lambda{|min| "is less than minimum allowed value"}},
         :not_null=>{:message=>lambda{"is not present"}},
+        :no_null_byte=>{:message=>lambda{"contains a null byte"}},
         :numeric=>{:message=>lambda{"is not a number"}},
         :operator=>{:message=>lambda{|operator, rhs| "is not #{operator} #{rhs}"}},
         :type=>{:message=>lambda{|klass| klass.is_a?(Array) ? "is not a valid #{klass.join(" or ").downcase}" : "is not a valid #{klass.to_s.downcase}"}},
@@ -142,15 +143,38 @@ module Sequel
           end
         end
 
+        # Check that the attribute values are not greater that the given maximum value.
+        # Does not perform validation if attribute value is nil.
+        # You should only call this if you have checked the attribute value has the expected type.
+        def validates_max_value(max, atts, opts=OPTS)
+          validatable_attributes_for_type(:max_value, atts, opts) do |a,v,m|
+            validation_error_message(m, max) if !v.nil? && v > max
+          end
+        end
+
         # Check that the attribute values are not shorter than the given min length.
         def validates_min_length(min, atts, opts=OPTS)
           validatable_attributes_for_type(:min_length, atts, opts){|a,v,m| validation_error_message(m, min) if v.nil? || v.length < min}
         end
 
+        # Check that the attribute values are not less that the given minimum value.
+        # Does not perform validation if attribute value is nil.
+        # You should only call this if you have checked the attribute value has the expected type.
+        def validates_min_value(min, atts, opts=OPTS)
+          validatable_attributes_for_type(:min_value, atts, opts) do |a,v,m|
+            validation_error_message(m, min) if !v.nil? && v < min
+          end
+        end
+
         # Check attribute value(s) are not NULL/nil.
         def validates_not_null(atts, opts=OPTS)
           validatable_attributes_for_type(:not_null, atts, opts){|a,v,m| validation_error_message(m) if v.nil?}
         end
+
+        # Check attribute value(s) does not contain a null ("\0", ASCII NUL) byte.
+        def validates_no_null_byte(atts, opts=OPTS)
+          validatable_attributes_for_type(:no_null_byte, atts, opts){|a,v,m| validation_error_message(m) if String === v && v.include?("\0")}
+        end
         
         # Check attribute value(s) string representation is a valid float.
         def validates_numeric(atts, opts=OPTS)
@@ -262,7 +286,7 @@ module Sequel
               next if vals.any?(&:nil?)
               ds.where(arr.zip(vals))
             end
-            ds = yield(ds) if block_given?
+            ds = yield(ds) if defined?(yield)
             unless new?
               h = ds.joined_dataset? ? qualified_pk_hash : pk_hash
               ds = ds.exclude(h)
@@ -281,14 +305,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/plugins/xml_serializer.rb

@@ -359,7 +359,7 @@ module Sequel
             else
               Array(inc).each{|i| to_xml_include(x1, i)}
             end
-            yield x1 if block_given?
+            yield x1 if defined?(yield)
           end
           x.to_xml
         end

data/lib/sequel/sql.rb

@@ -467,7 +467,7 @@ module Sequel
       #
       #   Sequel[1] - :a # SQL: (1 - a)
       def expr(arg=(no_arg=true), &block)
-        if block_given?
+        if defined?(yield)
           if no_arg
             return expr(block)
           else

data/lib/sequel/timezones.rb

@@ -82,22 +82,20 @@ module Sequel
     # +application_timezone+ using +convert_input_timestamp+ and
     # +convert_output_timestamp+.
     def convert_timestamp(v, input_timezone)
-      begin
-        if v.is_a?(Date) && !v.is_a?(DateTime)
-          # Dates handled specially as they are assumed to already be in the application_timezone
-          if datetime_class == DateTime
-            DateTime.civil(v.year, v.month, v.day, 0, 0, 0, application_timezone == :local ? Rational(Time.local(v.year, v.month, v.day).utc_offset, 86400) : 0)
-          else
-            Time.public_send(application_timezone == :utc ? :utc : :local, v.year, v.month, v.day)
-          end
+      if v.is_a?(Date) && !v.is_a?(DateTime)
+        # Dates handled specially as they are assumed to already be in the application_timezone
+        if datetime_class == DateTime
+          DateTime.civil(v.year, v.month, v.day, 0, 0, 0, application_timezone == :local ? Rational(Time.local(v.year, v.month, v.day).utc_offset, 86400) : 0)
         else
-          convert_output_timestamp(convert_input_timestamp(v, input_timezone), application_timezone)
+          Time.public_send(application_timezone == :utc ? :utc : :local, v.year, v.month, v.day)
         end
-      rescue InvalidValue
-        raise
-      rescue => e
-        raise convert_exception_class(e, InvalidValue)
+      else
+        convert_output_timestamp(convert_input_timestamp(v, input_timezone), application_timezone)
       end
+    rescue InvalidValue
+      raise
+    rescue => e
+      raise convert_exception_class(e, InvalidValue)
     end
     
     # Convert the given object into an object of <tt>Sequel.datetime_class</tt> in the
@@ -158,7 +156,7 @@ module Sequel
       case v
       when String
         v2 = Sequel.string_to_datetime(v)
-        if !input_timezone || Date._parse(v).has_key?(:offset)
+        if !input_timezone || _date_parse(v).has_key?(:offset)
           v2
         else
           # Correct for potentially wrong offset if string doesn't include offset

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 = 39
+  MINOR = 66
 
   # 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.39.0
+  version: 5.66.0
 platform: ruby
 authors:
 - Jeremy Evans
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-shared_description
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -117,9 +103,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,37 +112,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/fork_safety.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
@@ -168,6 +146,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
@@ -178,6 +157,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
@@ -188,6 +168,39 @@ extra_rdoc_files:
 - 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.44.0.txt
+- doc/release_notes/5.45.0.txt
+- doc/release_notes/5.46.0.txt
+- doc/release_notes/5.47.0.txt
+- doc/release_notes/5.48.0.txt
+- doc/release_notes/5.49.0.txt
+- doc/release_notes/5.5.0.txt
+- doc/release_notes/5.50.0.txt
+- doc/release_notes/5.51.0.txt
+- doc/release_notes/5.52.0.txt
+- doc/release_notes/5.53.0.txt
+- doc/release_notes/5.54.0.txt
+- doc/release_notes/5.55.0.txt
+- doc/release_notes/5.56.0.txt
+- doc/release_notes/5.57.0.txt
+- doc/release_notes/5.58.0.txt
+- doc/release_notes/5.59.0.txt
+- doc/release_notes/5.6.0.txt
+- doc/release_notes/5.60.0.txt
+- doc/release_notes/5.61.0.txt
+- doc/release_notes/5.62.0.txt
+- doc/release_notes/5.63.0.txt
+- doc/release_notes/5.64.0.txt
+- doc/release_notes/5.65.0.txt
+- doc/release_notes/5.66.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
@@ -250,8 +263,35 @@ files:
 - 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.44.0.txt
+- doc/release_notes/5.45.0.txt
+- doc/release_notes/5.46.0.txt
+- doc/release_notes/5.47.0.txt
+- doc/release_notes/5.48.0.txt
+- doc/release_notes/5.49.0.txt
 - doc/release_notes/5.5.0.txt
+- doc/release_notes/5.50.0.txt
+- doc/release_notes/5.51.0.txt
+- doc/release_notes/5.52.0.txt
+- doc/release_notes/5.53.0.txt
+- doc/release_notes/5.54.0.txt
+- doc/release_notes/5.55.0.txt
+- doc/release_notes/5.56.0.txt
+- doc/release_notes/5.57.0.txt
+- doc/release_notes/5.58.0.txt
+- doc/release_notes/5.59.0.txt
 - doc/release_notes/5.6.0.txt
+- doc/release_notes/5.60.0.txt
+- doc/release_notes/5.61.0.txt
+- doc/release_notes/5.62.0.txt
+- doc/release_notes/5.63.0.txt
+- doc/release_notes/5.64.0.txt
+- doc/release_notes/5.65.0.txt
+- doc/release_notes/5.66.0.txt
 - doc/release_notes/5.7.0.txt
 - doc/release_notes/5.8.0.txt
 - doc/release_notes/5.9.0.txt
@@ -305,6 +345,7 @@ files:
 - lib/sequel/adapters/sqlanywhere.rb
 - lib/sequel/adapters/sqlite.rb
 - lib/sequel/adapters/tinytds.rb
+- lib/sequel/adapters/utils/columns_limit_1.rb
 - lib/sequel/adapters/utils/emulate_offset_with_reverse_and_count.rb
 - lib/sequel/adapters/utils/emulate_offset_with_row_number.rb
 - lib/sequel/adapters/utils/mysql_mysql2.rb
@@ -319,6 +360,7 @@ files:
 - lib/sequel/connection_pool/sharded_threaded.rb
 - lib/sequel/connection_pool/single.rb
 - lib/sequel/connection_pool/threaded.rb
+- lib/sequel/connection_pool/timed_queue.rb
 - lib/sequel/core.rb
 - lib/sequel/database.rb
 - lib/sequel/database/connecting.rb
@@ -348,6 +390,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
@@ -361,6 +404,7 @@ files:
 - lib/sequel/extensions/current_datetime_timestamp.rb
 - lib/sequel/extensions/dataset_source_alias.rb
 - lib/sequel/extensions/date_arithmetic.rb
+- lib/sequel/extensions/date_parse_input_handler.rb
 - lib/sequel/extensions/datetime_parse_to_time.rb
 - lib/sequel/extensions/duplicate_columns_handler.rb
 - lib/sequel/extensions/empty_array_consider_nulls.rb
@@ -377,6 +421,7 @@ files:
 - lib/sequel/extensions/index_caching.rb
 - lib/sequel/extensions/inflector.rb
 - lib/sequel/extensions/integer64.rb
+- lib/sequel/extensions/is_distinct_from.rb
 - lib/sequel/extensions/looser_typecasting.rb
 - lib/sequel/extensions/migration.rb
 - lib/sequel/extensions/mssql_emulate_lateral_with_apply.rb
@@ -386,8 +431,10 @@ files:
 - lib/sequel/extensions/pagination.rb
 - lib/sequel/extensions/pg_array.rb
 - lib/sequel/extensions/pg_array_ops.rb
+- lib/sequel/extensions/pg_auto_parameterize.rb
 - lib/sequel/extensions/pg_enum.rb
 - lib/sequel/extensions/pg_extended_date_support.rb
+- lib/sequel/extensions/pg_extended_integer_support.rb
 - lib/sequel/extensions/pg_hstore.rb
 - lib/sequel/extensions/pg_hstore_ops.rb
 - lib/sequel/extensions/pg_inet.rb
@@ -396,6 +443,7 @@ files:
 - lib/sequel/extensions/pg_json.rb
 - lib/sequel/extensions/pg_json_ops.rb
 - lib/sequel/extensions/pg_loose_count.rb
+- lib/sequel/extensions/pg_multirange.rb
 - lib/sequel/extensions/pg_range.rb
 - lib/sequel/extensions/pg_range_ops.rb
 - lib/sequel/extensions/pg_row.rb
@@ -416,6 +464,8 @@ files:
 - lib/sequel/extensions/split_array_nil.rb
 - lib/sequel/extensions/sql_comments.rb
 - lib/sequel/extensions/sql_expr.rb
+- lib/sequel/extensions/sql_log_normalizer.rb
+- lib/sequel/extensions/sqlite_json_ops.rb
 - lib/sequel/extensions/string_agg.rb
 - lib/sequel/extensions/string_date_time.rb
 - lib/sequel/extensions/symbol_aref.rb
@@ -443,7 +493,10 @@ 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_restrict_eager_graph.rb
 - lib/sequel/plugins/auto_validations.rb
+- lib/sequel/plugins/auto_validations_constraint_validations_presence_message.rb
 - lib/sequel/plugins/before_after_save.rb
 - lib/sequel/plugins/blacklist_security.rb
 - lib/sequel/plugins/boolean_readers.rb
@@ -451,9 +504,11 @@ 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
+- lib/sequel/plugins/concurrent_eager_loading.rb
 - lib/sequel/plugins/constraint_validations.rb
 - lib/sequel/plugins/csv_serializer.rb
 - lib/sequel/plugins/dataset_associations.rb
@@ -464,6 +519,7 @@ files:
 - lib/sequel/plugins/eager_each.rb
 - lib/sequel/plugins/eager_graph_eager.rb
 - lib/sequel/plugins/empty_failure_backtraces.rb
+- lib/sequel/plugins/enum.rb
 - lib/sequel/plugins/error_splitter.rb
 - lib/sequel/plugins/finder.rb
 - lib/sequel/plugins/forbid_lazy_load.rb
@@ -489,7 +545,9 @@ files:
 - lib/sequel/plugins/pg_row.rb
 - lib/sequel/plugins/prepared_statements.rb
 - lib/sequel/plugins/prepared_statements_safe.rb
+- lib/sequel/plugins/primary_key_lookup_check_values.rb
 - lib/sequel/plugins/rcte_tree.rb
+- lib/sequel/plugins/require_valid_schema.rb
 - lib/sequel/plugins/serialization.rb
 - lib/sequel/plugins/serialization_modification_detection.rb
 - lib/sequel/plugins/sharding.rb
@@ -498,6 +556,7 @@ files:
 - lib/sequel/plugins/skip_create_refresh.rb
 - lib/sequel/plugins/skip_saving_columns.rb
 - lib/sequel/plugins/split_values.rb
+- lib/sequel/plugins/sql_comments.rb
 - lib/sequel/plugins/static_cache.rb
 - lib/sequel/plugins/static_cache_cache.rb
 - lib/sequel/plugins/string_stripper.rb
@@ -511,6 +570,7 @@ files:
 - lib/sequel/plugins/tree.rb
 - lib/sequel/plugins/typecast_on_load.rb
 - lib/sequel/plugins/unlimited_update.rb
+- lib/sequel/plugins/unused_associations.rb
 - lib/sequel/plugins/update_or_create.rb
 - lib/sequel/plugins/update_primary_key.rb
 - lib/sequel/plugins/update_refresh.rb
@@ -524,16 +584,16 @@ files:
 - lib/sequel/sql.rb
 - lib/sequel/timezones.rb
 - lib/sequel/version.rb
-homepage: http://sequel.jeremyevans.net
+homepage: https://sequel.jeremyevans.net
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/jeremyevans/sequel/issues
-  changelog_uri: http://sequel.jeremyevans.net/rdoc/files/CHANGELOG.html
-  documentation_uri: http://sequel.jeremyevans.net/documentation.html
-  mailing_list_uri: https://groups.google.com/forum/#!forum/sequel-talk
+  changelog_uri: https://sequel.jeremyevans.net/rdoc/files/CHANGELOG.html
+  documentation_uri: https://sequel.jeremyevans.net/documentation.html
+  mailing_list_uri: https://github.com/jeremyevans/sequel/discussions
   source_code_uri: https://github.com/jeremyevans/sequel
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--quiet"
 - "--line-numbers"
@@ -555,8 +615,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.4.6
+signing_key:
 specification_version: 4
 summary: The Database Toolkit for Ruby
 test_files: []