sequel 4.49.0 → 5.0.0

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('org.postgresql.Driver', :Postgres)
-Sequel.require 'adapters/shared/postgres'
+require_relative '../shared/postgres'
 
 module Sequel
   module JDBC
@@ -13,22 +13,6 @@ module Sequel
       end
     end
 
-    # SEQUEL5: Remove
-    class Type_Convertor
-      def RubyPGArray(r, i)
-        if v = r.getArray(i)
-          v.array.to_ary
-        end
-      end 
-      def RubyPGHstore(r, i)
-        if v = r.getObject(i)
-          v.to_hash
-        end
-      end 
-    end
-
-    # Adapter, Database, and Dataset support for accessing a PostgreSQL
-    # database via JDBC.
     module Postgres
       # Return PostgreSQL array types as ruby Arrays instead of
       # JDBC PostgreSQL driver-specific array type. Only used if the
@@ -48,8 +32,6 @@ module Sequel
         end
       end 
 
-      # Methods to add to Database instances that access PostgreSQL via
-      # JDBC.
       module DatabaseMethods
         include Sequel::Postgres::DatabaseMethods
 
@@ -149,12 +131,6 @@ module Sequel
 
         private
         
-        # SEQUEL5: Remove
-        def conversion_procs_updated
-          super
-          Sequel.synchronize{@oid_convertor_map = {}}
-        end
-
         DATABASE_ERROR_CLASSES = [NativeException].freeze
         def database_error_classes
           DATABASE_ERROR_CLASSES
@@ -206,13 +182,8 @@ module Sequel
         end
       end
       
-      # Dataset subclass used for datasets that connect to PostgreSQL via JDBC.
       class Dataset < JDBC::Dataset
         include Sequel::Postgres::DatasetMethods
-        APOS = "'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :APOS)
-        HSTORE_TYPE = 'hstore'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :HSTORE_TYPE)
         
         private
         
@@ -229,7 +200,7 @@ module Sequel
         STRING_TYPE = Java::JavaSQL::Types::VARCHAR
         ARRAY_TYPE = Java::JavaSQL::Types::ARRAY
         ARRAY_METHOD = Postgres.method(:RubyPGArray)
-        PG_SPECIFIC_TYPES = [ARRAY_TYPE, Java::JavaSQL::Types::OTHER, Java::JavaSQL::Types::STRUCT]#.freeze # SEQUEL5
+        PG_SPECIFIC_TYPES = [ARRAY_TYPE, Java::JavaSQL::Types::OTHER, Java::JavaSQL::Types::STRUCT].freeze
         HSTORE_METHOD = Postgres.method(:RubyPGHstore)
 
         def type_convertor(map, meta, type, i)

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/sqlanywhere'
-Sequel.require 'adapters/jdbc/transactions'
+require_relative '../shared/sqlanywhere'
+require_relative 'transactions'
 
 module Sequel
   module JDBC
@@ -23,37 +23,25 @@ module Sequel
     Sequel.synchronize do
       DATABASE_SETUP[:sqlanywhere] = proc do |db|
         db.extend(Sequel::JDBC::SqlAnywhere::DatabaseMethods)
+        db.convert_smallint_to_bool = true
         db.dataset_class = Sequel::JDBC::SqlAnywhere::Dataset
         drv
       end
     end
 
-    # SEQUEL5: Remove
-    class Type_Convertor
-      def SqlAnywhereBoolean(r, i)
-        if v = Short(r, i)
-          v != 0
-        end
-      end
-    end
-
     module SqlAnywhere
       def self.SqlAnywhereBoolean(r, i)
         v = r.getShort(i)
         v != 0 unless r.wasNull
       end
 
-      # Database instance methods for Sybase databases accessed via JDBC.
       module DatabaseMethods
         include Sequel::SqlAnywhere::DatabaseMethods
         include Sequel::JDBC::Transactions
 
-        LAST_INSERT_ID = 'SELECT @@IDENTITY'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :LAST_INSERT_ID)
-
         private
 
-        # Get the last inserted id.
+        # Use @@IDENTITY to get the last inserted id
         def last_insert_id(conn, opts=OPTS)
           statement(conn) do |stmt|
             sql = 'SELECT @@IDENTITY'
@@ -64,7 +52,6 @@ module Sequel
         end
       end
 
-      #Dataset class for Sybase datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
         include Sequel::SqlAnywhere::DatasetMethods
 

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('org.sqlite.JDBC', :SQLite3)
-Sequel.require 'adapters/shared/sqlite'
+require_relative '../shared/sqlite'
 
 module Sequel
   module JDBC
@@ -14,15 +14,9 @@ module Sequel
       end
     end
 
-    # Database and Dataset support for SQLite databases accessed via JDBC.
     module SQLite
-      # Instance methods for SQLite Database objects accessed via JDBC.
       module DatabaseMethods
         include Sequel::SQLite::DatabaseMethods
-        LAST_INSERT_ROWID = 'SELECT last_insert_rowid()'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :LAST_INSERT_ROWID)
-        FOREIGN_KEY_ERROR_RE = /query does not return ResultSet/.freeze
-        Sequel::Deprecation.deprecate_constant(self, :FOREIGN_KEY_ERROR_RE)
         
         # Swallow pointless exceptions when the foreign key list pragma
         # doesn't return any rows.

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('com.microsoft.sqlserver.jdbc.SQLServerDriver')
-Sequel.require 'adapters/jdbc/mssql'
+require_relative 'mssql'
 
 module Sequel
   module JDBC
