sequel 4.49.0 → 5.0.0

data/lib/sequel/adapters/odbc.rb

@@ -11,13 +11,6 @@ module Sequel
     class Database < Sequel::Database
       set_adapter_scheme :odbc
 
-      GUARDED_DRV_NAME = /^\{.+\}$/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :GUARDED_DRV_NAME)
-      DRV_NAME_GUARDS = '{%s}'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DRV_NAME_GUARDS)
-      DISCONNECT_ERRORS = /\A08S01/.freeze 
-      Sequel::Deprecation.deprecate_constant(self, :DISCONNECT_ERRORS)
-
       def connect(server)
         opts = server_opts(server)
         conn = if opts.include?(:drvconnect)
@@ -93,18 +86,6 @@ module Sequel
     end
     
     class Dataset < Sequel::Dataset
-      BOOL_TRUE = '1'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-      BOOL_FALSE = '0'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-      ODBC_DATE_FORMAT = "{d '%Y-%m-%d'}".freeze
-      Sequel::Deprecation.deprecate_constant(self, :ODBC_DATE_FORMAT)
-      TIMESTAMP_FORMAT="{ts '%Y-%m-%d %H:%M:%S'}".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TIMESTAMP_FORMAT)
-
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-
       def fetch_rows(sql)
         execute(sql) do |s|
           i = -1

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/db2'
+require_relative '../shared/db2'
 
 Sequel.synchronize do
   Sequel::ODBC::DATABASE_SETUP[:db2] = proc do |db|

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

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/mssql'
+require_relative '../shared/mssql'
 
 module Sequel
   module ODBC
@@ -12,15 +12,10 @@ module Sequel
       end
     end
 
-    # Database and Dataset instance methods for MSSQL specific
-    # support via ODBC.
     module MSSQL
       module DatabaseMethods
         include Sequel::MSSQL::DatabaseMethods
-        LAST_INSERT_ID_SQL='SELECT SCOPE_IDENTITY()'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :LAST_INSERT_ID_SQL)
-        
-        # Return the last inserted identity value.
+
         def execute_insert(sql, opts=OPTS)
           synchronize(opts[:server]) do |conn|
             begin
@@ -43,13 +38,10 @@ module Sequel
       class Dataset < ODBC::Dataset
         include Sequel::MSSQL::DatasetMethods
 
-        # Use ODBC format, not Microsoft format, as the ODBC layer does
-        # some translation.  MSSQL version is over-ridden to allow 3 millisecond decimal places        
-        TIMESTAMP_FORMAT="{ts '%Y-%m-%d %H:%M:%S%N'}".freeze
-        Sequel::Deprecation.deprecate_constant(self, :TIMESTAMP_FORMAT)
-
         private
 
+        # Use ODBC format, not Microsoft format, as the ODBC layer does
+        # some translation, but allow for millisecond precision.
         def default_timestamp_format
           "{ts '%Y-%m-%d %H:%M:%S%N'}"
         end

data/lib/sequel/adapters/odbc/oracle.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/oracle'
+require_relative '../shared/oracle'
 
 Sequel.synchronize do
   Sequel::ODBC::DATABASE_SETUP[:oracle] = proc do |db|

data/lib/sequel/adapters/oracle.rb

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 require 'oci8'
-Sequel.require 'adapters/shared/oracle'
+require_relative 'shared/oracle'
 
 module Sequel
   module Oracle
@@ -13,12 +13,12 @@ module Sequel
       # ORA-01012: not logged on
       # ORA-03113: end-of-file on communication channel
       # ORA-03114: not connected to ORACLE
-      CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114 ]#.freeze # SEQUEL5
+      CONNECTION_ERROR_CODES = [ 28, 1012, 3113, 3114 ].freeze
       
       ORACLE_TYPES = {
         :blob=>lambda{|b| Sequel::SQL::Blob.new(b.read)},
-        :clob=>lambda(&:read)
-      }#.freeze # SEQUEL5
+        :clob=>:read.to_proc
+      }.freeze
 
       # Hash of conversion procs for this database.
       attr_reader :conversion_procs
