sequel 5.107.0 → 5.109.0

data/lib/sequel/extensions/pg_json_ops.rb

@@ -103,7 +103,7 @@
 #   j.path_query_first_tz('$.foo') # jsonb_path_query_first_tz(jsonb_column, '$.foo')
 #
 # On PostgreSQL 14+, The JSONB <tt>[]</tt> method will use subscripts instead of being
-# the same as +get+, if the value being wrapped is an identifer:
+# the same as +get+, if the value being wrapped is an identifier:
 #
 #   Sequel.pg_jsonb_op(:jsonb_column)[1]       # jsonb_column[1]
 #   Sequel.pg_jsonb_op(:jsonb_column)[1][2]    # jsonb_column[1][2]
@@ -173,7 +173,7 @@
 #
 # If you are also using the pg_json extension, you should load it before
 # loading this extension.  Doing so will allow you to use the #op method on
-# JSONHash, JSONHarray, JSONBHash, and JSONBArray, allowing you to perform json/jsonb operations
+# JSONHash, JSONArray, JSONBHash, and JSONBArray, allowing you to perform json/jsonb operations
 # on json/jsonb literals.
 #
 # In order to get the automatic conversion from a ruby array to a PostgreSQL array
@@ -843,9 +843,9 @@ module Sequel
 
       # Wrap argument in a PGArray if it is an array or a set
       def wrap_input_array(obj)
-        # :nocov:
+        # simplecov:disable
         if Sequel.respond_to?(:pg_array)
-        # :nocov:
+        # simplecov:enable
           case obj
           when Array
             return Sequel.pg_array(obj)
@@ -984,7 +984,8 @@ module Sequel
               comma = true
             end
             ds.literal_append(sql, v)
-            sql << " AS " << k.to_s
+            sql << " AS "
+            ds.send(:identifier_append, sql, k)
           end
         end
       end
@@ -1074,7 +1075,7 @@ module Sequel
         end
       end
 
-      # Do not auto paramterize default value, as PostgreSQL doesn't allow it.
+      # Do not auto parameterize default value, as PostgreSQL doesn't allow it.
       def default_literal_append(ds, sql, v)
         if sql.respond_to?(:skip_auto_param)
           sql.skip_auto_param do
@@ -1254,7 +1255,8 @@ module Sequel
               comma = true
             end
             ds.literal_append(sql, v)
-            sql << " AS " << k.to_s
+            sql << " AS "
+            ds.send(:identifier_append, sql, k)
           end
         end
 
@@ -1341,7 +1343,7 @@ module Sequel
         end
       end
 
-      # Append path caluse to the SQL
+      # Append path clause to the SQL
       def to_s_append_path(ds, sql, path)
         if path
           sql << ' PATH '
@@ -1349,7 +1351,7 @@ module Sequel
         end
       end
 
-      # Do not auto paramterize default value or path value, as PostgreSQL doesn't allow it.
+      # Do not auto parameterize default value or path value, as PostgreSQL doesn't allow it.
       def default_literal_append(ds, sql, v)
         if sql.respond_to?(:skip_auto_param)
           sql.skip_auto_param do
@@ -1375,9 +1377,9 @@ module Sequel
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     if defined?(JSONArray)
-    # :nocov:
+    # simplecov:enable
       class JSONArray
         # Wrap the JSONArray instance in an JSONOp, allowing you to easily use
         # the PostgreSQL json functions and operators with literal jsons.
@@ -1443,7 +1445,7 @@ module Sequel
   end
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel.core_extensions?
   class Symbol
     include Sequel::Postgres::JSONOpMethods
@@ -1457,4 +1459,4 @@ if defined?(Sequel::CoreRefinements)
     end
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/extensions/pg_range.rb

@@ -2,11 +2,11 @@
 #
 # The pg_range extension adds support for the PostgreSQL 9.2+ range
 # types to Sequel.  PostgreSQL range types are similar to ruby's
-# Range class, representating an array of values.  However, they
+# Range class, representing an array of values.  However, they
 # are more flexible than ruby's ranges, allowing exclusive beginnings
 # and endings (ruby's range only allows exclusive endings).
 #
-# When PostgreSQL range values are retreived, they are parsed and returned
+# When PostgreSQL range values are retrieved, they are parsed and returned
 # as instances of Sequel::Postgres::PGRange.  PGRange mostly acts
 # like a Range, but it's not a Range as not all PostgreSQL range
 # type values would be valid ruby ranges.  If the range type value
@@ -459,10 +459,10 @@ module Sequel
         return @range if @range
         raise(Error, "cannot create ruby range for an empty PostgreSQL range") if empty?
         raise(Error, "cannot create ruby range when PostgreSQL range excludes beginning element") if exclude_begin?
-        # :nocov:
+        # simplecov:disable
         raise(Error, "cannot create ruby range when PostgreSQL range has unbounded beginning") if STARTLESS_RANGE_NOT_SUPPORTED && !self.begin
         raise(Error, "cannot create ruby range when PostgreSQL range has unbounded ending") if ENDLESS_RANGE_NOT_SUPPORTED && !self.end
-        # :nocov:
+        # simplecov:enable
         @range = Range.new(self.begin, self.end, exclude_end?)
       end
 
@@ -549,7 +549,7 @@ module Sequel
   Database.register_extension(:pg_range, Postgres::PGRange::DatabaseMethods)
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel.core_extensions?
   class Range 
     # Create a new PGRange using the receiver as the input range,
@@ -569,4 +569,4 @@ if defined?(Sequel::CoreRefinements)
     end
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/extensions/pg_range_ops.rb

@@ -113,7 +113,7 @@ module Sequel
 
       private
 
-      # Create a boolen expression for the given type and argument.
+      # Create a boolean expression for the given type and argument.
       def operator(type, other)
         Sequel::SQL::BooleanExpression.new(:NOOP, Sequel::SQL::PlaceholderLiteralString.new(OPERATORS[type], [value, other]))
       end
@@ -132,9 +132,9 @@ module Sequel
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     if defined?(PGRange)
-    # :nocov:
+    # simplecov:enable
       class PGRange
         # Wrap the PGRange instance in an RangeOp, allowing you to easily use
         # the PostgreSQL range functions and operators with literal ranges.
@@ -144,9 +144,9 @@ module Sequel
       end
     end
 
-    # :nocov:
+    # simplecov:disable
     if defined?(PGMultiRange)
-    # :nocov:
+    # simplecov:enable
       class PGMultiRange
         # Wrap the PGRange instance in an RangeOp, allowing you to easily use
         # the PostgreSQL range functions and operators with literal ranges.
@@ -178,7 +178,7 @@ module Sequel
   end
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel.core_extensions?
   class Symbol
     include Sequel::Postgres::RangeOpMethods
@@ -192,4 +192,4 @@ if defined?(Sequel::CoreRefinements)
     end
   end
 end
-# :nocov:
+# simplecov:enable

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