sequel 4.46.0 → 4.49.0

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

@@ -28,7 +28,8 @@ module Sequel
       end
     end
 
-    class TypeConvertor
+    # SEQUEL5: Remove
+    class Type_Convertor
       def SqlAnywhereBoolean(r, i)
         if v = Short(r, i)
           v != 0
@@ -37,6 +38,11 @@ module Sequel
     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
@@ -56,11 +62,6 @@ module Sequel
             rs.getLong(1)
           end
         end
-
-        def setup_type_convertor_map
-          super
-          @type_convertor_map[:SqlAnywhereBoolean] = TypeConvertor::INSTANCE.method(:SqlAnywhereBoolean)
-        end
       end
 
       #Dataset class for Sybase datasets accessed via JDBC.
@@ -70,10 +71,11 @@ module Sequel
         private
 
         SMALLINT_TYPE = Java::JavaSQL::Types::SMALLINT
+        BOOLEAN_METHOD = SqlAnywhere.method(:SqlAnywhereBoolean)
 
         def type_convertor(map, meta, type, i)
           if convert_smallint_to_bool && type == SMALLINT_TYPE
-            map[:SqlAnywhereBoolean]
+            BOOLEAN_METHOD
           else
             super
           end

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

@@ -14,10 +14,9 @@ module Sequel
       end
     end
 
-    class TypeConvertor
+    # SEQUEL5: Remove
+    class Type_Convertor
       def MSSQLRubyTime(r, i)
-        # MSSQL-Server TIME should be fetched as string to keep the precision intact, see:
-        # https://docs.microsoft.com/en-us/sql/t-sql/data-types/time-transact-sql#a-namebackwardcompatibilityfordownlevelclientsa-backward-compatibility-for-down-level-clients
         if v = r.getString(i)
           Sequel.string_to_time("#{v}")
         end
@@ -27,6 +26,14 @@ module Sequel
     # 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:
+        # https://docs.microsoft.com/en-us/sql/t-sql/data-types/time-transact-sql#a-namebackwardcompatibilityfordownlevelclientsa-backward-compatibility-for-down-level-clients
+        if v = r.getString(i)
+          Sequel.string_to_time("#{v}")
+        end
+      end
+
       # Database instance methods for SQLServer databases accessed via JDBC.
       module DatabaseMethods
         include Sequel::JDBC::MSSQL::DatabaseMethods
@@ -34,9 +41,16 @@ module Sequel
         def setup_type_convertor_map
           super
           map = @type_convertor_map
-          map[Java::JavaSQL::Types::TIME] = TypeConvertor::INSTANCE.method(:MSSQLRubyTime)
-          if defined?(Java::MicrosoftSql::Types::DATETIMEOFFSET)
-            map[Java::MicrosoftSql::Types::DATETIMEOFFSET] = lambda do |r, i|
+          map[Java::JavaSQL::Types::TIME] = SQLServer.method(:MSSQLRubyTime)
+
+          # Work around constant lazy loading in some drivers
+          begin
+            dto = Java::MicrosoftSql::Types::DATETIMEOFFSET
+          rescue NameError
+          end
+
+          if dto
+            map[dto] = lambda do |r, i|
               if v = r.getDateTimeOffset(i)
                 to_application_timestamp(v.to_s)
               end

data/lib/sequel/adapters/jdbc.rb

@@ -10,6 +10,7 @@ module Sequel
     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
@@ -20,6 +21,7 @@ module Sequel
     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.
@@ -142,16 +144,18 @@ module Sequel
       MAP.freeze
       BASIC_MAP.freeze
       INSTANCE.freeze
+      # freeze # SEQUEL5
     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
       
-      # The type of database we are connecting to
-      attr_reader :database_type
-      
       # The Java database driver we are using (should be a Java class)
       attr_reader :driver
       
@@ -185,12 +189,9 @@ module Sequel
             if block_given?
               yield log_connection_yield(sql, conn){cps.executeQuery}
             else
-              case opts[:type]
-              when :insert
-                log_connection_yield(sql, conn){cps.executeUpdate}
+              log_connection_yield(sql, conn){cps.executeUpdate}
+              if opts[:type] == :insert
                 last_insert_id(conn, opts)
