sequel 4.49.0 → 5.3.0

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/db2.rb

@@ -1,64 +1,39 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('com.ibm.db2.jcc.DB2Driver')
-Sequel.require 'adapters/shared/db2'
-Sequel.require 'adapters/jdbc/transactions'
+require_relative '../shared/db2'
+require_relative 'transactions'
 
 module Sequel
   module JDBC
     Sequel.synchronize do
       DATABASE_SETUP[:db2] = proc do |db|
-        (class << db; self; end).class_eval do
+        db.singleton_class.class_eval do
           alias jdbc_schema_parse_table schema_parse_table
           alias jdbc_tables tables
           alias jdbc_views views
           alias jdbc_indexes indexes
-        end
-        db.extend(Sequel::JDBC::DB2::DatabaseMethods)
-        (class << db; self; end).class_eval do
+
+          include Sequel::JDBC::DB2::DatabaseMethods
+
           alias schema_parse_table jdbc_schema_parse_table
           alias tables jdbc_tables
           alias views jdbc_views
           alias indexes jdbc_indexes
           %w'schema_parse_table tables views indexes'.each do |s|
-            class_eval(<<-END, __FILE__, __LINE__+1)
-              def jdbc_#{s}(*a)
-                Sequel::Deprecation.deprecate("Database#jdbc_#{s} in the jdbc/db2 adapter", "Use Database\##{s} instead")
-                #{s}(*a)
-              end
-            END
-            # remove_method(:"jdbc_#{s}") # SEQUEL5
+            remove_method(:"jdbc_#{s}")
           end
         end
-        db.dataset_class = Sequel::JDBC::DB2::Dataset
+        db.extend_datasets Sequel::DB2::DatasetMethods
         com.ibm.db2.jcc.DB2Driver
       end
     end
 
-    # SEQUEL5: Remove
-    class Type_Convertor
-      def DB2Clob(r, i)
-        if v = r.getClob(i)
-          v = v.getSubString(1, v.length)
-          v = Sequel::SQL::Blob.new(v) if ::Sequel::DB2::use_clob_as_blob
-          v
-        end
-      end
-    end
-
-    # Database and Dataset instance methods for DB2 specific
-    # support via JDBC.
     module DB2
-      # Database instance methods for DB2 databases accessed via JDBC.
       module DatabaseMethods
         include Sequel::DB2::DatabaseMethods
         include Sequel::JDBC::Transactions
 
-        PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
-        IDENTITY_VAL_LOCAL = "SELECT IDENTITY_VAL_LOCAL() FROM SYSIBM.SYSDUMMY1".freeze
-        Sequel::Deprecation.deprecate_constant(self, :IDENTITY_VAL_LOCAL)
-        
         private
 
         def set_ps_arg(cps, arg, i)
@@ -103,10 +78,6 @@ module Sequel
           end
         end
       end
-
-      class Dataset < JDBC::Dataset
-        include Sequel::DB2::DatasetMethods
-      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('org.apache.derby.jdbc.EmbeddedDriver', :Derby)
-Sequel.require 'adapters/jdbc/transactions'
+require_relative 'transactions'
 
 module Sequel
   module JDBC
@@ -13,13 +13,8 @@ module Sequel
       end
     end
 
-    # Database and Dataset support for Derby databases accessed via JDBC.
     module Derby
-      # Instance methods for Derby Database objects accessed via JDBC.
       module DatabaseMethods
-        PRIMARY_KEY_INDEX_RE = /\Asql\d+\z/i.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
-
         include ::Sequel::JDBC::Transactions
 
         # Derby doesn't support casting integer to varchar, only integer to char,
@@ -30,7 +25,6 @@ module Sequel
           (type == String) ? 'CHAR(254)' : super
         end
 
-        # Derby uses the :derby database type.
         def database_type
           :derby
         end
@@ -67,7 +61,6 @@ module Sequel
           ds.first
         end
     
-        # Derby-specific syntax for renaming columns and changing a columns type/nullity.
         def alter_table_sql(table, op)
           case op[:op]
           when :rename_column
@@ -183,49 +176,12 @@ module Sequel
           true
         end
 
