sequel 4.49.0 → 5.0.0

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

@@ -1,21 +1,14 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/mssql'
+require_relative '../shared/mssql'
 
 module Sequel
   module ADO
-    # Database and Dataset instance methods for MSSQL specific
-    # support via ADO.
     module MSSQL
       module DatabaseMethods
         include Sequel::MSSQL::DatabaseMethods
-        # Query to use to get the number of rows affected by an update or
-        # delete query.
-        ROWS_AFFECTED = "SELECT @@ROWCOUNT AS AffectedRows"
-        Sequel::Deprecation.deprecate_constant(self, :ROWS_AFFECTED)
-        
         # Issue a separate query to get the rows modified.  ADO appears to
-        # use pass by reference with an integer variable, which is obviously
+        # use pass by reference with an integer variable, which is
         # not supported directly in ruby, and I'm not aware of a workaround.
         def execute_dui(sql, opts=OPTS)
           return super unless @opts[:provider]

data/lib/sequel/adapters/amalgalite.rb

@@ -1,11 +1,9 @@
 # frozen-string-literal: true
 
 require 'amalgalite'
-Sequel.require 'adapters/shared/sqlite'
+require_relative 'shared/sqlite'
 
 module Sequel
-  # Top level module for holding all Amalgalite-related modules and classes
-  # for Sequel.
   module Amalgalite
     # Type conversion map class for Sequel's use of Amalgamite
     class SequelTypeMap < ::Amalgalite::TypeMaps::DefaultMap
@@ -50,15 +48,13 @@ module Sequel
         if value.is_a?(::Amalgalite::Blob)
           SQL::Blob.new(value.to_s)
         elsif value.is_a?(String) && declared_type
-          (meth = self.class.sql_to_method(declared_type.downcase)) ? send(meth, value) : value
+          (meth = self.class.sql_to_method(declared_type.downcase)) ? public_send(meth, value) : value
         else
           super
         end
       end
     end
     
-    # Database class for SQLite databases used with Sequel and the
-    # amalgalite driver.
     class Database < Sequel::Database
       include ::Sequel::SQLite::DatabaseMethods
       
@@ -85,28 +81,23 @@ module Sequel
         db
       end
       
-      # Amalgalite is just the SQLite database without a separate SQLite installation.
       def database_type
         :sqlite
       end
 
-      # Run the given SQL with the given arguments. Returns nil.
       def execute_ddl(sql, opts=OPTS)
         _execute(sql, opts){|conn| log_connection_yield(sql, conn){conn.execute_batch(sql)}}
         nil
       end
       
-      # Run the given SQL with the given arguments and return the number of changed rows.
       def execute_dui(sql, opts=OPTS)
         _execute(sql, opts){|conn| log_connection_yield(sql, conn){conn.execute_batch(sql)}; conn.row_changes}
       end
       
-      # Run the given SQL with the given arguments and return the last inserted row id.
       def execute_insert(sql, opts=OPTS)
         _execute(sql, opts){|conn| log_connection_yield(sql, conn){conn.execute_batch(sql)}; conn.last_insert_rowid}
       end
       
-      # Run the given SQL with the given arguments and yield each row.
       def execute(sql, opts=OPTS)
         _execute(sql, opts) do |conn|
           begin
@@ -149,20 +140,14 @@ module Sequel
         Dataset
       end
 
-      # Both main error classes that Amalgalite raises
       def database_error_classes
         [::Amalgalite::Error, ::Amalgalite::SQLite3::Error]
       end
     end
     
-    # Dataset class for SQLite datasets that use the amalgalite driver.
     class Dataset < Sequel::Dataset
       include ::Sequel::SQLite::DatasetMethods
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-      
-      # Yield a hash for each row in the dataset.
       def fetch_rows(sql)
         execute(sql) do |stmt|
           self.columns = cols = stmt.result_fields.map{|c| output_identifier(c)}
@@ -177,7 +162,7 @@ module Sequel
 
       private
       
-      # Quote the string using the adapter instance method.
+      # Quote the string using the connection instance method.
       def literal_string_append(sql, v)
         db.synchronize(@opts[:server]){|c| sql << c.quote(v)}
       end

data/lib/sequel/adapters/ibmdb.rb

@@ -1,24 +1,11 @@
 # frozen-string-literal: true
 
 require 'ibm_db'
-Sequel.require 'adapters/shared/db2'
+require_relative 'shared/db2'
 
 module Sequel
 
   module IBMDB
