sequel 4.49.0 → 5.3.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
 
@@ -83,10 +65,14 @@ module Sequel
               copier = copy_manager.copy_in(copy_into_sql(table, opts))
               if block_given?
                 while buf = yield
-                  copier.writeToCopy(buf.to_java_bytes, 0, buf.length)
+                  java_bytes = buf.to_java_bytes
+                  copier.writeToCopy(java_bytes, 0, java_bytes.length)
                 end
               else
-                data.each { |d| copier.writeToCopy(d.to_java_bytes, 0, d.length) }
+                data.each do |d|
+                  java_bytes = d.to_java_bytes
+                  copier.writeToCopy(java_bytes, 0, java_bytes.length)
+                end
               end
             rescue Exception => e
               copier.cancelCopy if copier
@@ -149,12 +135,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
@@ -171,6 +151,21 @@ module Sequel
           nil
         end
 
+        # Work around issue when using Sequel's bound variable support where the
+        # same SQL is used in different bound variable calls, but the schema has
+        # changed between the calls.  This is necessary as jdbc-postgres versions
+        # after 9.4.1200 violate the JDBC API.  These versions cache separate
+        # PreparedStatement instances, which are eventually prepared server side after the
+        # prepareThreshold is met.  The JDBC API violation is that PreparedStatement#close
+        # does not release the server side prepared statement.
+        def prepare_jdbc_statement(conn, sql, opts)
+          ps = super
+          unless opts[:name]
+            ps.prepare_threshold = 0
+          end
+          ps
+        end
+
         # If the given argument is a recognized PostgreSQL-specific type, create
         # a PGObject instance with unknown type and the bound argument string value,
         # and set that as the prepared statement argument.
@@ -206,13 +201,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 +219,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/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
@@ -435,6 +404,10 @@ module Sequel
             cps = cps[1]
           else
             log_connection_yield("CLOSE #{name}", conn){cps[1].close} if cps
+            if name
+              opts = Hash[opts]
+              opts[:name] = name
+            end
             cps = log_connection_yield("PREPARE#{" #{name}:" if name} #{sql}", conn){prepare_jdbc_statement(conn, sql, opts)}
             if size = fetch_size
               cps.setFetchSize(size)
@@ -520,27 +493,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 +518,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 +580,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 +598,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 +636,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
@@ -679,11 +646,10 @@ module Sequel
       end
 
       # Called before loading subadapter-specific code, necessary so that subadapter initialization code
-      # that runs queries works correctly.  This cannot be overriding in subadapters,
+      # that runs queries works correctly.  This cannot be overridden 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 +669,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 +695,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 +705,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

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.