-        # The SQL query to issue to check if a connection is valid.
         def valid_connection_sql
           @valid_connection_sql ||= select(1).sql
         end
       end
       
-      # Dataset class for Derby datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
-        PAREN_CLOSE = ')'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PAREN_CLOSE)
-        PAREN_OPEN = '('.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PAREN_OPEN)
-        OFFSET = " OFFSET ".freeze
-        Sequel::Deprecation.deprecate_constant(self, :OFFSET)
-        CAST_STRING_OPEN = "RTRIM(".freeze
-        Sequel::Deprecation.deprecate_constant(self, :CAST_STRING_OPEN)
-        BLOB_OPEN = "CAST(X'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :BLOB_OPEN)
-        BLOB_CLOSE = "' AS BLOB)".freeze
-        Sequel::Deprecation.deprecate_constant(self, :BLOB_CLOSE)
-        HSTAR = "H*".freeze
-        Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-        TIME_FORMAT = "'%H:%M:%S'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :TIME_FORMAT)
-        DEFAULT_FROM = " FROM sysibm.sysdummy1".freeze
-        Sequel::Deprecation.deprecate_constant(self, :DEFAULT_FROM)
-        ROWS = " ROWS".freeze
-        Sequel::Deprecation.deprecate_constant(self, :ROWS)
-        FETCH_FIRST = " FETCH FIRST ".freeze
-        Sequel::Deprecation.deprecate_constant(self, :FETCH_FIRST)
-        ROWS_ONLY = " ROWS ONLY".freeze
-        Sequel::Deprecation.deprecate_constant(self, :ROWS_ONLY)
-        BOOL_TRUE_OLD = '(1 = 1)'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE_OLD)
-        BOOL_FALSE_OLD = '(1 = 0)'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE_OLD)
-        BOOL_TRUE = 'TRUE'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-        BOOL_FALSE = 'FALSE'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-        EMULATED_FUNCTION_MAP = {:char_length=>'length'.freeze}
-        Sequel::Deprecation.deprecate_constant(self, :EMULATED_FUNCTION_MAP)
-
         # Derby doesn't support an expression between CASE and WHEN,
         # so remove conditions.
         def case_expression_sql_append(sql, ce)
@@ -298,8 +254,7 @@ module Sequel
           false
         end
 
-        # Derby uses an expression yielding false for false values.
-        # Newer versions can use the FALSE literal, but older versions cannot.
+        # Newer Derby versions can use the FALSE literal, but older versions need an always false expression.
         def literal_false
           if db.svn_version >= 1040133
             'FALSE'
@@ -313,8 +268,7 @@ module Sequel
           v.strftime("'%H:%M:%S'")
         end
 
-        # Derby uses an expression yielding true for true values.
-        # Newer versions can use the TRUE literal, but older versions cannot.
+        # Newer Derby versions can use the TRUE literal, but older versions need an always false expression.
         def literal_true
           if db.svn_version >= 1040133
             'TRUE'
@@ -323,7 +277,7 @@ module Sequel
           end
         end
 
-        # Derby supports multiple rows in INSERT.
+        # Derby supports multiple rows for VALUES in INSERT.
         def multi_insert_sql_strategy
           :values
         end

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

@@ -12,20 +12,12 @@ module Sequel
       end
     end
 
-    # Database and Dataset support for H2 databases accessed via JDBC.
     module H2
-      # Instance methods for H2 Database objects accessed via JDBC.
       module DatabaseMethods
-        PRIMARY_KEY_INDEX_RE = /\Aprimary_key/i.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
-      
-        # Commit an existing prepared transaction with the given transaction
-        # identifier string.
         def commit_prepared_transaction(transaction_id, opts=OPTS)
           run("COMMIT TRANSACTION #{transaction_id}", opts)
         end
 
-        # H2 uses the :h2 database type.
         def database_type
           :h2
         end
@@ -39,18 +31,16 @@ module Sequel
           @h2_version ||= get(Sequel.function(:H2VERSION))
         end
 
-        # Rollback an existing prepared transaction with the given transaction
-        # identifier string.
         def rollback_prepared_transaction(transaction_id, opts=OPTS)
           run("ROLLBACK TRANSACTION #{transaction_id}", opts)
         end
 