-    # SEQUEL5: Remove
-    @convert_smallint_to_bool = true
-    class << self
-      def convert_smallint_to_bool
-        Sequel::Deprecation.deprecate("Sequel::IBMDB.convert_smallint_to_bool", "Call this method on the Database instance")
-        @convert_smallint_to_bool
-      end
-      def convert_smallint_to_bool=(v)
-        Sequel::Deprecation.deprecate("Sequel::IBMDB.convert_smallint_to_bool=", "Call this method on the Database instance")
-        @convert_smallint_to_bool = v
-      end
-    end
-
     tt = Class.new do
       def boolean(s) !s.to_i.zero? end
       def int(s) s.to_i end
@@ -31,19 +18,15 @@ module Sequel
       :blob => ::Sequel::SQL::Blob.method(:new),
       :time => ::Sequel.method(:string_to_time),
       :date => ::Sequel.method(:string_to_date)
-    }#.freeze # SEQUEL5
+    }.freeze
 
-    # Wraps an underlying connection to DB2 using IBM_DB.
+    # Wraps an underlying connection to DB2 using IBM_DB, to provide a more
+    # rubyish API.
     class Connection
       # A hash with prepared statement name symbol keys, where each value is 
       # a two element array with an sql string and cached Statement value.
       attr_reader :prepared_statements
 
-      def prepared_statements=(v)
-        Sequel::Deprecation.deprecate("Sequel::IBMDB::Connection#prepared_statements=", "Use replace on the hash instead of reassigning it")
-        @prepared_statements = v
-      end
-
       # Error class for exceptions raised by the connection.
       class Error < StandardError
         attr_reader :sqlstate
@@ -199,14 +182,7 @@ module Sequel
       attr_reader :conversion_procs
 
       # Whether to convert smallint values to bool for this Database instance
-      #attr_accessor :convert_smallint_to_bool # SEQUEL5
-
-      # SEQUEL5: Remove
-      attr_writer :convert_smallint_to_bool
-      def convert_smallint_to_bool
-        v = @convert_smallint_to_bool
-        v.nil? ? Sequel::IBMDB.instance_variable_get(:@convert_smallint_to_bool) : v
-      end
+      attr_accessor :convert_smallint_to_bool
     
       # Create a new connection object for the given server.
       def connect(server)
@@ -229,7 +205,6 @@ module Sequel
         Connection.new(connection_params)
       end
 
-      # Execute the given SQL on the database.
       def execute(sql, opts=OPTS, &block)
         if sql.is_a?(Symbol)
           execute_prepared_statement(sql, opts, &block)
@@ -240,8 +215,6 @@ module Sequel
         raise_error(e)
       end
 
-      # Execute the given SQL on the database, returning the last inserted
-      # identity value.
       def execute_insert(sql, opts=OPTS)
         synchronize(opts[:server]) do |c|
           if sql.is_a?(Symbol)
@@ -291,7 +264,8 @@ module Sequel
 
       private
 
-      # Execute the given SQL on the database.
+      # Execute the given SQL on the database, yielding the related statement if a block
+      # is given or returning the number of affected rows if not, and ensuring the statement is freed.
       def _execute(conn, sql, opts)
         stmt = log_connection_yield(sql, conn){conn.execute(sql)}
         if block_given?
@@ -304,7 +278,7 @@ module Sequel
       end
 
       def adapter_initialize
-        #@convert_smallint_to_bool = typecast_value_boolean(opts.fetch(:convert_smallint_to_bool, true)) # SEQUEL5
+        @convert_smallint_to_bool = typecast_value_boolean(opts.fetch(:convert_smallint_to_bool, true))
         @conversion_procs = DB2_TYPES.dup
         @conversion_procs[:timestamp] = method(:to_application_timestamp)
       end
@@ -381,9 +355,6 @@ module Sequel
     class Dataset < Sequel::Dataset
       include Sequel::DB2::DatasetMethods
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-
       module CallableStatementMethods
         # Extend given dataset with this module so subselects inside subselects in
         # prepared statements work.
@@ -398,14 +369,8 @@ module Sequel
       
       PreparedStatementMethods = prepared_statements_module(:prepare_bind, Sequel::Dataset::UnnumberedArgumentMapper)
 
-      # Override the default IBMDB.convert_smallint_to_bool setting for this dataset.
-      def convert_smallint_to_bool=(v)
-        Sequel::Deprecation.deprecate("Sequel::IBMDB::Dataset#convert_smallint_to_bool=", "Call with_convert_smallint_to_bool instead, which returns a modified copy instead of modifying the object")
-        @opts[:convert_smallint_to_bool] = v
-      end
-
       # Whether to convert smallint to boolean arguments for this dataset.
-      # Defaults to the IBMDB module setting.
+      # Defaults to the Database setting.
       def convert_smallint_to_bool
         opts.has_key?(:convert_smallint_to_bool) ? opts[:convert_smallint_to_bool] : db.convert_smallint_to_bool
       end