@@ -40,8 +40,8 @@ module Sequel
         
         # The ruby-oci8 gem which retrieves oracle columns with a type of
         # DATE, TIMESTAMP, TIMESTAMP WITH TIME ZONE is complex based on the
-        # ruby version (1.9.2 or later) and Oracle version (9 or later)
-        # In the now standard case of 1.9.2 and Oracle 9 or later, the timezone
+        # ruby version and Oracle version (9 or later)
+        # In the now standard case of Oracle 9 or later, the timezone
         # is determined by the Oracle session timezone. Thus if the user
         # requests Sequel provide UTC timezone to the application,
         # we need to alter the session timezone to be UTC
@@ -114,7 +114,7 @@ module Sequel
 
       PS_TYPES = {'string'=>String, 'integer'=>Integer, 'float'=>Float,
         'decimal'=>Float, 'date'=>Time, 'datetime'=>Time,
-        'time'=>Time, 'boolean'=>String, 'blob'=>OCI8::BLOB}#.freeze # SEQUEL5
+        'time'=>Time, 'boolean'=>String, 'blob'=>OCI8::BLOB}.freeze
       def cursor_bind_params(conn, cursor, args)
         i = 0
         args.map do |arg, type|
@@ -324,12 +324,6 @@ module Sequel
     class Dataset < Sequel::Dataset
       include DatasetMethods
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-
-      PREPARED_ARG_PLACEHOLDER = ':'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PREPARED_ARG_PLACEHOLDER)
-      
       # Oracle already supports named bind arguments, so use directly.
       module ArgumentMapper
         include Sequel::Dataset::ArgumentMapper

data/lib/sequel/adapters/postgres.rb

@@ -1,6 +1,6 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/postgres'
+require_relative 'shared/postgres'
 
 begin 
   require 'pg' 
@@ -26,12 +26,6 @@ end
 
 module Sequel
   module Postgres
-    # SEQUEL5: Remove
-    TYPE_CONVERTOR = Class.new do
-      def bytea(s) ::Sequel::SQL::Blob.new(Adapter.unescape_bytea(s)) end
-    end.new
-    Sequel::Deprecation.deprecate_constant(self, :TYPE_CONVERTOR)
-
     if Sequel::Postgres::USES_PG
       # Whether the given sequel_pg version integer is supported.
       def self.sequel_pg_version_supported?(version)
@@ -39,19 +33,6 @@ module Sequel
       end
     end
 
-    # SEQUEL5: Remove
-    @use_iso_date_format = true
-    class << self
-      def use_iso_date_format
-        Sequel::Deprecation.deprecate("Sequel::Postgres.use_iso_date_format", "Use the :use_iso_date_format Database option instead")
-        @use_iso_date_format
-      end
-      def use_iso_date_format=(v)
-        Sequel::Deprecation.deprecate("Sequel::Postgres.use_iso_date_format=", "Use the :use_iso_date_format Database option instead")
-        @use_iso_date_format = v
-      end
-    end
-
     # PGconn subclass for connection specific methods used with the
     # pg or postgres-pr driver.
     class Adapter < PGconn
@@ -61,7 +42,7 @@ module Sequel
       if defined?(::PG::ConnectionBad)
         DISCONNECT_ERROR_CLASSES << ::PG::ConnectionBad
       end
