sequel 5.107.0 → 5.108.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06079c7289ee0e9b243cd4b320275936464aa0d02e09831285f622dff88da509'
-  data.tar.gz: 80de7cac3306f9b07b21bcd7885bde29da87d9b668488a96024e55002cebeb45
+  metadata.gz: ebb20cf6a0935b45043b5dc3d5ba39256f5c9fe34a1894a32383211f4cbeced5
+  data.tar.gz: a5a0c9a83a2862f133516a91b76862e0f69e6b4ac95356a7358e0ae798ab6449
 SHA512:
-  metadata.gz: 3c42946502241b5d56f7d6c25f39bc7e80e348340283809977a83ba1c66f1372d963cf5aa272452faafd027aee87ea9b4446b9ea31554ac0ab826ccb2fde7528
-  data.tar.gz: 9a26c4935906dc87b40d3a4b46c45c78faf51a0f4ca322d113dd34d3495f68540c7fe581f66a5d349cd7aecfd06ead1ae0137031eb9a0b8e146f13d68af4b68c
+  metadata.gz: bde58f0598455d105c3c4a2e3d30ebf86776c2acbef2ccfdf6ea0f3c36772396c42be9678f8e03bbfab41e06a593f2d3e6e651a8fbded9ffa3fb2f13c2f1f1eb
+  data.tar.gz: d92f6fa652e500b92106aaafb5646dab52c80647e0cf1d42164cdccdf16e8e56209b3205b8699e99704bfae480bdd4846769100e7e602c2ac72d4a9383765b60

data/bin/sequel

@@ -74,7 +74,7 @@ options = OptionParser.new do |opts|
     loggers << file
   end
   
-  opts.on("-L", "--load-dir DIR", "loads all *.rb under specifed directory") do |v|
+  opts.on("-L", "--load-dir DIR", "loads all *.rb under specified directory") do |v|
     load_dirs << v
   end
   
@@ -200,9 +200,9 @@ begin
     same_db = DB.database_type==TO_DB.database_type
     index_opts = {:same_db=>same_db}
 
-    # :nocov:
+    # simplecov:disable
     index_opts[:index_names] = :namespace if !DB.global_index_namespace? && TO_DB.global_index_namespace?
-    # :nocov:
+    # simplecov:enable
 
     if DB.database_type == :sqlite && !same_db
       # SQLite integer types allows 64-bit integers
@@ -271,10 +271,10 @@ if !ARGV.empty?
   ARGV.each{|v| load(v)}
 elsif !$stdin.isatty
   eval($stdin.read)
-# :nocov:
+# simplecov:disable
 else
   require 'irb'
   puts "Your database is stored in DB..."
   IRB.start
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/adapters/ado.rb

@@ -108,7 +108,7 @@ module Sequel
       # Pay special attention to the :provider option, as without specifying a provider,
       # many things will be broken.  The SQLNCLI10 provider appears to work well if you
       # are connecting to Microsoft SQL Server, but it is not the default as that is not
-      # always available and would break backwards compatability.
+      # always available and would break backwards compatibility.
       def connect(server)
         opts = server_opts(server)
         s = opts[:conn_string] || "driver=#{opts[:driver]};server=#{opts[:host]};database=#{opts[:database]}#{";uid=#{opts[:user]};pwd=#{opts[:password]}" if opts[:user]}"

data/lib/sequel/adapters/ibmdb.rb

@@ -312,13 +312,13 @@ module Sequel
       # Don't convert smallint to boolean for the metadata
       # dataset, since the DB2 metadata does not use
       # boolean columns, and some smallint columns are
-      # accidently treated as booleans.
+      # accidentally treated as booleans.
       def _metadata_dataset
         super.with_convert_smallint_to_bool(false)
       end
 
       # Format Numeric, Date, and Time types specially for use
-      # as IBM_DB prepared statements argument vlaues.
+      # as IBM_DB prepared statements argument values.
       def prepared_statement_arg(v)
         case v
         when Numeric

data/lib/sequel/adapters/jdbc/hsqldb.rb

@@ -163,7 +163,7 @@ module Sequel
         end
 
         # HSQLDB does support common table expressions, but the support is broken.