-              else
-                log_connection_yield(sql, conn){cps.executeUpdate}
               end
             end
           rescue NativeException, JavaSQL::SQLException => e
@@ -489,7 +490,7 @@ module Sequel
       # Gets the connection from JNDI.
       def get_connection_from_jndi
         jndi_name = JNDI_URI_REGEXP.match(uri)[1]
-        JavaxNaming::InitialContext.new.lookup(jndi_name).connection
+        javax.naming.InitialContext.new.lookup(jndi_name).connection
       end
             
       # Gets the JDBC connection uri from the JNDI resource.
@@ -526,7 +527,7 @@ module Sequel
       # 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
+        # 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
       end 
@@ -680,8 +681,9 @@ 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
-        @type_convertor_map = TypeConvertor::MAP.merge(Java::JavaSQL::Types::TIMESTAMP=>timestamp_convertor)
-        @basic_type_convertor_map = TypeConvertor::BASIC_MAP.dup
+        # 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
       end
 
       # Yield a new statement object, and ensure that it is closed before returning.
@@ -694,15 +696,19 @@ module Sequel
         stmt.close if stmt
       end
 
-      # A conversion proc for timestamp columns.  This is used to make sure timestamps are converted using the
+      # A conversion method for timestamp columns.  This is used to make sure timestamps are converted using the
       # correct timezone.
-      def timestamp_convertor
-        lambda do |r, i|
-          if v = r.getTimestamp(i)
-            to_application_timestamp([v.getYear + 1900, v.getMonth + 1, v.getDate, v.getHours, v.getMinutes, v.getSeconds, v.getNanos])
-          end
+      def timestamp_convert(r, i)
+        if v = r.getTimestamp(i)
+          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
@@ -745,9 +751,14 @@ module Sequel
       end
       
       # Whether to convert some Java types to ruby types when retrieving rows.
-      # Uses the database's setting by default, can be set to false to roughly
-      # double performance when fetching rows.
-      attr_accessor :convert_types
+      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)
@@ -755,16 +766,21 @@ module Sequel
         self
       end
       
-      # Set the fetch size on JDBC ResultSets created from this dataset.
+      # Set the fetch size on JDBC ResultSets created from the returned dataset.
       def with_fetch_size(size)
         clone(:fetch_size=>size)
       end
+
+      # Set whether to convert Java types to ruby types in the returned dataset.
+      def with_convert_types(v)
+        clone(:convert_types=>v)
+      end
       
       private
 
       # Whether we should convert Java types to ruby types for this dataset.
       def convert_types?
-        ct = @convert_types
+        ct = @opts[:convert_types]
         ct.nil? ? db.convert_types : ct
       end
 

data/lib/sequel/adapters/mock.rb

@@ -52,7 +52,7 @@ module Sequel
         @autoid = case v
         when Integer
           i = v - 1
-          proc{Sequel.synchronize{i+=1}}
+          proc{@mutex.synchronize{i+=1}}
         else
           v
         end
@@ -128,9 +128,11 @@ module Sequel
       # Return all stored SQL queries, and clear the cache
       # of SQL queries.
       def sqls
-        s = @sqls.dup
-        @sqls.clear
-        s
+        @mutex.synchronize do
+          s = @sqls.dup
+          @sqls.clear
+          s
+        end
       end
 
       # Enable use of savepoints.
@@ -140,21 +142,12 @@ module Sequel
 
       private
 
-      def _autoid(sql, v, ds=nil)
-        if ds
-          ds.send(:cache_set, :_autoid, ds.autoid + 1) if ds.autoid.is_a?(Integer)
-          v
-        else
-          _nextres(v, sql, nil)
-        end
-      end
-
       def _execute(c, sql, opts=OPTS, &block)
         sql += " -- args: #{opts[:arguments].inspect}" if opts[:arguments]
         sql += " -- #{@opts[:append]}" if @opts[:append]
         sql += " -- #{c.server.is_a?(Symbol) ? c.server : c.server.inspect}" if c.server != :default
         log_connection_yield(sql, c){} unless opts[:log] == false
-        @sqls << sql 
+        @mutex.synchronize{@sqls << sql}
 
         ds = opts[:dataset]
         begin