-        # H2 uses an IDENTITY type
+        # H2 uses an IDENTITY type for primary keys
         def serial_primary_key_options
           {:primary_key => true, :type => :identity, :identity=>true}
         end
 
-        # H2 supports CREATE TABLE IF NOT EXISTS syntax.
+        # H2 supports CREATE TABLE IF NOT EXISTS syntax
         def supports_create_table_if_not_exists?
           true
         end
@@ -82,7 +72,6 @@ module Sequel
           end
         end
 
-        # H2 needs to add a primary key column as a constraint
         def alter_table_sql(table, op)
           case op[:op]
           when :add_column
@@ -94,12 +83,14 @@ module Sequel
               sqls = [super(table, op)]
 
               if pk && (h2_version >= '1.4' || op[:type] != :identity)
+                # H2 needs to add a primary key column as a constraint in this case
                 sqls << "ALTER TABLE #{quote_schema_table(table)} ADD PRIMARY KEY (#{quote_identifier(op[:name])})"
               end
 
               if ref
                 op[:table] = ref
-                sqls << "ALTER TABLE #{quote_schema_table(table)} ADD FOREIGN KEY (#{quote_identifier(op[:name])}) #{column_references_sql(op)}"
+                constraint_name = op[:foreign_key_constraint_name]
+                sqls << "ALTER TABLE #{quote_schema_table(table)} ADD#{" CONSTRAINT #{quote_identifier(constraint_name)}" if constraint_name} FOREIGN KEY (#{quote_identifier(op[:name])}) #{column_references_sql(op)}"
               end
 
               sqls
@@ -168,26 +159,15 @@ module Sequel
           false
         end
 
-        # Use BIGINT IDENTITY for identity columns that use bigint, fixes
-        # the case where primary_key :column, :type=>:Bignum is used.
+        # Use BIGINT IDENTITY for identity columns that use :Bignum type
         def type_literal_generic_bignum_symbol(column)
           column[:identity] ? 'BIGINT IDENTITY' : super
         end
       end
       
-      # Dataset class for H2 datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
         ILIKE_PLACEHOLDER = ["CAST(".freeze, " AS VARCHAR_IGNORECASE)".freeze].freeze
 
-        APOS = "'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :APOS)
-        HSTAR = "H*".freeze
-        Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-        TIME_FORMAT = "'%H:%M:%S'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :TIME_FORMAT)
-        ONLY_OFFSET = " LIMIT -1 OFFSET ".freeze
-        Sequel::Deprecation.deprecate_constant(self, :ONLY_OFFSET)
-
         # Emulate the case insensitive LIKE operator and the bitwise operators.
         def complex_expression_sql_append(sql, op, args)
           case op

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('org.hsqldb.jdbcDriver', :HSQLDB)
-Sequel.require 'adapters/jdbc/transactions'
+require_relative 'transactions'
 
 module Sequel
   module JDBC
@@ -13,16 +13,10 @@ module Sequel
       end
     end
 
-    # Database and Dataset support for HSQLDB databases accessed via JDBC.
     module HSQLDB
-      # Instance methods for HSQLDB Database objects accessed via JDBC.
       module DatabaseMethods
-        PRIMARY_KEY_INDEX_RE = /\Asys_idx_sys_pk_/i.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
-
         include ::Sequel::JDBC::Transactions
 
-        # HSQLDB uses the :hsqldb database type.
         def database_type
           :hsqldb
         end
@@ -54,13 +48,12 @@ module Sequel
 
         private
         
-        # HSQLDB specific SQL for renaming columns, and changing column types and/or nullity.
         def alter_table_sql(table, op)
           case op[:op]
           when :add_column
             if op[:table]
               [super(table, op.merge(:table=>nil)),
-               alter_table_sql(table, op.merge(:op=>:add_constraint, :type=>:foreign_key, :name=>op[:foreign_key_name], :columns=>[op[:name]], :table=>op[:table]))]
+               alter_table_sql(table, op.merge(:op=>:add_constraint, :type=>:foreign_key, :name=>op[:foreign_key_constraint_name], :columns=>[op[:name]], :table=>op[:table]))]
             else
               super
             end
