sequel 4.49.0 → 5.3.0

data/lib/sequel/adapters/mysql.rb

@@ -7,16 +7,16 @@ rescue LoadError
 end
 raise(LoadError, "require 'mysql' did not define Mysql::CLIENT_MULTI_RESULTS!\n  You are probably using the pure ruby mysql.rb driver,\n  which Sequel does not support. You need to install\n  the C based adapter, and make sure that the mysql.so\n  file is loaded instead of the mysql.rb file.\n") unless defined?(Mysql::CLIENT_MULTI_RESULTS)
 
-Sequel.require %w'utils/mysql_mysql2 utils/mysql_prepared_statements', 'adapters'
+require_relative 'utils/mysql_mysql2'
+require_relative 'utils/mysql_prepared_statements'
 
 module Sequel
-  # Module for holding all MySQL-related classes and modules for Sequel.
   module MySQL
     TYPE_TRANSLATOR = tt = Class.new do
       def boolean(s) s.to_i != 0 end
       def integer(s) s.to_i end
       def float(s) s.to_f end
-    end.new#.freeze # SEQUEL5
+    end.new.freeze
 
     # Hash with integer keys and callable values for converting MySQL types.
     MYSQL_TYPES = {}
@@ -28,32 +28,13 @@ module Sequel
     }.each do |k,v|
       k.each{|n| MYSQL_TYPES[n] = v}
     end
-    # MYSQL_TYPES.freeze # SEQUEL5
+    MYSQL_TYPES.freeze
 
-    # SEQUEL5: Remove
-    @convert_invalid_date_time = false
-    class << self
-      def convert_invalid_date_time
-        Sequel::Deprecation.deprecate("Sequel::MySQL.convert_invalid_date_time", "Call this method on the Database instance")
-        @convert_invalid_date_time
-      end
-      def convert_invalid_date_time=(v)
-        Sequel::Deprecation.deprecate("Sequel::MySQL.convert_invalid_date_time=", "Call this method on the Database instance")
-        @convert_invalid_date_time = v
-      end
-    end
-
-    # Database class for MySQL databases used with Sequel.
     class Database < Sequel::Database
       include Sequel::MySQL::DatabaseMethods
       include Sequel::MySQL::MysqlMysql2::DatabaseMethods
       include Sequel::MySQL::PreparedStatements::DatabaseMethods
       
-      # Regular expression used for getting accurate number of rows
-      # matched by an update statement.
-      AFFECTED_ROWS_RE = /Rows matched:\s+(\d+)\s+Changed:\s+\d+\s+Warnings:\s+\d+/.freeze
-      Sequel::Deprecation.deprecate_constant(self, :AFFECTED_ROWS_RE)
-      
       set_adapter_scheme :mysql
 
       # Hash of conversion procs for the current database
@@ -131,7 +112,6 @@ module Sequel
         conn
       end
       
-      # Closes given database connection.
       def disconnect_connection(c)
         c.close
       rescue Mysql::Error
@@ -159,12 +139,10 @@ module Sequel
         @convert_tinyint_to_bool = v
       end
 
-      # Return the number of matched rows when executing a delete/update statement.
       def execute_dui(sql, opts=OPTS)
         execute(sql, opts){|c| return affected_rows(c)}
       end
 
-      # Return the last inserted id when executing an insert statement.
       def execute_insert(sql, opts=OPTS)
         execute(sql, opts){|c| return c.insert_id}
       end
@@ -175,7 +153,7 @@ module Sequel
         super
       end
 
-      # Return the version of the MySQL server two which we are connecting.
+      # Return the version of the MySQL server to which we are connecting.
       def server_version(server=nil)
         @server_version ||= (synchronize(server){|conn| conn.server_version if conn.respond_to?(:server_version)} || super)
       end
@@ -231,8 +209,8 @@ module Sequel
       
       def adapter_initialize
         @conversion_procs = MYSQL_TYPES.dup
-        self.convert_tinyint_to_bool = Sequel::MySQL.instance_variable_get(:@convert_tinyint_to_bool) # true # SEQUEL5
-        self.convert_invalid_date_time = Sequel::MySQL.instance_variable_get(:@convert_invalid_date_time) # false # SEQUEL5
+        self.convert_tinyint_to_bool = true
+        self.convert_invalid_date_time = false
       end
 
       # Try to get an accurate number of rows matched using the query
@@ -270,7 +248,6 @@ module Sequel
         end
       end
     
-      # The MySQL adapter main error class is Mysql::Error
       def database_error_classes
         [Mysql::Error]
       end
@@ -283,34 +260,21 @@ module Sequel
         Dataset
       end
 
-      # Raise a disconnect error if the exception message matches the list
-      # of recognized exceptions.
       def disconnect_error?(e, opts)
         super || (e.is_a?(::Mysql::Error) && MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message))
       end
       
-      # The database name when using the native adapter is always stored in
-      # the :database option.
-      def database_name
-        Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get(Sequel.function(:DATABASE))")
-        @opts[:database]
-      end
-      
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true
       def schema_column_type(db_type)
         convert_tinyint_to_bool && db_type =~ /\Atinyint\(1\)/ ? :boolean : super
       end
     end
     