@@ -415,7 +380,6 @@ module Sequel
         clone(:convert_smallint_to_bool=>v)
       end
 
-      # Fetch the rows from the database and yield plain hashes.
       def fetch_rows(sql)
         execute(sql) do |stmt|
           columns = []

data/lib/sequel/adapters/jdbc.rb

@@ -1,37 +1,19 @@
 # frozen-string-literal: true
 
 require 'java'
-Sequel.require 'adapters/utils/stored_procedures'
+require_relative 'utils/stored_procedures'
 
 module Sequel
-  # Houses Sequel's JDBC support when running on JRuby.
   module JDBC
-    # Make it accesing the java.lang hierarchy more ruby friendly.
-    module JavaLang
-      include_package 'java.lang'
-    end
-    Sequel::Deprecation.deprecate_constant(self, :JavaLang)
-    
     # Make it accesing the java.sql hierarchy more ruby friendly.
     module JavaSQL
       include_package 'java.sql'
     end
 
-    # Make it accesing the javax.naming hierarchy more ruby friendly.
-    module JavaxNaming
-      include_package 'javax.naming'
-    end
-    Sequel::Deprecation.deprecate_constant(self, :JavaxNaming)
-
     # Used to identify a jndi connection and to extract the jndi
     # resource name.
     JNDI_URI_REGEXP = /\Ajdbc:jndi:(.+)/
     
-    # The types to check for 0 scale to transform :decimal types
-    # to :integer.
-    DECIMAL_TYPE_RE = /number|numeric|decimal/io
-    Sequel::Deprecation.deprecate_constant(self, :DECIMAL_TYPE_RE)
-    
     # Contains procs keyed on subadapter type that extend the
     # given database object so it supports the correct database type.
     DATABASE_SETUP = {}
@@ -100,8 +82,7 @@ module Sequel
         end
       end
 
-      INSTANCE = new
-      o = INSTANCE
+      o = new
       MAP = Hash.new(o.method(:Object))
       types = Java::JavaSQL::Types
 
@@ -143,16 +124,9 @@ module Sequel
 
       MAP.freeze
       BASIC_MAP.freeze
-      INSTANCE.freeze
-      # freeze # SEQUEL5
+      freeze
     end
 
-    # SEQUEL5: Remove
-    Type_Convertor = TypeConvertor
-    Sequel::Deprecation.deprecate_constant(self, :TypeConvertor)
-
-    # JDBC Databases offer a fairly uniform interface that does not change
-    # much based on the sub adapter.
     class Database < Sequel::Database
       set_adapter_scheme :jdbc
       
@@ -202,7 +176,8 @@ module Sequel
         end
       end
          
-      # Connect to the database using JavaSQL::DriverManager.getConnection.
+      # Connect to the database using JavaSQL::DriverManager.getConnection, and falling back
+      # to driver.new.connect if the driver is known.
       def connect(server)
         opts = server_opts(server)
         conn = if jndi?
@@ -245,8 +220,6 @@ module Sequel
         c.close
       end
       
-      # Execute the given SQL.  If a block is given, if should be a SELECT
-      # statement or something else that returns rows.
       def execute(sql, opts=OPTS, &block)
         return call_sproc(sql, opts, &block) if opts[:sproc]
         return execute_prepared_statement(sql, opts, &block) if [Symbol, Dataset].any?{|c| sql.is_a?(c)}
@@ -273,16 +246,12 @@ module Sequel
       end
       alias execute_dui execute
 
-      # Execute the given DDL SQL, which should not return any
-      # values or rows.
       def execute_ddl(sql, opts=OPTS)
         opts = Hash[opts]
         opts[:type] = :ddl
         execute(sql, opts)
       end
       
-      # Execute the given INSERT SQL, returning the last inserted
-      # row id.
       def execute_insert(sql, opts=OPTS)
         opts = Hash[opts]
         opts[:type] = :insert
@@ -520,27 +489,24 @@ module Sequel
       # Support DateTime objects used in bound variables
       def java_sql_datetime(datetime)
         ts = java.sql.Timestamp.new(Time.local(datetime.year, datetime.month, datetime.day, datetime.hour, datetime.min, datetime.sec).to_i * 1000)
-        ts.setNanos((datetime.sec_fraction * (RUBY_VERSION >= '1.9.0' ?  1000000000 : 86400000000000)).to_i)
+        ts.setNanos((datetime.sec_fraction * 1000000000).to_i)
         ts
       end
 
       # Support fractional seconds for Time objects used in bound variables
       def java_sql_timestamp(time)
         ts = java.sql.Timestamp.new(time.to_i * 1000)
-        # Work around jruby 1.6 ruby 1.9 mode bug # SEQUEL5: Remove workaround
-        ts.setNanos((RUBY_VERSION >= '1.9.0' && time.nsec != 0) ? time.nsec : time.usec * 1000)
+        ts.setNanos(time.nsec)
         ts
       end 
       
