sequel 5.57.0 → 5.60.0

data/lib/sequel/plugins/json_serializer.rb

@@ -152,7 +152,7 @@ module Sequel
         if obj.is_a?(Array)
           obj.map{|x| object_to_json_data(x, *args, &block)}
         else
-          if obj.respond_to?(:to_json_data)
+          if defined?(obj.to_json_data)
             obj.to_json_data(*args, &block)
           else
             begin

data/lib/sequel/plugins/list.rb

@@ -33,7 +33,9 @@ module Sequel
     # You can provide a <tt>:scope</tt> option to scope the list.  This option
     # can be a symbol or array of symbols specifying column name(s), or a proc
     # that accepts a model instance and returns a dataset representing the list
-    # the object is in.
+    # the object is in.  You will need to provide a <tt>:scope</tt> option if
+    # the model's dataset uses a subquery (such as when using the class_table_inheritance
+    # plugin).
     # 
     # For example, if each item has a +user_id+ field, and you want every user
     # to have their own list:

data/lib/sequel/plugins/nested_attributes.rb

@@ -259,7 +259,7 @@ module Sequel
         # specific :fields if configured.
         def nested_attributes_set_attributes(meta, obj, attributes)
           if fields = meta[:fields]
-            fields = fields.call(obj) if fields.respond_to?(:call)
+            fields = fields.call(obj) if defined?(fields.call)
             obj.set_fields(attributes, fields, :missing=>:skip)
           else
             obj.set(attributes)

data/lib/sequel/plugins/pg_auto_constraint_validations.rb

@@ -159,7 +159,7 @@ module Sequel
 
           case @dataset.first_source_table
           when Symbol, String, SQL::Identifier, SQL::QualifiedIdentifier
-           convert_errors = db.respond_to?(:error_info)
+           convert_errors = defined?(db.error_info)
           end
 
           unless convert_errors

data/lib/sequel/plugins/require_valid_schema.rb

@@ -0,0 +1,67 @@
+# frozen-string-literal: true
+
+module Sequel
+  module Plugins
+    # The require_valid_schema plugin makes Sequel raise or warn if attempting
+    # to set the dataset of a model class to a simple table, where the database
+    # supports schema parsing, but schema parsing does not work for the model's
+    # table.
+    #
+    # The plugin's default behavior requires that all models that select from a
+    # single identifier have a valid table schema, if the database supports
+    # schema parsing. If the schema cannot be determined for such
+    # a model, an error is raised:
+    #   
+    #   Sequel::Model.plugin :require_valid_schema
+    #
+    # If you load the plugin with an argument of :warn, Sequel will warn instead
+    # of raising for such tables:
+    #
+    #   Sequel::Model.plugin :require_valid_schema, :warn
+    #
+    # This can catch bugs where you expect models to have valid schema, but
+    # they do not. This setting only affects future attempts to set datasets
+    # in the current class and subclasses created in the future.
+    #
+    # If you load the plugin with an argument of false, it will not require valid schema.
+    # This can be used in subclasses where you do not want to require valid schema,
+    # but the plugin must be loaded before a dataset with invalid schema is set:
+    #
+    #   Sequel::Model.plugin :require_valid_schema
+    #   InvalidSchemaAllowed = Class.new(Sequel::Model)
+    #   InvalidSchemaAllowed.plugin :require_valid_schema, false
+    #   class MyModel < InvalidSchemaAllowed
+    #   end
+    module RequireValidSchema
+      # Modify the current model's dataset selection, if the model
+      # has a dataset.
+      def self.configure(model, setting=true)
+        model.instance_variable_set(:@require_valid_schema, setting)
+      end
+
+      module ClassMethods
+        Plugins.inherited_instance_variables(self, :@require_valid_schema=>nil)
+
+        private
+
+        # If the schema cannot be determined, the model uses a simple table,
+        # require_valid_schema is set, and the database supports schema parsing, raise or
+        # warn based on the require_valid_schema setting.
+        def get_db_schema_array(reload)
+          schema_array = super
+
+          if !schema_array && simple_table && @require_valid_schema
+            message = "Not able to parse schema for model: #{inspect}, table: #{simple_table}"
+            if @require_valid_schema == :warn
+              warn message
+            else
+              raise Error, message
+            end
+          end
+
+          schema_array
+        end
+      end
+    end
+  end
+end

data/lib/sequel/plugins/serialization.rb

@@ -162,7 +162,7 @@ module Sequel
                 if !cc.include?(column) && (new? || get_column_value(column) != v)
                   cc << column
 
-                  will_change_column(column) if respond_to?(:will_change_column)
+                  will_change_column(column) if defined?(will_change_column)
                 end
 
                 deserialized_values[column] = v

data/lib/sequel/plugins/sharding.rb

@@ -91,7 +91,7 @@ module Sequel
         # +many_to_many+ association, make sure the associated object is created on the
         # current object's shard, unless the passed object already has an assigned shard.
         def ensure_associated_primary_key(opts, o, *args)
-          o.set_server?(@server) if o.respond_to?(:set_server?)
+          o.set_server?(@server) if defined?(o.set_server?)
           super
         end
 

data/lib/sequel/plugins/sql_comments.rb

@@ -63,7 +63,7 @@ module Sequel
           end
         end
         # :nocov:
-        ruby2_keywords(meth) if respond_to?(:ruby2_keywords, false)
+        mod.send(:ruby2_keywords, meth) if mod.respond_to?(:ruby2_keywords, true)
         # :nocov:
       end
 