-      #DISCONNECT_ERROR_CLASSES.freeze # SEQUEL5
+      DISCONNECT_ERROR_CLASSES.freeze
       
       disconnect_errors = [
         'could not receive data from server',
@@ -89,7 +70,6 @@ module Sequel
         # Escape bytea values.  Uses historical format instead of hex
         # format for maximum compatibility.
         def escape_bytea(str)
-          # each_byte used instead of [] for 1.9 compatibility
           str.gsub(/[\000-\037\047\134\177-\377]/n){|b| "\\#{sprintf('%o', b.each_byte{|x| break x}).rjust(3, '0')}"}
         end
         
@@ -160,15 +140,12 @@ module Sequel
 
       private
 
-      # Return the PGResult object that is returned by executing the given
-      # sql and args.
+      # Return the PGResult containing the query results.
       def execute_query(sql, args)
         @db.log_connection_yield(sql, self, args){args ? async_exec(sql, args) : async_exec(sql)}
       end
     end
     
-    # Database class for PostgreSQL databases used with Sequel and the
-    # pg, postgres, or postgres-pr driver.
     class Database < Sequel::Database
       include Sequel::Postgres::DatabaseMethods
 
@@ -185,15 +162,12 @@ module Sequel
       attr_reader :convert_infinite_timestamps
 
       # Convert given argument so that it can be used directly by pg.  Currently, pg doesn't
-      # handle fractional seconds in Time/DateTime or blobs with "\0", and it won't ever
-      # handle Sequel::SQLTime values correctly.  Only public for use by the adapter, shouldn't
-      # be used by external code.
+      # handle fractional seconds in Time/DateTime or blobs with "\0". Only public for use by
+      # the adapter, shouldn't be used by external code.
       def bound_variable_arg(arg, conn)
         case arg
         when Sequel::SQL::Blob
           {:value=>arg, :type=>17, :format=>1}
-        when Sequel::SQLTime
-          literal(arg)
         when DateTime, Time
           literal(arg)
         else
@@ -230,7 +204,7 @@ module Sequel
             conn.set_notice_receiver(&receiver)
           end
         else
-          unless typecast_value_boolean(@opts.fetch(:force_standard_strings, Postgres.instance_variable_get(:@force_standard_strings))) # , true)) # SEQUEL5
+          unless typecast_value_boolean(@opts.fetch(:force_standard_strings, true))
             raise Error, "Cannot create connection using postgres-pr unless force_standard_strings is set"
           end
 
@@ -290,7 +264,6 @@ module Sequel
         add_conversion_proc(1082, pr)
       end
 
-      # Disconnect given connection
       def disconnect_connection(conn)
         conn.finish
       rescue PGError, IOError
@@ -322,7 +295,6 @@ module Sequel
         end
       end
       
-      # Execute the given SQL with the given args on an available connection.
       def execute(sql, opts=OPTS, &block)
         synchronize(opts[:server]){|conn| check_database_errors{_execute(conn, sql, opts, &block)}}
       end
@@ -524,7 +496,7 @@ module Sequel
       # Add the primary_keys and primary_key_sequences instance variables,
       # so we can get the correct return values for inserted rows.
       def adapter_initialize
-        @use_iso_date_format = typecast_value_boolean(@opts.fetch(:use_iso_date_format, Postgres.instance_variable_get(:@use_iso_date_format))) # , true)) # SEQUEL5
+        @use_iso_date_format = typecast_value_boolean(@opts.fetch(:use_iso_date_format, true))
         initialize_postgres_adapter
         add_conversion_proc(17, method(:unescape_bytea)) if USES_PG
         add_conversion_proc(1082, TYPE_TRANSLATOR.method(:date)) if @use_iso_date_format
@@ -629,7 +601,7 @@ module Sequel
       end
 
       # If the value is an infinite value (either an infinite float or a string returned by
-      # by PostgreSQL for an infinite timestamp), return it without converting it if
+      # by PostgreSQL for an infinite date), return it without converting it if
       # convert_infinite_timestamps is set.
       def typecast_value_date(value)
         if convert_infinite_timestamps
@@ -661,20 +633,9 @@ module Sequel
       end
     end
     
-    # Dataset class for PostgreSQL datasets that use the pg, postgres, or
-    # postgres-pr driver.
     class Dataset < Sequel::Dataset
       include Sequel::Postgres::DatasetMethods
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-      APOS = "'".freeze
-      Sequel::Deprecation.deprecate_constant(self, :APOS)
-      DEFAULT_CURSOR_NAME = 'sequel_cursor'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DEFAULT_CURSOR_NAME)
-      
-      # Yield all rows returned by executing the given SQL and converting
-      # the types.
       def fetch_rows(sql)
         return cursor_fetch_rows(sql){|h| yield h} if @opts[:cursor]
         execute(sql){|res| yield_hash_rows(res, fetch_rows_set_cols(res)){|h| yield h}}
