sequel 5.106.0 → 5.109.0

data/lib/sequel/extensions/pg_row.rb

@@ -247,9 +247,9 @@ module Sequel
           if skip(/\)/)
             values << nil
           else
-            # :nocov:
+            # simplecov:disable
             until eos?
-            # :nocov:
+            # simplecov:enable
               if skip(/"/)
                 values << scan(/(\\.|""|[^"])*/).gsub(/\\(.)|"(")/, '\1\2')
                 skip(/"[,)]/)
@@ -563,7 +563,7 @@ module Sequel
   Database.register_extension(:pg_row, Postgres::PGRow::DatabaseMethods)
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel.core_extensions?
   class Array
     # Wraps the receiver in an anonymous Sequel::Postgres::PGRow::ArrayRow instance.
@@ -582,4 +582,4 @@ if defined?(Sequel::CoreRefinements)
     end
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/extensions/pg_row_ops.rb

@@ -159,9 +159,9 @@ module Sequel
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     if defined?(PGRow::ArrayRow)
-    # :nocov:
+    # simplecov:enable
       class PGRow::ArrayRow
         # Wrap the PGRow::ArrayRow instance in an PGRowOp, allowing you to easily use
         # the PostgreSQL row functions and operators with literal rows.
@@ -171,9 +171,9 @@ module Sequel
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     if defined?(PGRow::HashRow)
-    # :nocov:
+    # simplecov:enable
       class PGRow::HashRow
         # Wrap the PGRow::ArrayRow instance in an PGRowOp, allowing you to easily use
         # the PostgreSQL row functions and operators with literal rows.
@@ -200,7 +200,7 @@ module Sequel
   end
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel.core_extensions?
   class Symbol
     include Sequel::Postgres::PGRowOp::ExpressionMethods
@@ -214,4 +214,4 @@ if defined?(Sequel::CoreRefinements)
     end
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/extensions/provenance.rb

@@ -46,11 +46,11 @@ module Sequel
           super(provenance_opts(opts))
         end
       else
-        # :nocov:
+        # simplecov:disable
         def clone(opts = OPTS) # :nodoc:
           super(provenance_opts(opts))
         end
-        # :nocov:
+        # simplecov:enable
       end
 
       %w'select insert update delete'.each do |type|

data/lib/sequel/extensions/query.rb

@@ -74,9 +74,9 @@ module Sequel
         raise(Sequel::Error, "method #{method.inspect} did not return a dataset") unless @dataset.is_a?(Dataset)
         self
       end
-      # :nocov:
+      # simplecov:disable
       ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
-      # :nocov:
+      # simplecov:enable
     end
   end
 

data/lib/sequel/extensions/s.rb

@@ -29,8 +29,7 @@
 #
 #   Object.send(:include, Sequel::S)
 #
-# If you are using Ruby 2+, and you would like to use refinements, you
-# can use Sequel::S as a refinement, in which case the private #S method
+# You can use also Sequel::S as a refinement, in which case the private #S method
 # will be available on all objects while the refinement is active.
 #
 #   using Sequel::S
@@ -39,7 +38,6 @@
 #
 # Related module: Sequel::S
 
-
 # 
 module Sequel::S
   private
@@ -49,12 +47,10 @@ module Sequel::S
     Sequel.expr(*a, &block)
   end
 
-  # :nocov:
-  if RUBY_VERSION >= '2.0.0'
-    include_meth = RUBY_VERSION >= '3.1' ? :import_methods : :include
-  # :nocov:
-    refine Object do
-      send include_meth, Sequel::S
-    end
+  # simplecov:disable
+  include_meth = RUBY_VERSION >= '3.1' ? :import_methods : :include
+  # simplecov:enable
+  refine Object do
+    send include_meth, Sequel::S
   end
 end

data/lib/sequel/extensions/schema_dumper.rb

@@ -27,9 +27,9 @@ Sequel.extension :eval_inspect
 
 module Sequel
   module SchemaDumper
-    # :nocov:
+    # simplecov:disable
     IGNORE_INDEX_ERRORS_KEY = RUBY_VERSION >= '3.4' ? 'ignore_index_errors: ' : ':ignore_index_errors=>'
-    # :nocov:
+    # simplecov:enable
     private_constant :IGNORE_INDEX_ERRORS_KEY
 
     # Convert the column schema information to a hash of column options, one of which must
@@ -200,8 +200,12 @@ END_MIG
 
     # Recreate the column in the passed Schema::CreateTableGenerator from the given name and parsed database schema.
     def recreate_column(name, schema, gen, options)
+      db_type = schema[:db_type]
+      db_type = literal(db_type) if options[:same_db] && database_type == :sqlite
+
       if options[:single_pk] && schema_autoincrementing_primary_key?(schema)
-        type_hash = options[:same_db] ? {:type=>schema[:db_type]} : column_schema_to_ruby_type(schema)
+        type_hash = options[:same_db] ? {:type=>db_type} : column_schema_to_ruby_type(schema)
+
         [:table, :key, :on_delete, :on_update, :deferrable].each{|f| type_hash[f] = schema[f] if schema[f]}
         if type_hash == {:type=>Integer} || type_hash == {:type=>"integer"} || type_hash == {:type=>"INTEGER"}
           type_hash.delete(:type)
@@ -220,7 +224,7 @@ END_MIG
         end
       else
         col_opts = if options[:same_db]
-          h = {:type=>schema[:db_type]}
+          h = {:type=>db_type}
           if database_type == :mysql && h[:type].start_with?("timestamp")
             h[:null] = true
           end
@@ -430,10 +434,10 @@ END_MIG
 
   module Schema
     class CreateTableGenerator
-      # :nocov:
+      # simplecov:disable
       DEFAULT_KEY = RUBY_VERSION >= '3.4' ? 'default: ' : ':default=>'
       IGNORE_ERRORS_KEY = RUBY_VERSION >= '3.4' ? 'ignore_errors: ' : ':ignore_errors=>'
-      # :nocov:
+      # simplecov:enable
       private_constant :DEFAULT_KEY
       private_constant :IGNORE_ERRORS_KEY
 

data/lib/sequel/extensions/sequel_4_dataset_methods.rb

@@ -21,6 +21,8 @@
 #
 # Related module: Sequel::Sequel4DatasetMethods
 
+# SEQUEL6: Remove
+
 #
 module Sequel
   module Sequel4DatasetMethods

data/lib/sequel/extensions/sql_comments.rb

@@ -108,7 +108,7 @@ module Sequel
           # injection.
           #
           # Additionally, due to the use of an SQL comment, if any
-          # SQL is appened to the query after the comment is added,
+          # SQL is appended to the query after the comment is added,
           # it will become part of the comment unless it is preceded
           # by a newline.
           if sql.frozen?

data/lib/sequel/extensions/sql_log_normalizer.rb

@@ -14,7 +14,7 @@
 # The normalization is done by scanning the SQL string being executed
 # for literal strings and numbers, and replacing them with question
 # marks.  While this should work for all or almost all production queries,
-# there are pathlogical queries that will not be handled correctly, such as
+# there are pathological queries that will not be handled correctly, such as
 # the use of apostrophes in identifiers:
 #
 #   DB[:"asf'bar"].where(a: 1, b: 'something').first

data/lib/sequel/extensions/sqlite_json_ops.rb

@@ -296,7 +296,7 @@ module Sequel
   end
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel.core_extensions?
   class Symbol
     include Sequel::SQLite::JSONOpMethods
@@ -310,4 +310,4 @@ if defined?(Sequel::CoreRefinements)
     end
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/extensions/string_agg.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 #
 # The string_agg extension adds the ability to perform database-independent
-# aggregate string concatentation.  For example, with a table like:
+# aggregate string concatenation.  For example, with a table like:
 #
 #   c1 | c2
 #   ---+---
@@ -28,7 +28,7 @@
 #   # or:
 #   sa = Sequel.string_agg(:column_name, '-') # custom separator
 #
-# You can specify the order in which the concatention happens by
+# You can specify the order in which the concatenation happens by
 # calling +order+ on the expression:
 #
 #   sa = Sequel.string_agg(:column_name).order(:other_column)
@@ -45,7 +45,7 @@
 #     select_group(:c1).
 #     select_append(Sequel.string_agg(:c2))
 #
-# This extension currenly supports the following databases:
+# This extension currently supports the following databases:
 #
 # * PostgreSQL 9+
 # * SQLAnywhere 12+
@@ -62,13 +62,13 @@
 module Sequel
   module SQL
     module Builders
-      # Return a StringAgg expression for an aggregate string concatentation.
+      # Return a StringAgg expression for an aggregate string concatenation.
       def string_agg(*a)
         StringAgg.new(*a)
       end
     end
 
-    # The StringAgg class represents an aggregate string concatentation.
+    # The StringAgg class represents an aggregate string concatenation.
     class StringAgg < GenericExpression
       include StringMethods
       include StringConcatenationMethods

data/lib/sequel/extensions/symbol_aref.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 #
 # The symbol_aref extension makes Symbol#[] support Symbol,
-# Sequel::SQL::Indentifier, and Sequel::SQL::QualifiedIdentifier instances,
+# Sequel::SQL::Identifier, and Sequel::SQL::QualifiedIdentifier instances,
 # returning appropriate Sequel::SQL::QualifiedIdentifier instances.  It's
 # designed as a shortcut so that instead of:
 #
@@ -15,41 +15,21 @@
 #
 #   Sequel.extension :symbol_aref
 #
-# If you are using Ruby 2+, and you would like to use refinements, there
-# is a refinement version of this in the symbol_aref_refinement extension.
+# There is a refinement version of this in the symbol_aref_refinement extension.
 #
 # Related module: Sequel::SymbolAref
 
-if RUBY_VERSION >= '2.0'
-  module Sequel::SymbolAref
-    def [](v)
-      case v
-      when Symbol, Sequel::SQL::Identifier, Sequel::SQL::QualifiedIdentifier
-        Sequel::SQL::QualifiedIdentifier.new(self, v)
-      else
-        super
-      end
+module Sequel::SymbolAref
+  def [](v)
+    case v
+    when Symbol, Sequel::SQL::Identifier, Sequel::SQL::QualifiedIdentifier
+      Sequel::SQL::QualifiedIdentifier.new(self, v)
+    else
+      super
     end
   end
+end
 
-  class Symbol
-    prepend Sequel::SymbolAref
-  end
-# :nocov:
-else
-  class Symbol
-    if method_defined?(:[])
-      alias_method :aref_before_sequel, :[] 
-    end
-
-    def [](v)
-      case v
-      when Symbol, Sequel::SQL::Identifier, Sequel::SQL::QualifiedIdentifier
-        Sequel::SQL::QualifiedIdentifier.new(self, v)
-      else
-        aref_before_sequel(v)
-      end
-    end
-  end
+class Symbol
+  prepend Sequel::SymbolAref
 end
-# :nocov:

data/lib/sequel/extensions/symbol_aref_refinement.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 #
 # The symbol_aref_refinement extension adds a refinement that makes
-# Symbol#[] support Symbol, #Sequel::SQL::Indentifier, and
+# Symbol#[] support Symbol, #Sequel::SQL::Identifier, and
 # Sequel::SQL::QualifiedIdentifier instances, returning appropriate
 # Sequel::SQL::QualifiedIdentifier instances.  It's designed as a
 # shortcut so that instead of:
@@ -25,10 +25,7 @@
 #
 # Related module: Sequel::SymbolAref
 
-# :nocov:
-raise(Sequel::Error, "Refinements require ruby 2.0.0 or greater") unless RUBY_VERSION >= '2.0.0'
-# :nocov:
-
+#
 module Sequel::SymbolAref
   refine Symbol do
     def [](v)

data/lib/sequel/extensions/symbol_as.rb

@@ -14,8 +14,7 @@
 #
 #   Sequel.extension :symbol_as
 #
-# If you are using Ruby 2+, and you would like to use refinements, there
-# is a refinement version of this in the symbol_as_refinement extension.
+# There is a refinement version of this in the symbol_as_refinement extension.
 
 # 
 class Symbol

data/lib/sequel/extensions/symbol_as_refinement.rb

@@ -23,10 +23,7 @@
 #
 # Related module: Sequel::SymbolAs
 
-# :nocov:
-raise(Sequel::Error, "Refinements require ruby 2.0.0 or greater") unless RUBY_VERSION >= '2.0.0'
-# :nocov:
-
+#
 module Sequel::SymbolAs
   refine Symbol do
     def as(aliaz, columns=nil)
@@ -34,4 +31,3 @@ module Sequel::SymbolAs
     end
   end
 end
-

data/lib/sequel/extensions/transaction_connection_validator.rb

@@ -33,7 +33,7 @@ module Sequel
     end
 
     # Rescue disconnect errors raised when beginning a new transaction.  If there
-    # is a disconnnect error, it should be safe to retry the transaction using a
+    # is a disconnect error, it should be safe to retry the transaction using a
     # new connection, as we haven't yielded control to the user yet.
     def transaction(opts=OPTS)
       super

data/lib/sequel/model/associations.rb

@@ -383,7 +383,7 @@ module Sequel
         end
 
         # Finalize the association by first attempting to populate the thread-safe cache,
-        # and then transfering the thread-safe cache value to the association itself,
+        # and then transferring the thread-safe cache value to the association itself,
         # so that a mutex is not needed to get the value.
         def finalize
           return unless cache = self[:cache]
@@ -1174,7 +1174,7 @@ module Sequel
         private
     
         # Use a correlated subquery to limit the dataset.  Note that this will not
-        # work correctly if the associated dataset uses qualified identifers in the WHERE clause,
+        # work correctly if the associated dataset uses qualified identifiers in the WHERE clause,
         # as they would reference the containing query instead of the subquery.
         def apply_correlated_subquery_limit_strategy(ds)
           table = ds.first_source_table
@@ -1191,7 +1191,7 @@ module Sequel
         end
 
         # Use a LATERAL subquery to limit the dataset.  Note that this will not
-        # work correctly if the associated dataset uses qualified identifers in the WHERE clause,
+        # work correctly if the associated dataset uses qualified identifiers in the WHERE clause,
         # as they would reference the containing query instead of the subquery.
         #
         # This does not contain the conditions that are necessary to join to the
@@ -1821,7 +1821,7 @@ module Sequel
         # The following options can be supplied:
         # === 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).
+        #           to associate the given object to the current object (*_to_many associations).
         #           Set to nil to not define a add_* method for the association.
         # :after_add :: Symbol, Proc, or array of both/either specifying a callback to call
         #               after a new item is added to the association.
@@ -1852,7 +1852,7 @@ module Sequel
         # :class_namespace :: If :class is given as a string or symbol, sets the default namespace in which to look for
         #                     the class.  <tt>class: 'Foo', class_namespace: 'Bar'</tt> looks for <tt>::Bar::Foo</tt>.)
         # :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).
+        #             to remove all objects associated to the current object (*_to_many associations).
         #             Set to nil to not define a remove_all_* method for the association.
         # :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
@@ -1939,10 +1939,10 @@ module Sequel
         #               or add_/remove_/remove_all_ methods (for one_to_many and many_to_many associations).
         # :reciprocal :: the symbol name of the reciprocal association,
         #                if it exists.  By default, Sequel will try to determine it by looking at the
-        #                associated model's assocations for a association that matches
+        #                associated model's associations 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).
+        #             to remove the association between the given object and the current object (*_to_many associations).
         #             Set to nil to not define a remove_* method for the association.
         # :select :: the columns to select.  Defaults to the associated class's table_name.* in an association
         #            that uses joins, which means it doesn't include the attributes from the
@@ -1950,7 +1950,7 @@ module Sequel
         #            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
+        # :setter :: Proc used to define the private _*= method for doing the work to setup the association
         #            between the given object and the current object (*_to_one associations).
         #            Set to nil to not define a setter method for the association.
         # :subqueries_per_union :: The number of subqueries to use in each UNION query, for eager
@@ -2208,9 +2208,9 @@ module Sequel
         def association_module_delegate_def(name, opts, &block)
           mod = association_module(opts)
           mod.send(:define_method, name, &block)
-          # :nocov:
+          # simplecov:disable
           mod.send(:ruby2_keywords, name) if mod.respond_to?(:ruby2_keywords, true)
-          # :nocov:
+          # simplecov:enable
           mod.send(:alias_method, name, name)
         end
       
@@ -2819,9 +2819,9 @@ module Sequel
           run_association_callbacks(opts, :after_add, o)
           o
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:add_associated_object) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Add/Set the current object to/as the given object's reciprocal association.
         def add_reciprocal_object(opts, o)
@@ -2964,9 +2964,9 @@ module Sequel
           associations[opts[:name]] = []
           ret
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:remove_all_associated_objects) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Remove the given associated object from the given association
         def remove_associated_object(opts, o, *args)
@@ -2988,9 +2988,9 @@ module Sequel
           run_association_callbacks(opts, :after_remove, o)
           o
         end
-        # :nocov:
+        # simplecov:disable
         ruby2_keywords(:remove_associated_object) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
 
         # Check that the object from the associated table specified by the primary key
         # is currently associated to the receiver.  If it is associated, return the object, otherwise
@@ -3476,7 +3476,7 @@ module Sequel
         # :limit_strategy :: Use a strategy for handling limits on associations.
         #                    Appropriate :limit_strategy values are:
         #                    true :: Pick the most appropriate based on what the database supports
-        #                    :distinct_on :: Force use of DISTINCT ON stategy (*_one associations only)
+        #                    :distinct_on :: Force use of DISTINCT ON strategy (*_one associations only)
         #                    :correlated_subquery :: Force use of correlated subquery strategy (one_to_* associations only)
         #                    :window_function :: Force use of window function strategy
         #                    :ruby :: Don't modify the SQL, implement limits/offsets with array slicing

data/lib/sequel/model/base.rb

@@ -518,9 +518,9 @@ module Sequel
 
         m.configure(self, *args, &block) if m.respond_to?(:configure)
       end
-      # :nocov:
+      # simplecov:disable
       ruby2_keywords(:plugin) if respond_to?(:ruby2_keywords, true)
-      # :nocov:
+      # simplecov:enable
 
       # Returns primary key attribute hash.  If using a composite primary key
       # value such be an array with values for each primary key in the correct
@@ -828,9 +828,9 @@ ruby2_keywords :#{meth} if respond_to?(:ruby2_keywords, true)
 END
         else
           mod.send(:define_method, meth){|*args, &block| dataset.public_send(meth, *args, &block)}
-          # :nocov:
+          # simplecov:disable
           mod.send(:ruby2_keywords, meth) if respond_to?(:ruby2_keywords, true)
-          # :nocov:
+          # simplecov:enable
         end
         mod.send(:alias_method, meth, meth)
       end
@@ -1830,7 +1830,7 @@ END
         end
       end
 
-      # Internal destroy method, separted from destroy to
+      # Internal destroy method, separated from destroy to
       # allow running inside a transaction
       def _destroy(opts)
         called = false
@@ -1943,7 +1943,7 @@ END
               columns = opts[:columns]
               if columns.nil?
                 columns_updated = if opts[:changed]
-                  _save_update_changed_colums_hash
+                  _save_update_changed_columns_hash
                 else
                   _save_update_all_columns_hash
                 end
@@ -1995,10 +1995,18 @@ END
         v
       end
 
+      def _save_update_changed_colums_hash # :nodoc:
+        # SEQUEL6: Remove
+        # simplecov:disable
+        Sequel::Deprecation.deprecate("Model#_save_update_changed_colums_hash", "Use #_save_update_changed_columns_hash instead")
+        _save_update_changed_columns_hash
+        # simplecov:enable
+      end
+
       # Return a hash of values used when saving changed columns of an
       # existing object.  Defaults to all of the objects current values
       # that are recorded as modified.
-      def _save_update_changed_colums_hash
+      def _save_update_changed_columns_hash
         cc = changed_columns
         @values.reject{|k,v| !cc.include?(k)}
       end
@@ -2425,14 +2433,9 @@ END
     plugin self
     def_initialize_nil_instance_variables
 
-    singleton_class.send(:undef_method, :dup, :clone, :initialize_copy)
-    # :nocov:
-    if RUBY_VERSION >= '1.9.3'
-    # :nocov:
-      singleton_class.send(:undef_method, :initialize_clone, :initialize_dup)
-    end
+    singleton_class.send(:undef_method, :dup, :clone, :initialize_copy, :initialize_clone, :initialize_dup)
 
-    # :nocov:
+    # simplecov:disable
     if defined?(Sequel::Postgres::SEQUEL_PG_VERSION_INTEGER) && Sequel::Postgres::SEQUEL_PG_VERSION_INTEGER >= 11800
       # Automatically optimize model loading when sequel/core was loaded,
       # then sequel/adapters/postgres (with sequel_pg), then sequel/model
@@ -2442,6 +2445,6 @@ END
         # nothing
       end
     end
-    # :nocov:
+    # simplecov:enable
   end
 end

data/lib/sequel/model/inflections.rb

@@ -28,7 +28,7 @@ module Sequel
     @plurals, @singulars, @uncountables = [], [], []
 
     class << self
-      # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for plurization.
+      # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for pluralization.
       attr_reader :plurals
 
       # Array of two element arrays, first containing a regex, and the second containing a substitution pattern, used for singularization.

data/lib/sequel/model/plugins.rb

@@ -31,9 +31,9 @@ module Sequel
     def self.def_dataset_methods(mod, meths)
       Array(meths).each do |meth|
         mod.class_eval("def #{meth}(*args, &block); dataset.#{meth}(*args, &block) end", __FILE__, __LINE__)
-        # :nocov:
+        # simplecov:disable
         mod.send(:ruby2_keywords, meth) if respond_to?(:ruby2_keywords, true)
-        # :nocov:
+        # simplecov:enable
       end
     end
 

data/lib/sequel/model.rb

@@ -70,9 +70,9 @@ module Sequel
     require_relative "model/base"
     require_relative "model/exceptions"
     require_relative "model/errors"
-    # :nocov:
+    # simplecov:disable
     if !defined?(::SEQUEL_NO_ASSOCIATIONS) && !ENV.has_key?('SEQUEL_NO_ASSOCIATIONS')
-    # :nocov:
+    # simplecov:enable
       require_relative 'model/associations'
       plugin Model::Associations
     end

data/lib/sequel/plugins/association_pks.rb

@@ -20,7 +20,7 @@ module Sequel
     #   # Persist changes
     #
     # Note that it uses the singular form of the association name. Also note
-    # that the setter both associates to new primary keys not in the assocation
+    # that the setter both associates to new primary keys not in the association
     # and disassociates from primary keys not provided to the method.
     #
     # This plugin makes modifications directly to the underlying tables,