@@ -144,25 +137,7 @@ module Sequel
         end
       end
       
-      # Dataset class for HSQLDB datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
-        BOOL_TRUE = 'TRUE'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :BOOL_TRUE)
-        BOOL_FALSE = 'FALSE'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :BOOL_FALSE)
-        SQL_WITH_RECURSIVE = "WITH RECURSIVE ".freeze
-        Sequel::Deprecation.deprecate_constant(self, :SQL_WITH_RECURSIVE)
-        APOS = "'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :APOS)
-        HSTAR = "H*".freeze
-        Sequel::Deprecation.deprecate_constant(self, :HSTAR)
-        BLOB_OPEN = "X'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :BLOB_OPEN)
-        DEFAULT_FROM = " FROM (VALUES (0))".freeze
-        Sequel::Deprecation.deprecate_constant(self, :DEFAULT_FROM)
-        TIME_FORMAT = "'%H:%M:%S'".freeze
-        Sequel::Deprecation.deprecate_constant(self, :TIME_FORMAT)
-
         # Handle HSQLDB specific case insensitive LIKE and bitwise operator support.
         def complex_expression_sql_append(sql, op, args)
           case op

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

@@ -1,21 +1,19 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('Java::net.sourceforge.jtds.jdbc.Driver', :JTDS)
-Sequel.require 'adapters/jdbc/mssql'
+require_relative 'mssql'
 
 module Sequel
   module JDBC
     Sequel.synchronize do
       DATABASE_SETUP[:jtds] = proc do |db|
         db.extend(Sequel::JDBC::JTDS::DatabaseMethods)
-        db.dataset_class = Sequel::JDBC::JTDS::Dataset
+        db.extend_datasets Sequel::MSSQL::DatasetMethods
         db.send(:set_mssql_unicode_strings)
         Java::net.sourceforge.jtds.jdbc.Driver
       end
     end
 
-    # Database and Dataset instance methods for JTDS specific
-    # support via JDBC.
     module JTDS
       module DatabaseMethods
         include Sequel::JDBC::MSSQL::DatabaseMethods
@@ -36,11 +34,6 @@ module Sequel
           cps.setNull(i, cps.getParameterMetaData.getParameterType(i))
         end
       end
-
-      # Dataset class for JTDS datasets accessed via JDBC.
-      class Dataset < JDBC::Dataset
-        include Sequel::MSSQL::DatasetMethods
-      end
     end
   end
 end

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

@@ -1,21 +1,11 @@
 # frozen-string-literal: true
 
-Sequel.require 'adapters/shared/mssql'
+require_relative '../shared/mssql'
 
 module Sequel
   module JDBC
-    # Database and Dataset instance methods for MSSQL specific
-    # support via JDBC.
     module MSSQL
-      # Database instance methods for MSSQL databases accessed via JDBC.
       module DatabaseMethods
-        PRIMARY_KEY_INDEX_RE = /\Apk__/i.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
-        ATAT_IDENTITY = 'SELECT @@IDENTITY'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :ATAT_IDENTITY)
-        SCOPE_IDENTITY = 'SELECT SCOPE_IDENTITY()'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :SCOPE_IDENTITY)
-        
         include Sequel::MSSQL::DatabaseMethods
         
         private

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

@@ -1,7 +1,7 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('com.mysql.jdbc.Driver', :MySQL)
-Sequel.require 'adapters/shared/mysql'
+require_relative '../shared/mysql'
 
 module Sequel
   module JDBC
@@ -13,26 +13,12 @@ module Sequel
       end
     end
 
-    # Database and Dataset instance methods for MySQL specific
-    # support via JDBC.
     module MySQL
-      # Database instance methods for MySQL databases accessed via JDBC.
       module DatabaseMethods
         include Sequel::MySQL::DatabaseMethods
-        LAST_INSERT_ID = 'SELECT LAST_INSERT_ID()'.freeze
-        Sequel::Deprecation.deprecate_constant(self, :LAST_INSERT_ID)
         
         private
         