-        # CTEs operate more like temprorary tables or views, lasting longer than the duration of the expression.
+        # CTEs operate more like temporary tables or views, lasting longer than the duration of the expression.
         # CTEs in earlier queries might take precedence over CTEs with the same name in later queries.
         # Also, if any CTE is recursive, all CTEs must be recursive.
         # If you want to use CTEs with HSQLDB, you'll have to manually modify the dataset to allow it.

data/lib/sequel/adapters/jdbc/mysql.rb

@@ -68,7 +68,7 @@ module Sequel
         end
       
         # Run the default connection setting SQL statements.
-        # Apply the connectiong setting SQLs for every new connection.
+        # Apply the connection setting SQLs for every new connection.
         def setup_connection(conn)
           mysql_connection_setting_sqls.each{|sql| statement(conn){|s| log_connection_yield(sql, conn){s.execute(sql)}}}
           super

data/lib/sequel/adapters/jdbc.rb

@@ -5,7 +5,7 @@ require_relative 'utils/stored_procedures'
 
 module Sequel
   module JDBC
-    # Make it accesing the java.sql hierarchy more ruby friendly.
+    # Make it accessing the java.sql hierarchy more ruby friendly.
     module JavaSQL
       include_package 'java.sql'
     end
@@ -361,7 +361,7 @@ module Sequel
       # The uri for this connection.  You can specify the uri
       # using the :uri, :url, or :database options.  You don't
       # need to worry about this if you use Sequel.connect
-      # with the JDBC connectrion strings.
+      # with the JDBC connection strings.
       def uri(opts=OPTS)
         opts = @opts.merge(opts)
         ur = opts[:uri] || opts[:url] || opts[:database]

data/lib/sequel/adapters/mock.rb

@@ -38,7 +38,7 @@ module Sequel
       #
       # nil :: Return nil for all inserts
       # Integer :: Starting integer for next insert, with
-      #            futher inserts getting an incremented
+      #            further inserts getting an incremented
       #            value
       # Array :: First insert gets the first value in the
       #          array, second gets the second value, etc.

data/lib/sequel/adapters/mysql.rb

@@ -69,7 +69,7 @@ module Sequel
       # :auto_is_null :: Set to true to use MySQL default behavior of having
       #                  a filter for an autoincrement column equals NULL to return the last
       #                  inserted row.
-      # :charset :: Same as :encoding (:encoding takes precendence)
+      # :charset :: Same as :encoding (:encoding takes precedence)
       # :compress :: Set to false to not compress results from the server
       # :config_default_group :: The default group to read from the in
       #                          the MySQL config file.
@@ -284,8 +284,13 @@ module Sequel
         Dataset
       end
 
+      # If the error is a Mysql::Error, check the client error code and exception
+      # message for disconnects.
       def disconnect_error?(e, opts)
-        super || (e.is_a?(::Mysql::Error) && MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message))
+        super ||
+          (e.is_a?(::Mysql::Error) &&
+            (MYSQL_DISCONNECT_ERROR_CODES.include?(e.errno) ||
+             MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message)))
       end
       
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true

data/lib/sequel/adapters/mysql2.rb

@@ -28,7 +28,7 @@ module Sequel
       # :auto_is_null :: Set to true to use MySQL default behavior of having
       #                  a filter for an autoincrement column equals NULL to return the last
       #                  inserted row.
-      # :charset :: Same as :encoding (:encoding takes precendence)
+      # :charset :: Same as :encoding (:encoding takes precedence)
       # :encoding :: Set all the related character sets for this
       #              connection (connection, client, database, server, and results).
       #
@@ -215,13 +215,14 @@ module Sequel
       end
 
       # If a connection object is available, try pinging it.  Otherwise, if the
-      # error is a Mysql2::Error, check the SQL state and exception message for
-      # disconnects.
+      # error is a Mysql2::Error, check the client error code, SQL state, and
+      # exception message for disconnects.
       def disconnect_error?(e, opts)
         super ||
           ((conn = opts[:conn]) && !conn.ping) ||
           (e.is_a?(::Mysql2::Error) &&
-            ((e.sql_state && e.sql_state.start_with?("08")) ||
+            (MYSQL_DISCONNECT_ERROR_CODES.include?(e.errno) ||
+             (e.sql_state && e.sql_state.start_with?("08")) ||
              MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message)))
       end
 