@@ -14,17 +14,6 @@ module Sequel
       end
     end
 
-    # SEQUEL5: Remove
-    class Type_Convertor
-      def MSSQLRubyTime(r, i)
-        if v = r.getString(i)
-          Sequel.string_to_time("#{v}")
-        end
-      end
-    end
-
-    # Database and Dataset instance methods for SQLServer specific
-    # support via JDBC.
     module SQLServer
       def self.MSSQLRubyTime(r, i)
         # MSSQL-Server TIME should be fetched as string to keep the precision intact, see:
@@ -34,7 +23,6 @@ module Sequel
         end
       end
 
-      # Database instance methods for SQLServer databases accessed via JDBC.
       module DatabaseMethods
         include Sequel::JDBC::MSSQL::DatabaseMethods
 

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

@@ -3,19 +3,6 @@
 module Sequel
   module JDBC
     module Transactions
-      TRANSACTION_BEGIN = 'Transaction.begin'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TRANSACTION_BEGIN)
-      TRANSACTION_COMMIT = 'Transaction.commit'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TRANSACTION_COMMIT)
-      TRANSACTION_RELEASE_SP = 'Transaction.release_savepoint'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TRANSACTION_RELEASE_SP)
-      TRANSACTION_ROLLBACK = 'Transaction.rollback'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TRANSACTION_ROLLBACK)
-      TRANSACTION_ROLLBACK_SP = 'Transaction.rollback_savepoint'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TRANSACTION_ROLLBACK_SP)
-      TRANSACTION_SAVEPOINT= 'Transaction.savepoint'.freeze
-      Sequel::Deprecation.deprecate_constant(self, :TRANSACTION_SAVEPOINT)
-
       def freeze
         supports_savepoints?
         super
@@ -38,7 +25,7 @@ module Sequel
       JDBC_TRANSACTION_ISOLATION_LEVELS = {:uncommitted=>JavaSQL::Connection::TRANSACTION_READ_UNCOMMITTED,
         :committed=>JavaSQL::Connection::TRANSACTION_READ_COMMITTED,
         :repeatable=>JavaSQL::Connection::TRANSACTION_REPEATABLE_READ,
-        :serializable=>JavaSQL::Connection::TRANSACTION_SERIALIZABLE}#.freeze # SEQUEL5
+        :serializable=>JavaSQL::Connection::TRANSACTION_SERIALIZABLE}.freeze
 
       # Set the transaction isolation level on the given connection using
       # the JDBC API.

data/lib/sequel/adapters/mock.rb

@@ -1,10 +1,9 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/utils/unmodified_identifiers'
+require_relative 'utils/unmodified_identifiers'
 
 module Sequel
   module Mock
-    # Connection class for Sequel's mock adapter.
     class Connection
       # Sequel::Mock::Database object that created this connection
       attr_reader :db
@@ -30,7 +29,6 @@ module Sequel
       end
     end
 
-    # Database class for Sequel's mock adapter.
     class Database < Sequel::Database
       set_adapter_scheme :mock
 
@@ -61,9 +59,9 @@ module Sequel
       # Set the columns to set in the dataset when the dataset fetches
       # rows.  Argument types supported:
       # nil :: Set no columns
-      # Array of Symbols: Used for all datasets
-      # Array (otherwise): First retrieval gets the first value in the
-      #                    array, second gets the second value, etc.
+      # Array of Symbols :: Used for all datasets
+      # Array (otherwise) :: First retrieval gets the first value in the
+      #                      array, second gets the second value, etc.
       # Proc :: Called with the select SQL query, uses the value
       #         returned, which should be an array of symbols
       attr_writer :columns
@@ -311,45 +309,21 @@ module Sequel
     end
 
     class Dataset < Sequel::Dataset
-      Database::DatasetClass = self
-      Sequel::Deprecation.deprecate_constant(Database, :DatasetClass)
-
       # The autoid setting for this dataset, if it has been overridden
       def autoid
         cache_get(:_autoid) || @opts[:autoid]
       end
 
-      # Override the databases's autoid setting for this dataset
-      def autoid=(v)
-        Sequel::Deprecation.deprecate("Sequel::Mock::Dataset#autoid=", "Use with_autoid to return a modified dataset")
-        cache_set(:_autoid, nil)
-        @opts[:autoid] = v
-      end
-
       # The fetch setting for this dataset, if it has been overridden
       def _fetch
         cache_get(:_fetch) || @opts[:fetch]
       end
 
-      # Override the databases's fetch setting for this dataset
-      def _fetch=(v)
-        Sequel::Deprecation.deprecate("Sequel::Mock::Dataset#_fetch=", "Use with_fetch to return a modified dataset")
-        cache_set(:_fetch, nil)
-        @opts[:fetch] = v
-      end
-
       # The numrows setting for this dataset, if it has been overridden
       def numrows
         cache_get(:_numrows) || @opts[:numrows]
       end
 
-      # Override the databases's numrows setting for this dataset
-      def numrows=(v)
-        Sequel::Deprecation.deprecate("Sequel::Mock::Dataset#_numrows=", "Use with_numrows to return a modified dataset")
-        cache_set(:_numrows, nil)
-        @opts[:numrows] = v
-      end
-
       # If arguments are provided, use them to set the columns
       # for this dataset and return self.  Otherwise, use the
       # default Sequel behavior and return the columns.

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