@@ -165,8 +158,15 @@ module Sequel
             if meth == :numrows
               _numrows(sql, (ds.numrows if ds) || @numrows)
             else
-              v = ds.autoid if ds
-              _autoid(sql, v || @autoid, (ds if v))
+              if ds
+                @mutex.synchronize do
+                  v = ds.autoid
+                  if v.is_a?(Integer)
+                    ds.send(:cache_set, :_autoid, v + 1)
+                  end
+                  v
+                end
+              end || _nextres(@autoid, sql, nil)
             end
           end
         rescue => e
@@ -182,7 +182,7 @@ module Sequel
           if f.all?{|h| h.is_a?(Hash)}
             f.each{|h| yield h.dup}
           else
-            _fetch(sql, f.shift, &block)
+            _fetch(sql, @mutex.synchronize{f.shift}, &block)
           end
         when Proc
           h = f.call(sql)
@@ -209,7 +209,7 @@ module Sequel
         when Integer
           v
         when Array
-          v.empty? ? default : _nextres(v.shift, sql, default)
+          v.empty? ? default : _nextres(@mutex.synchronize{v.shift}, sql, default)
         when Proc
           v.call(sql)
         when Class
@@ -239,6 +239,7 @@ module Sequel
       # :sqls :: The array to store the SQL queries in.
       def adapter_initialize
         opts = @opts
+        @mutex = Mutex.new
         @sqls = opts[:sqls] || []
         @shared_adapter = false
 
@@ -284,7 +285,7 @@ module Sequel
             if cs.all?{|c| c.is_a?(Symbol)}
               ds.columns(*cs)
             else
-              columns(ds, sql, cs.shift)
+              columns(ds, sql, @mutex.synchronize{cs.shift})
             end
           end
         when Proc
@@ -320,6 +321,7 @@ module Sequel
 
       # 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
@@ -331,6 +333,7 @@ module Sequel
 
       # 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
@@ -342,6 +345,7 @@ module Sequel
 
       # 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
@@ -394,6 +398,10 @@ module Sequel
       def execute_insert(sql, opts=OPTS, &block)
         super(sql, opts.merge(:dataset=>self), &block)
       end
+
+      def non_sql_option?(key)
+        super || key == :fetch || key == :numrows || key == :autoid
+      end
     end
   end
 end

data/lib/sequel/adapters/mysql.rb

@@ -16,7 +16,7 @@ module Sequel
       def boolean(s) s.to_i != 0 end
       def integer(s) s.to_i end
       def float(s) s.to_f end
-    end.new
+    end.new#.freeze # SEQUEL5
 
     # Hash with integer keys and callable values for converting MySQL types.
     MYSQL_TYPES = {}
@@ -30,14 +30,18 @@ module Sequel
     end
     # MYSQL_TYPES.freeze # SEQUEL5
 
+    # SEQUEL5: Remove
+    @convert_invalid_date_time = false
     class << self
-      # Whether to convert invalid date time values by default.
-      #
-      # Only applies to Sequel::Database instances created after this
-      # has been set.
-      attr_accessor :convert_invalid_date_time
+      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
-    self.convert_invalid_date_time = false
 
     # Database class for MySQL databases used with Sequel.
     class Database < Sequel::Database
@@ -54,7 +58,7 @@ module Sequel
 
       # Hash of conversion procs for the current database
       attr_reader :conversion_procs
-      #
+
       # Whether to convert tinyint columns to bool for the current database
       attr_reader :convert_tinyint_to_bool
 
@@ -227,8 +231,8 @@ module Sequel
       
       def adapter_initialize
         @conversion_procs = MYSQL_TYPES.dup
-        self.convert_tinyint_to_bool = Sequel::MySQL.convert_tinyint_to_bool
-        self.convert_invalid_date_time = Sequel::MySQL.convert_invalid_date_time
+        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
       end
 
       # Try to get an accurate number of rows matched using the query
@@ -288,7 +292,7 @@ module Sequel
       # 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{DATABASE{}}")
+        Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get(Sequel.function(:DATABASE))")
         @opts[:database]
       end
       
@@ -316,8 +320,7 @@ module Sequel
           cps = db.conversion_procs
           cols = r.fetch_fields.map do |f| 
             # Pretend tinyint is another integer type if its length is not 1, to