data/lib/sequel/adapters/postgres.rb

@@ -5,7 +5,7 @@ require_relative 'shared/postgres'
 begin 
   require 'pg' 
 
-  # :nocov:
+  # simplecov:disable
   Sequel::Postgres::PGError = PG::Error if defined?(PG::Error)
   Sequel::Postgres::PGconn = PG::Connection if defined?(PG::Connection)
   Sequel::Postgres::PGresult = PG::Result if defined?(PG::Result)
@@ -16,7 +16,7 @@ begin
   end
 
   if defined?(PG::TypeMapByClass)
-  # :nocov:
+  # simplecov:enable
     type_map = Sequel::Postgres::PG_QUERY_TYPE_MAP = PG::TypeMapByClass.new
     type_map[Integer] = PG::TextEncoder::Integer.new
     type_map[FalseClass] = type_map[TrueClass] = PG::TextEncoder::Boolean.new
@@ -25,7 +25,7 @@ begin
 
   Sequel::Postgres::USES_PG = true
 rescue LoadError => e 
-  # :nocov:
+  # simplecov:disable
   begin
     require 'sequel/postgres-pr'
   rescue LoadError 
@@ -36,19 +36,19 @@ rescue LoadError => e
     end 
   end 
   Sequel::Postgres::USES_PG = false
-  # :nocov:
+  # simplecov:enable
 end
 
 module Sequel
   module Postgres
-    # :nocov:
+    # simplecov:disable
     if USES_PG
       # Whether the given sequel_pg version integer is supported.
       def self.sequel_pg_version_supported?(version)
         version >= 10617
       end
     end
-    # :nocov:
+    # simplecov:enable
 
     # PGconn subclass for connection specific methods used with the
     # pg or postgres-pr driver.
@@ -56,9 +56,9 @@ module Sequel
       # The underlying exception classes to reraise as disconnect errors
       # instead of regular database errors.
       DISCONNECT_ERROR_CLASSES = [IOError, Errno::EPIPE, Errno::ECONNRESET]
-      # :nocov:
+      # simplecov:disable
       if defined?(::PG::ConnectionBad)
-      # :nocov:
+      # simplecov:enable
         DISCONNECT_ERROR_CLASSES << ::PG::ConnectionBad
       end
       DISCONNECT_ERROR_CLASSES.freeze
@@ -84,7 +84,7 @@ module Sequel
         # are SQL strings.
         attr_reader :prepared_statements
 
-      # :nocov:
+      # simplecov:disable
         unless public_method_defined?(:async_exec_params)
           alias async_exec_params async_exec
         end
@@ -127,7 +127,7 @@ module Sequel
           alias cmd_tuples cmdtuples
         end 
       end
-      # :nocov:
+      # simplecov:enable
       
       # Raise a Sequel::DatabaseDisconnectError if a one of the disconnect
       # error classes is raised, or a PGError is raised and the connection
@@ -185,12 +185,12 @@ module Sequel
         case arg
         when Sequel::SQL::Blob
           {:value=>arg, :type=>17, :format=>1}
-        # :nocov:
+        # simplecov:disable
         # Not covered by tests as tests use pg_extended_date_support
         # extension, which has basically the same code.
         when Time, DateTime
           @default_dataset.literal_date_or_time(arg)
-        # :nocov:
+        # simplecov:enable
         else
           arg
         end
@@ -225,9 +225,9 @@ module Sequel
             :sslmode => opts[:sslmode],
             :sslrootcert => opts[:sslrootcert]
           }.delete_if { |key, value| blank_object?(value) }
-          # :nocov:
+          # simplecov:disable
           connection_params.merge!(opts[:driver_options]) if opts[:driver_options]
-          # :nocov:
+          # simplecov:enable
           conn = Adapter.connect(opts[:conn_str] || connection_params)
 
           conn.instance_variable_set(:@prepared_statements, {})
@@ -236,12 +236,12 @@ module Sequel
             conn.set_notice_receiver(&receiver)
           end
 