-    # Dataset class for MySQL datasets accessed via the native driver.
     class Dataset < Sequel::Dataset
       include Sequel::MySQL::DatasetMethods
       include Sequel::MySQL::MysqlMysql2::DatasetMethods
       include Sequel::MySQL::PreparedStatements::DatasetMethods
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-
       # Yield all rows matching this dataset.  If the dataset is set to
       # split multiple statements, yield arrays of hashes one per statement
       # instead of yielding results for all statements as hashes.
@@ -367,7 +331,6 @@ module Sequel
         field.length != 1
       end
       
-      # Set the :type option to :select if it hasn't been set.
       def execute(sql, opts=OPTS)
         opts = Hash[opts]
         opts[:type] = :select

data/lib/sequel/adapters/mysql2.rb

@@ -1,19 +1,17 @@
 # frozen-string-literal: true
 
 require 'mysql2'
-Sequel.require %w'utils/mysql_mysql2', 'adapters'
+require_relative 'utils/mysql_mysql2'
 
 module Sequel
-  # Module for holding all Mysql2-related classes and modules for Sequel.
   module Mysql2
     NativePreparedStatements = if ::Mysql2::VERSION >= '0.4'
       true
     else
-      Sequel.require %w'utils/mysql_prepared_statements', 'adapters'
+      require_relative 'utils/mysql_prepared_statements'
       false
     end
 
-    # Database class for MySQL databases used with Sequel.
     class Database < Sequel::Database
       include Sequel::MySQL::DatabaseMethods
       include Sequel::MySQL::MysqlMysql2::DatabaseMethods
@@ -66,12 +64,10 @@ module Sequel
         conn
       end
 
-      # Return the number of matched rows when executing a delete/update statement.
       def execute_dui(sql, opts=OPTS)
         execute(sql, opts){|c| return c.affected_rows}
       end
 
-      # Return the last inserted id when executing an insert statement.
       def execute_insert(sql, opts=OPTS)
         execute(sql, opts){|c| return c.last_id}
       end
@@ -171,7 +167,7 @@ module Sequel
 
       # Set the convert_tinyint_to_bool setting based on the default value.
       def adapter_initialize
-        self.convert_tinyint_to_bool = Sequel::MySQL.instance_variable_get(:@convert_tinyint_to_bool) # true # SEQUEL5
+        self.convert_tinyint_to_bool = true
       end
 
       if NativePreparedStatements
@@ -190,12 +186,10 @@ module Sequel
         end
       end
 
-      # MySQL connections use the query method to execute SQL without a result
       def connection_execute_method
         :query
       end
 
-      # The MySQL adapter main error class is Mysql2::Error
       def database_error_classes
         [::Mysql2::Error]
       end
@@ -219,29 +213,18 @@ module Sequel
              MYSQL_DATABASE_DISCONNECT_ERRORS.match(e.message)))
       end
 
-      # The database name when using the native adapter is always stored in
-      # the :database option.
-      def database_name
-        Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get(Sequel.function(:DATABASE))")
-        @opts[:database]
-      end
-
       # Convert tinyint(1) type to boolean if convert_tinyint_to_bool is true
       def schema_column_type(db_type)
         convert_tinyint_to_bool && db_type =~ /\Atinyint\(1\)/ ? :boolean : super
       end
     end
 
-    # Dataset class for MySQL datasets accessed via the native driver.
     class Dataset < Sequel::Dataset
       include Sequel::MySQL::DatasetMethods
       include Sequel::MySQL::MysqlMysql2::DatasetMethods
       include Sequel::MySQL::PreparedStatements::DatasetMethods unless NativePreparedStatements
       STREAMING_SUPPORTED = ::Mysql2::VERSION >= '0.3.12'
 
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-
       if NativePreparedStatements
         PreparedStatementMethods = prepared_statements_module(
           "sql = self; opts = Hash[opts]; opts[:arguments] = bind_arguments",
@@ -249,7 +232,6 @@ module Sequel
           %w"execute execute_dui execute_insert")
       end
 
-      # Yield all rows matching this dataset.
       def fetch_rows(sql)
         execute(sql) do |r|
           self.columns = r.fields.map!{|c| output_identifier(c.to_s)}
@@ -258,7 +240,8 @@ module Sequel
         self
       end
 
-      # Use streaming to implement paging if Mysql2 supports it.
+      # Use streaming to implement paging if Mysql2 supports it and
+      # it hasn't been disabled.
       def paged_each(opts=OPTS, &block)
         if STREAMING_SUPPORTED && opts[:stream] != false
           stream.each(&block)
@@ -283,7 +266,6 @@ module Sequel
         @db.convert_tinyint_to_bool
       end
 
-      # Set the :type option to :select if it hasn't been set.
       def execute(sql, opts=OPTS)
         opts = Hash[opts]
         opts[:type] = :select

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/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/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
@@ -11,14 +11,15 @@ module Sequel
 
       # ORA-00028: your session has been killed
       # ORA-01012: not logged on
+      # ORA-02396: exceeded maximum idle time, please connect again
       # 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, 2396, 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 +41,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 +115,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 +325,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