@@ -97,7 +97,7 @@ module Sequel
             end
           end
           # :nocov:
-          ruby2_keywords(meth) if respond_to?(:ruby2_keywords, false)
+          ruby2_keywords(meth) if respond_to?(:ruby2_keywords, true)
           # :nocov:
         end
 
@@ -129,7 +129,7 @@ module Sequel
             end
           end
           # :nocov:
-          ruby2_keywords(meth) if respond_to?(:ruby2_keywords, false)
+          ruby2_keywords(meth) if respond_to?(:ruby2_keywords, true)
           # :nocov:
         end
 
@@ -159,7 +159,7 @@ module Sequel
             end
           end
           # :nocov:
-          ruby2_keywords(meth) if respond_to?(:ruby2_keywords, false)
+          ruby2_keywords(meth) if respond_to?(:ruby2_keywords, true)
           # :nocov:
         end
 

data/lib/sequel/plugins/subclasses.rb

@@ -35,7 +35,7 @@ module Sequel
     #   class B < Sequel::Model; end
     #   a # => [A, B]
     module Subclasses
-      NEED_SUBCLASSES = !Object.respond_to?(:subclasses) || Object.method(:subclasses).source_location
+      NEED_SUBCLASSES = !defined?(Object.subclasses) || Object.method(:subclasses).source_location
       private_constant :NEED_SUBCLASSES
 
       # Initialize the subclasses instance variable for the model.

data/lib/sequel/plugins/tactical_eager_loading.rb

@@ -109,6 +109,13 @@ module Sequel
     # to eagerly set the associated objects, and having separate threads
     # modify the same model instance is not thread-safe.
     #
+    # Because this plugin will automatically use eager loading for
+    # performance, it can break code that defines associations that
+    # do not support eager loading, without marking that they do not
+    # support eager loading via the <tt>allow_eager: false</tt> option.
+    # Make sure to set <tt>allow_eager: false</tt> on any association
+    # used with this plugin if the association doesn't support eager loading.
+    #
     # Usage:
     #
     #   # Make all model subclass instances use tactical eager loading (called before loading subclasses)

data/lib/sequel/plugins/validation_class_methods.rb

@@ -282,7 +282,7 @@ module Sequel
               o.errors.add(a, opts[:message] || opts[:wrong_length]) unless v && v.size == i
             end
             if w = opts[:within]
-              o.errors.add(a, opts[:message] || opts[:wrong_length]) unless v && w.public_send(w.respond_to?(:cover?) ? :cover? : :include?, v.size)
+              o.errors.add(a, opts[:message] || opts[:wrong_length]) unless v && w.public_send(defined?(w.cover?) ? :cover? : :include?, v.size)
             end
           end
         end
@@ -337,14 +337,14 @@ module Sequel
         def validates_inclusion_of(*atts)
           opts = extract_options!(atts)
           n = opts[:in]
-          unless n && (n.respond_to?(:cover?) || n.respond_to?(:include?))
+          unless n && (defined?(n.cover?) || defined?(n.include?))
             raise ArgumentError, "The :in parameter is required, and must respond to cover? or include?"
           end
           opts[:message] ||= "is not in range or set: #{n.inspect}"
           reflect_validation(:inclusion, opts, atts)
           atts << opts
           validates_each(*atts) do |o, a, v|
-            o.errors.add(a, opts[:message]) unless n.public_send(n.respond_to?(:cover?) ? :cover? : :include?, v)
+            o.errors.add(a, opts[:message]) unless n.public_send(defined?(n.cover?) ? :cover? : :include?, v)
           end
         end
     

data/lib/sequel/plugins/validation_helpers.rb

@@ -107,7 +107,7 @@ module Sequel
     
         # Check attribute value(s) is included in the given set.
         def validates_includes(set, atts, opts=OPTS)
-          validatable_attributes_for_type(:includes, atts, opts){|a,v,m| validation_error_message(m, set) unless set.public_send(set.respond_to?(:cover?) ? :cover? : :include?, v)}
+          validatable_attributes_for_type(:includes, atts, opts){|a,v,m| validation_error_message(m, set) unless set.public_send(defined?(set.cover?) ? :cover? : :include?, v)}
         end
     
         # Check attribute value(s) string representation is a valid integer.

data/lib/sequel/sql.rb

@@ -1347,7 +1347,7 @@ module Sequel
       # underlying callable only accepts a single argument, call it
       # with the given dataset.
       def call(ds)
-        if @callable.respond_to?(:arity) && @callable.arity == 1
+        if defined?(@callable.arity) && @callable.arity == 1
           @callable.call(ds)
         else
           @callable.call

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 = 57
+  MINOR = 60
 
   # 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.57.0
+  version: 5.60.0
 platform: ruby
 authors:
 - Jeremy Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-09-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
@@ -202,7 +188,10 @@ extra_rdoc_files:
 - 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.7.0.txt
 - doc/release_notes/5.8.0.txt
 - doc/release_notes/5.9.0.txt
@@ -287,7 +276,10 @@ files:
 - 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.7.0.txt
 - doc/release_notes/5.8.0.txt
 - doc/release_notes/5.9.0.txt
@@ -539,6 +531,7 @@ files:
 - lib/sequel/plugins/prepared_statements.rb
 - lib/sequel/plugins/prepared_statements_safe.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