-          # :nocov:
+          # simplecov:disable
           if conn.respond_to?(:type_map_for_queries=) && defined?(PG_QUERY_TYPE_MAP)
-          # :nocov:
+          # simplecov:enable
             conn.type_map_for_queries = PG_QUERY_TYPE_MAP
           end
-        # :nocov:
+        # simplecov:disable
         else
           unless typecast_value_boolean(@opts.fetch(:force_standard_strings, true))
             raise Error, "Cannot create connection using postgres-pr unless force_standard_strings is set"
@@ -256,11 +256,11 @@ module Sequel
             opts[:password]
           )
         end
-        # :nocov:
+        # simplecov:enable
 
         conn.instance_variable_set(:@db, self)
 
-        # :nocov:
+        # simplecov:disable
         if encoding = opts[:encoding] || opts[:charset]
           if conn.respond_to?(:set_client_encoding)
             conn.set_client_encoding(encoding)
@@ -268,7 +268,7 @@ module Sequel
             conn.async_exec("set client_encoding to '#{encoding}'")
           end
         end
-        # :nocov:
+        # simplecov:enable
 
         connection_configuration_sqls(opts).each{|sql| conn.execute(sql)}
         conn
@@ -295,9 +295,9 @@ module Sequel
         nil
       end
 
-      # :nocov:
+      # simplecov:disable
       if USES_PG && Object.const_defined?(:PG) && ::PG.const_defined?(:Constants) && ::PG::Constants.const_defined?(:PG_DIAG_SCHEMA_NAME)
-      # :nocov:
+      # simplecov:enable
         # Return a hash of information about the related PGError (or Sequel::DatabaseError that
         # wraps a PGError), with the following entries (any of which may be +nil+):
         #
@@ -348,9 +348,9 @@ module Sequel
         synchronize(opts[:server]){|conn| check_database_errors{_execute(conn, sql, opts, &block)}}
       end
 
-      # :nocov:
+      # simplecov:disable
       if USES_PG
-      # :nocov:
+      # simplecov:enable
         # +copy_table+ uses PostgreSQL's +COPY TO STDOUT+ SQL statement to return formatted
         # results directly to the caller.  This method is only supported if pg is the
         # underlying ruby driver.  This method should only be called if you want
@@ -544,10 +544,10 @@ module Sequel
       def adapter_initialize
         @use_iso_date_format = typecast_value_boolean(@opts.fetch(:use_iso_date_format, true))
         initialize_postgres_adapter
-        # :nocov:
+        # simplecov:disable
         add_conversion_proc(17, method(:unescape_bytea)) if USES_PG
         add_conversion_proc(1082, TYPE_TRANSLATOR_DATE) if @use_iso_date_format
-        # :nocov:
+        # simplecov:enable
         self.convert_infinite_timestamps = @opts[:convert_infinite_timestamps]
       end
 
@@ -560,19 +560,19 @@ module Sequel
       # Set the DateStyle to ISO if configured, for faster date parsing.
       def connection_configuration_sqls(opts=@opts)
         sqls = super
-        # :nocov:
+        # simplecov:disable
         sqls << "SET DateStyle = 'ISO'" if @use_iso_date_format
-        # :nocov:
+        # simplecov:enable
         sqls
       end
 
-      # :nocov:
+      # simplecov:disable
       if USES_PG
         def unescape_bytea(s)
           ::Sequel::SQL::Blob.new(Adapter.unescape_bytea(s))
         end
       end
-      # :nocov:
+      # simplecov:enable
 
       DATABASE_ERROR_CLASSES = [PGError].freeze
       def database_error_classes
@@ -586,9 +586,9 @@ module Sequel
       end
 
       def database_exception_sqlstate(exception, opts)
-        # :nocov:
+        # simplecov:disable
         if exception.respond_to?(:result) && (result = exception.result)
-        # :nocov:
+        # simplecov:enable
           result.error_field(PGresult::PG_DIAG_SQLSTATE)
         end
       end
@@ -699,9 +699,9 @@ module Sequel
         clone(:where=>Sequel.lit(['CURRENT OF '], Sequel.identifier(cursor_name)))
       end
 