-        # The database name for the given database.  Need to parse it out
-        # of the connection string, since the JDBC does no parsing on the
-        # given connection string by default.
-        def database_name
-          Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get(Sequel.function(:DATABASE))")
-          u = URI.parse(uri.sub(/\Ajdbc:/, ''))
-          (m = /\/(.*)/.match(u.path)) && m[1]
-        end
-        
         # MySQL exception handling with SQLState is less accurate than with regexps.
         def database_exception_use_sqlstates?
           false
@@ -87,6 +73,16 @@ module Sequel
           mysql_connection_setting_sqls.each{|sql| statement(conn){|s| log_connection_yield(sql, conn){s.execute(sql)}}}
           super
         end
+
+        # Handle unsigned integer values
+        def setup_type_convertor_map
+          super
+          TypeConvertor::BASIC_MAP.dup
+          @type_convertor_map[Java::JavaSQL::Types::SMALLINT] = @type_convertor_map[Java::JavaSQL::Types::INTEGER]
+          @type_convertor_map[Java::JavaSQL::Types::INTEGER] = @type_convertor_map[Java::JavaSQL::Types::BIGINT]
+          @basic_type_convertor_map[Java::JavaSQL::Types::SMALLINT] = @basic_type_convertor_map[Java::JavaSQL::Types::INTEGER]
+          @basic_type_convertor_map[Java::JavaSQL::Types::INTEGER] = @basic_type_convertor_map[Java::JavaSQL::Types::BIGINT]
+        end
       end
     end
   end

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

@@ -1,8 +1,8 @@
 # frozen-string-literal: true
 
 Sequel::JDBC.load_driver('Java::oracle.jdbc.driver.OracleDriver')
-Sequel.require 'adapters/shared/oracle'
-Sequel.require 'adapters/jdbc/transactions'
+require_relative '../shared/oracle'
+require_relative 'transactions'
 
 module Sequel
   module JDBC
@@ -14,23 +14,6 @@ module Sequel
       end
     end
 
-    # SEQUEL5: Remove
-    class Type_Convertor
-      JAVA_BIG_DECIMAL_CONSTRUCTOR = java.math.BigDecimal.java_class.constructor(Java::long).method(:new_instance)
-
-      def OracleDecimal(r, i)
-        if v = r.getBigDecimal(i)
-          i = v.long_value
-          if v == JAVA_BIG_DECIMAL_CONSTRUCTOR.call(i)
-            i
-          else
-            BigDecimal.new(v.to_string)
-          end
-        end
-      end 
-    end
-
-    # Database and Dataset support for Oracle databases accessed via JDBC.
     module Oracle
       JAVA_BIG_DECIMAL_CONSTRUCTOR = java.math.BigDecimal.java_class.constructor(Java::long).method(:new_instance)
 
@@ -45,16 +28,12 @@ module Sequel
         end
       end 
 
-      # Instance methods for Oracle Database objects accessed via JDBC.
       module DatabaseMethods
-        PRIMARY_KEY_INDEX_RE = /\Asys_/i.freeze
-        Sequel::Deprecation.deprecate_constant(self, :PRIMARY_KEY_INDEX_RE)
-
         include Sequel::Oracle::DatabaseMethods
         include Sequel::JDBC::Transactions
 
         def self.extended(db)
-          db.instance_eval do
+          db.instance_exec do
             @autosequence = opts[:autosequence]
             @primary_key_sequences = {}
           end
@@ -128,13 +107,12 @@ module Sequel
         end
       end
       
-      # Dataset class for Oracle datasets accessed via JDBC.
       class Dataset < JDBC::Dataset
         include Sequel::Oracle::DatasetMethods
 
         NUMERIC_TYPE = Java::JavaSQL::Types::NUMERIC
         TIMESTAMP_TYPE = Java::JavaSQL::Types::TIMESTAMP
-        TIMESTAMPTZ_TYPES = [Java::oracle.jdbc.OracleTypes::TIMESTAMPTZ, Java::oracle.jdbc.OracleTypes::TIMESTAMPLTZ]#.freeze # SEQUEL5
+        TIMESTAMPTZ_TYPES = [Java::oracle.jdbc.OracleTypes::TIMESTAMPTZ, Java::oracle.jdbc.OracleTypes::TIMESTAMPLTZ].freeze
 
         def type_convertor(map, meta, type, i)
           case type