@@ -702,8 +663,8 @@ module Sequel
       # Usage:
       #
       #   DB[:huge_table].use_cursor.each{|row| p row}
-      #   DB[:huge_table].use_cursor(:rows_per_fetch=>10000).each{|row| p row}
-      #   DB[:huge_table].use_cursor(:cursor_name=>'my_cursor').each{|row| p row}      
+      #   DB[:huge_table].use_cursor(rows_per_fetch: 10000).each{|row| p row}
+      #   DB[:huge_table].use_cursor(cursor_name: 'my_cursor').each{|row| p row}      
       #
       # This is untested with the prepared statement/bound variable support,
       # and unlikely to work with either.
@@ -716,15 +677,14 @@ module Sequel
       # large dataset by updating individual rows while processing the dataset
       # via a cursor:
       #
-      #   DB[:huge_table].use_cursor(:rows_per_fetch=>1).each do |row|
-      #     DB[:huge_table].where_current_of.update(:column=>ruby_method(row))
+      #   DB[:huge_table].use_cursor(rows_per_fetch: 1).each do |row|
+      #     DB[:huge_table].where_current_of.update(column: ruby_method(row))
       #   end
       def where_current_of(cursor_name='sequel_cursor')
         clone(:where=>Sequel.lit(['CURRENT OF '], Sequel.identifier(cursor_name)))
       end
 
       if USES_PG
-        
         PREPARED_ARG_PLACEHOLDER = LiteralString.new('$').freeze
         
         # PostgreSQL specific argument mapper used for mapping the named
@@ -789,7 +749,7 @@ module Sequel
         cursor_name = quote_identifier(cursor[:cursor_name] || 'sequel_cursor')
         rows_per_fetch = cursor[:rows_per_fetch].to_i
 
-        db.send(*(hold ? [:synchronize, server_opts[:server]] : [:transaction, server_opts])) do 
+        db.public_send(*(hold ? [:synchronize, server_opts[:server]] : [:transaction, server_opts])) do 
           begin
             execute_ddl("DECLARE #{cursor_name} NO SCROLL CURSOR WITH#{'OUT' unless hold} HOLD FOR #{sql}", server_opts)
             rows_per_fetch = 1000 if rows_per_fetch <= 0
@@ -869,7 +829,3 @@ if Sequel::Postgres::USES_PG && !ENV['NO_SEQUEL_PG']
   rescue LoadError
   end
 end
-
-# SEQUEL5: Remove
-SEQUEL_POSTGRES_USES_PG = Sequel::Postgres::USES_PG
-Sequel::Deprecation.deprecate_constant(Object, :SEQUEL_POSTGRES_USES_PG)

data/lib/sequel/adapters/postgresql.rb

@@ -1,3 +1,3 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/postgres'
+require_relative 'postgres'

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

@@ -1,6 +1,7 @@
 # frozen-string-literal: true
 
-Sequel.require %w'emulate_offset_with_reverse_and_count unmodified_identifiers', 'adapters/utils'
+require_relative '../utils/emulate_offset_with_reverse_and_count'
+require_relative '../utils/unmodified_identifiers'
 
 module Sequel
   module Access
@@ -9,7 +10,6 @@ module Sequel
     module DatabaseMethods
       include UnmodifiedIdentifiers::DatabaseMethods
 
-      # Access uses type :access as the database_type
       def database_type
         :access
       end
@@ -56,7 +56,6 @@ module Sequel
         DATABASE_ERROR_REGEXPS
       end
 
-      # The SQL to drop an index for the table.
       def drop_index_sql(table, op)
         "DROP INDEX #{quote_identifier(op[:name] || default_index_name(table, op[:columns]))} ON #{quote_schema_table(table)}"
       end
@@ -85,52 +84,12 @@ module Sequel
       include EmulateOffsetWithReverseAndCount
       include UnmodifiedIdentifiers::DatasetMethods
 