-            # avoid casting to boolean if Sequel::MySQL.convert_tinyint_to_bool
-            # is set.
+            # avoid casting to boolean if convert_tinyint_to_bool is set.
             type_proc = f.type == 1 && cast_tinyint_integer?(f) ? cps[2] : cps[f.type]
             [output_identifier(f.name), type_proc, i+=1]
           end
@@ -373,9 +376,7 @@ module Sequel
       
       # Handle correct quoting of strings using ::MySQL.quote.
       def literal_string_append(sql, v)
-        sql << "'"
-        sql << ::Mysql.quote(v)
-        sql << "'"
+        sql << "'" << ::Mysql.quote(v) << "'"
       end
       
       # Yield each row of the given result set r with columns cols

data/lib/sequel/adapters/mysql2.rb

@@ -171,7 +171,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.convert_tinyint_to_bool
+        self.convert_tinyint_to_bool = Sequel::MySQL.instance_variable_get(:@convert_tinyint_to_bool) # true # SEQUEL5
       end
 
       if NativePreparedStatements
@@ -222,7 +222,7 @@ module Sequel
       # 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{DATABASE{}}")
+        Sequel::Deprecation.deprecate("Database#database_name", "Instead, use .get(Sequel.function(:DATABASE))")
         @opts[:database]
       end
 
@@ -260,7 +260,7 @@ module Sequel
 
       # Use streaming to implement paging if Mysql2 supports it.
       def paged_each(opts=OPTS, &block)
-        if STREAMING_SUPPORTED
+        if STREAMING_SUPPORTED && opts[:stream] != false
           stream.each(&block)
         else
           super
@@ -277,7 +277,7 @@ module Sequel
       private
 
       # Whether to cast tinyint(1) columns to integer instead of boolean.
-      # By default, uses the opposite of the database's convert_tinyint_to_bool
+      # By default, uses the database's convert_tinyint_to_bool
       # setting.  Exists for compatibility with the mysql adapter.
       def convert_tinyint_to_bool?
         @db.convert_tinyint_to_bool
@@ -303,8 +303,7 @@ module Sequel
 
       # Handle correct quoting of strings using ::Mysql2::Client#escape.
       def literal_string_append(sql, v)
-        s = db.synchronize(@opts[:server]){|c| c.escape(v)}
-        sql << "'" << s << "'"
+        sql << "'" << db.synchronize(@opts[:server]){|c| c.escape(v)} << "'"
       end
     end
   end

data/lib/sequel/adapters/oracle.rb

@@ -112,9 +112,9 @@ module Sequel
         @conversion_procs = ORACLE_TYPES.dup
       end
 
-      PS_TYPES = {'string'.freeze=>String, 'integer'.freeze=>Integer, 'float'.freeze=>Float,
-        'decimal'.freeze=>Float, 'date'.freeze=>Time, 'datetime'.freeze=>Time,
-        'time'.freeze=>Time, 'boolean'.freeze=>String, 'blob'.freeze=>OCI8::BLOB}
+      PS_TYPES = {'string'=>String, 'integer'=>Integer, 'float'=>Float,
+        'decimal'=>Float, 'date'=>Time, 'datetime'=>Time,
+        'time'=>Time, 'boolean'=>String, 'blob'=>OCI8::BLOB}#.freeze # SEQUEL5
       def cursor_bind_params(conn, cursor, args)
         i = 0
         args.map do |arg, type|
@@ -129,11 +129,7 @@ module Sequel
           when ::Sequel::SQL::Blob
             arg = ::OCI8::BLOB.new(conn, arg)
           end
-          if t = PS_TYPES[type]
-            cursor.bind_param(i, arg, t)
-          else
-            cursor.bind_param(i, arg, arg.class)
-          end
+          cursor.bind_param(i, arg, PS_TYPES[type] || arg.class)
           arg
         end
       end
@@ -287,7 +283,7 @@ module Sequel
         defaults = begin
           metadata_dataset.from(:all_tab_cols).
             where(:table_name=>im.call(table)).
-            to_hash(:column_name, :data_default)
+            as_hash(:column_name, :data_default)
         rescue DatabaseError
           {}
         end