-      # Log the given SQL and then execute it on the connection, used by
-      # the transaction code.
       def log_connection_execute(conn, sql)
         statement(conn){|s| log_connection_yield(sql, conn){s.execute(sql)}}
       end
 
       # By default, there is no support for determining the last inserted
       # id, so return nil.  This method should be overridden in
-      # sub adapters.
+      # subadapters.
       def last_insert_id(conn, opts)
         nil
       end
@@ -548,7 +514,7 @@ module Sequel
       # Yield the metadata for this database
       def metadata(*args, &block)
         synchronize do |c|
-          result = c.getMetaData.send(*args)
+          result = c.getMetaData.public_send(*args)
           begin
             metadata_dataset.send(:process_result_set, result, &block)
           ensure
@@ -610,8 +576,7 @@ module Sequel
         cps.setString(i, nil)
       end
       
-      # Return the connection.  Used to do configuration on the
-      # connection object before adding it to the connection pool.
+      # Return the connection.  Can be overridden in subadapters for database specific setup.
       def setup_connection(conn)
         conn
       end
@@ -629,7 +594,6 @@ module Sequel
         end
       end
       
-      # Parse the table schema for the given table.
       def schema_parse_table(table, opts=OPTS)
         m = output_identifier_meth(opts[:dataset])
         schema, table = metadata_schema_and_table(table, opts)
@@ -668,8 +632,7 @@ module Sequel
         ts
       end
       
-      # Whether schema_parse_table should skip the given row when
-      # parsing the schema.
+      # Skip tables in the INFORMATION_SCHEMA when parsing columns.
       def schema_parse_table_skip?(h, schema)
         h[:table_schem] == 'INFORMATION_SCHEMA'
       end
@@ -681,9 +644,8 @@ module Sequel
       # Called before loading subadapter-specific code, necessary so that subadapter initialization code
       # that runs queries works correctly.  This cannot be overriding in subadapters,
       def setup_type_convertor_map_early
-        # SEQUEL5: Change back to TypeConvertor
-        @type_convertor_map = Type_Convertor::MAP.merge(Java::JavaSQL::Types::TIMESTAMP=>method(:timestamp_convert))
-        @basic_type_convertor_map = Type_Convertor::BASIC_MAP.dup
+        @type_convertor_map = TypeConvertor::MAP.merge(Java::JavaSQL::Types::TIMESTAMP=>method(:timestamp_convert))
+        @basic_type_convertor_map = TypeConvertor::BASIC_MAP.dup
       end
 
       # Yield a new statement object, and ensure that it is closed before returning.
@@ -703,27 +665,17 @@ module Sequel
           to_application_timestamp([v.getYear + 1900, v.getMonth + 1, v.getDate, v.getHours, v.getMinutes, v.getSeconds, v.getNanos])
         end
       end
-
-      # SEQUEL5: Remove
-      def timestamp_convertor
-        Sequel::Deprecation.deprecate("Sequel::JDBC::Database#timestamp_convertor", "Use method(:timestamp_convert) instead")
-        method(:timestamp_convert)
-      end
     end
     
     class Dataset < Sequel::Dataset
       include StoredProcedures
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-      
       PreparedStatementMethods = prepared_statements_module(
         "sql = self; opts = Hash[opts]; opts[:arguments] = bind_arguments",
         Sequel::Dataset::UnnumberedArgumentMapper,
         %w"execute execute_dui") do
           private
 
-          # Same as execute, explicit due to intricacies of alias and super.
           def execute_insert(sql, opts=OPTS)
             sql = self
             opts = Hash[opts]
@@ -739,7 +691,6 @@ module Sequel
         %w"execute execute_dui") do
           private
 
-          # Same as execute, explicit due to intricacies of alias and super.
           def execute_insert(sql, opts=OPTS)
             sql = @opts[:sproc_name]
             opts = Hash[opts]
@@ -750,17 +701,6 @@ module Sequel
           end
       end
       
-      # Whether to convert some Java types to ruby types when retrieving rows.
-      def convert_types
-        Sequel::Deprecation.deprecate("Sequel::JDBC::Dataset#convert_types", "The private #convert_types? method returns whether to convert types for this dataset")
-        @opts[:convert_types]
-      end
-      def convert_types=(v)
-        Sequel::Deprecation.deprecate("Sequel::JDBC::Dataset#convert_types=", "Switch to using #with_convert_types, which returns a modified copy")
-        @opts[:convert_types] = v
-      end
-
-      # Correctly return rows from the database and return them as hashes.
       def fetch_rows(sql, &block)
         execute(sql){|result| process_result_set(result, &block)}
         self