-      EXTRACT_MAP = {:year=>"'yyyy'", :month=>"'m'", :day=>"'d'", :hour=>"'h'", :minute=>"'n'", :second=>"'s'"}#.freeze # SEQUEL5
-      #EXTRACT_MAP.each_value(&:freeze) # SEQUEL5
-      OPS = {:'%'=>' Mod '.freeze, :'||'=>' & '.freeze}#.freeze # SEQUEL5
-      CAST_TYPES = {String=>:CStr, Integer=>:CLng, Date=>:CDate, Time=>:CDate, DateTime=>:CDate, Numeric=>:CDec, BigDecimal=>:CDec, File=>:CStr, Float=>:CDbl, TrueClass=>:CBool, FalseClass=>:CBool}#.freeze # SEQUEL5
-
-      DATE_FORMAT = '#%Y-%m-%d#'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATE_FORMAT)
-      TIMESTAMP_FORMAT = '#%Y-%m-%d %H:%M:%S#'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TIMESTAMP_FORMAT)
-      TOP = " TOP ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :TOP)
-      BRACKET_CLOSE =  ']'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BRACKET_CLOSE)
-      BRACKET_OPEN = '['.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BRACKET_OPEN)
-      COMMA = ', '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :COMMA)
-      PAREN_CLOSE = ')'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
-      PAREN_OPEN = '('.freeze
-      Sequel::Deprecation.deprecate_constant(self, :PAREN_OPEN)
-      INTO = " INTO ".freeze
-      Sequel::Deprecation.deprecate_constant(self, :INTO)
-      FROM = ' FROM '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :FROM)
-      SPACE = ' '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :SPACE)
-      NOT_EQUAL = ' <> '.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NOT_EQUAL)
-      BOOL_FALSE = '0'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-      BOOL_TRUE = '-1'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-      DATE_FUNCTION = 'Date()'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATE_FUNCTION)
-      NOW_FUNCTION = 'Now()'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :NOW_FUNCTION)
-      TIME_FUNCTION = 'Time()'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TIME_FUNCTION)
-      DATEPART_OPEN = "datepart(".freeze
-      Sequel::Deprecation.deprecate_constant(self, :DATEPART_OPEN)
-      EMULATED_FUNCTION_MAP = {:char_length=>:len}
-      Sequel::Deprecation.deprecate_constant(self, :EMULATED_FUNCTION_MAP)
-
-      # Access doesn't support CASE, but it can be emulated with nested
-      # IIF function calls.
+      EXTRACT_MAP = {:year=>"'yyyy'", :month=>"'m'", :day=>"'d'", :hour=>"'h'", :minute=>"'n'", :second=>"'s'"}.freeze
+      EXTRACT_MAP.each_value(&:freeze)
+      OPS = {:'%'=>' Mod '.freeze, :'||'=>' & '.freeze}.freeze
+      CAST_TYPES = {String=>:CStr, Integer=>:CLng, Date=>:CDate, Time=>:CDate, DateTime=>:CDate, Numeric=>:CDec, BigDecimal=>:CDec, File=>:CStr, Float=>:CDbl, TrueClass=>:CBool, FalseClass=>:CBool}.freeze
+
+      # Access doesn't support CASE, so emulate it with nested IIF function calls.
       def case_expression_sql_append(sql, ce)
         literal_append(sql, ce.with_merged_expression.conditions.reverse.inject(ce.default){|exp,(cond,val)| Sequel::SQL::Function.new(:IIF, cond, val, exp)})
       end
@@ -189,7 +148,7 @@ module Sequel
         end
       end
 
-      # Use Date() and Now() for CURRENT_DATE and CURRENT_TIMESTAMP
+      # Use Date(), Now(), and Time() for CURRENT_DATE, CURRENT_TIMESTAMP, and CURRENT_TIME
       def constant_sql_append(sql, constant)
         case constant
         when :CURRENT_DATE
@@ -317,7 +276,8 @@ module Sequel
         end
       end
 
-      # Access uses [] for quoting identifiers
+      # Access uses [] for quoting identifiers, and can't handle
+      # ] inside identifiers.
       def quoted_identifier_append(sql, v)
         sql << '[' << v.to_s << ']'
       end