-      # :nocov:
+      # simplecov:disable
       if USES_PG
-      # :nocov:
+      # simplecov:enable
         PREPARED_ARG_PLACEHOLDER = LiteralString.new('$').freeze
         
         # PostgreSQL specific argument mapper used for mapping the named
@@ -804,7 +804,7 @@ module Sequel
       end
       
       # Set the columns based on the result set, and return the array of
-      # field numers, type conversion procs, and name symbol arrays.
+      # field numbers, type conversion procs, and name symbol arrays.
       def fetch_rows_set_cols(res)
         cols = []
         procs = db.conversion_procs
@@ -848,7 +848,7 @@ module Sequel
   end
 end
 
-# :nocov:
+# simplecov:disable
 if Sequel::Postgres::USES_PG && !ENV['NO_SEQUEL_PG']
   begin
     require 'sequel_pg'
@@ -860,4 +860,4 @@ if Sequel::Postgres::USES_PG && !ENV['NO_SEQUEL_PG']
   rescue LoadError
   end
 end
-# :nocov:
+# simplecov:enable

data/lib/sequel/adapters/shared/db2.rb

@@ -153,7 +153,7 @@ module Sequel
       end
 
       # REORG the related table whenever it is altered.  This is not always
-      # required, but it is necessary for compatibilty with other Sequel
+      # required, but it is necessary for compatibility with other Sequel
       # code in many cases.
       def apply_alter_table(name, ops)
         alter_table_sql_list(name, ops).each do |sql|
@@ -437,7 +437,7 @@ module Sequel
         '1'
       end
 
-      # DB2 uses a literal hexidecimal number for blob strings
+      # DB2 uses a literal hexadecimal number for blob strings
       def literal_blob_append(sql, v)
         if db.use_clob_as_blob
           super

data/lib/sequel/adapters/shared/mssql.rb

@@ -42,7 +42,7 @@ module Sequel
       #
       # :result :: The result code of the stored procedure
       # :numrows :: The number of rows affected by the stored procedure
-      # output params :: Values for any output paramters, using the name given for the output parameter
+      # output params :: Values for any output parameters, using the name given for the output parameter
       #
       # Because Sequel datasets only support a single result set per query, and retrieving 
       # the result code and number of rows requires a query, this does not support
@@ -672,7 +672,7 @@ module Sequel
         end
       end
 
-      # MSSQL treats [] as a metacharacter in LIKE expresions.
+      # MSSQL treats [] as a metacharacter in LIKE expressions.
       def escape_like(string)
         string.gsub(/[\\%_\[\]]/){|m| "\\#{m}"}
       end
@@ -941,7 +941,7 @@ module Sequel
       # Allow update and delete for unordered, limited datasets only.
       def check_not_limited!(type)
         return if @opts[:skip_limit_check] && type != :truncate
-        raise Sequel::InvalidOperation, "Dataset##{type} not suppored on ordered, limited datasets" if opts[:order] && opts[:limit]
+        raise Sequel::InvalidOperation, "Dataset##{type} not supported on ordered, limited datasets" if opts[:order] && opts[:limit]
         super if type == :truncate || @opts[:offset]
       end
 
@@ -1040,7 +1040,7 @@ module Sequel
         end
       end
 
-      # MSSQL uses a literal hexidecimal number for blob strings
+      # MSSQL uses a literal hexadecimal number for blob strings
       def literal_blob_append(sql, v)
         sql << '0x' << v.unpack("H*").first
       end

data/lib/sequel/adapters/shared/mysql.rb

@@ -381,7 +381,7 @@ module Sequel
         'AUTO_INCREMENT'
       end
       
-      # MySQL needs to set transaction isolation before begining a transaction
+      # MySQL needs to set transaction isolation before beginning a transaction
       def begin_new_transaction(conn, opts)
         set_transaction_isolation(conn, opts)
         log_connection_execute(conn, begin_transaction_sql)
@@ -937,7 +937,7 @@ module Sequel
       end
 
       # Check the database setting for whether fractional timestamps
-      # are suppported.
+      # are supported.
       def supports_timestamp_usecs?
         db.supports_timestamp_usecs?
       end