sequel 4.47.0 → 4.48.0

data/lib/sequel/adapters/ado/access.rb

@@ -299,7 +299,8 @@ module Sequel
         
         def fetch_ado_schema(type, criteria=[])
           execute_open_ado_schema(type, criteria) do |s|
-            cols = s.Fields.extend(Enumerable).map(&:Name)
+            cols = []
+            s.Fields.each{|f| cols << f.Name}
             s.getRows.transpose.each do |r|
               row = {}
               cols.each{|c| row[c] = r.shift}

data/lib/sequel/adapters/do/postgres.rb

@@ -4,8 +4,6 @@ Sequel::DataObjects.load_driver 'do_postgres'
 Sequel.require 'adapters/shared/postgres'
 
 module Sequel
-  Postgres::CONVERTED_EXCEPTIONS << ::DataObjects::Error
-  
   module DataObjects
     Sequel.synchronize do
       DATABASE_SETUP[:postgres] = proc do |db|
@@ -31,6 +29,11 @@ module Sequel
         
         private
         
+        DATABASE_ERROR_CLASSES = [::DataObjects::Error].freeze
+        def database_error_classes
+          DATABASE_ERROR_CLASSES
+        end
+
         # Extend the adapter with the DataObjects PostgreSQL AdapterMethods
         def setup_connection(conn)
           conn = super(conn)

data/lib/sequel/adapters/ibmdb.rb

@@ -6,12 +6,17 @@ Sequel.require 'adapters/shared/db2'
 module Sequel
 
   module IBMDB
+    # SEQUEL5: Remove
     @convert_smallint_to_bool = true
-
     class << self
-      # Whether to convert smallint values to bool, true by default.
-      # Can also be overridden per dataset.
-      attr_accessor :convert_smallint_to_bool
+      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
@@ -187,6 +192,16 @@ module Sequel
 
       # Hash of connection procs for converting
       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
     
       # Create a new connection object for the given server.
       def connect(server)
@@ -284,6 +299,7 @@ module Sequel
       end
 
       def adapter_initialize
+        #@convert_smallint_to_bool = typecast_value_boolean(opts.fetch(:convert_smallint_to_bool, true)) # SEQUEL5
         @conversion_procs = DB2_TYPES.dup
         @conversion_procs[:timestamp] = method(:to_application_timestamp)
       end
@@ -349,7 +365,7 @@ module Sequel
 
       # Convert smallint type to boolean if convert_smallint_to_bool is true
       def schema_column_type(db_type)
-        if Sequel::IBMDB.convert_smallint_to_bool && db_type =~ /smallint/i 
+        if convert_smallint_to_bool && db_type =~ /smallint/i 
           :boolean
         else
           super
@@ -379,13 +395,14 @@ module Sequel
 
       # 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.
       def convert_smallint_to_bool
-        opts.has_key?(:convert_smallint_to_bool) ? opts[:convert_smallint_to_bool] : IBMDB.convert_smallint_to_bool
+        opts.has_key?(:convert_smallint_to_bool) ? opts[:convert_smallint_to_bool] : db.convert_smallint_to_bool
       end
 
       # Return a cloned dataset with the convert_smallint_to_bool option set.
@@ -405,7 +422,7 @@ module Sequel
             type = stmt.field_type(i).downcase.to_sym
             # decide if it is a smallint from precision
             type = :boolean  if type == :int && convert && stmt.field_precision(i) < 8
-            type = :blob if type == :clob && Sequel::DB2.use_clob_as_blob
+            type = :blob if type == :clob && db.use_clob_as_blob
             columns << [key, cps[type]]
           end
           cols = columns.map{|c| c[0]}

data/lib/sequel/adapters/jdbc.rb

@@ -142,16 +142,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 +187,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
@@ -526,7 +525,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 +679,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 +694,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 +749,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 +764,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/jdbc/db2.rb

@@ -35,7 +35,8 @@ module Sequel
       end
     end
 
-    class TypeConvertor
+    # SEQUEL5: Remove
+    class Type_Convertor
       def DB2Clob(r, i)
         if v = r.getClob(i)
           v = v.getSubString(1, v.length)
@@ -63,7 +64,7 @@ module Sequel
         def set_ps_arg(cps, arg, i)
           case arg
           when Sequel::SQL::Blob
-            if ::Sequel::DB2.use_clob_as_blob
+            if use_clob_as_blob
               cps.setString(i, arg)
             else
               super
@@ -91,7 +92,15 @@ module Sequel
           super
           map = @type_convertor_map
           types = Java::JavaSQL::Types
-          map[types::NCLOB] = map[types::CLOB] = TypeConvertor::INSTANCE.method(:DB2Clob)
+          map[types::NCLOB] = map[types::CLOB] = method(:convert_clob)
+        end
+
+        def convert_clob(r, i)
+          if v = r.getClob(i)
+            v = v.getSubString(1, v.length)
+            v = Sequel::SQL::Blob.new(v) if use_clob_as_blob
+            v
+          end
         end
       end
 

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

@@ -54,7 +54,7 @@ module Sequel
           end
         end
         
-        # Derby supports transaction DDL statements.
+        # Derby supports transactional DDL statements.
         def supports_transactional_ddl?
           true
         end
@@ -227,8 +227,7 @@ module Sequel
         Sequel::Deprecation.deprecate_constant(self, :EMULATED_FUNCTION_MAP)
 
         # Derby doesn't support an expression between CASE and WHEN,
-        # so remove 
-        # conditions.
+        # so remove conditions.
         def case_expression_sql_append(sql, ce)
           super(sql, ce.with_merged_expression)
         end
@@ -300,7 +299,7 @@ module Sequel
         end
 
         # Derby uses an expression yielding false for false values.
-        # Newer versions can use the FALSE literal, but the latest gem version cannot.
+        # Newer versions can use the FALSE literal, but older versions cannot.
         def literal_false
           if db.svn_version >= 1040133
             'FALSE'
@@ -315,7 +314,7 @@ module Sequel
         end
 
         # Derby uses an expression yielding true for true values.
-        # Newer versions can use the TRUE literal, but the latest gem version cannot.
+        # Newer versions can use the TRUE literal, but older versions cannot.
         def literal_true
           if db.svn_version >= 1040133
             'TRUE'

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

@@ -14,7 +14,8 @@ module Sequel
       end
     end
 
-    class TypeConvertor
+    # SEQUEL5: Remove
+    class Type_Convertor
       JAVA_BIG_DECIMAL_CONSTRUCTOR = java.math.BigDecimal.java_class.constructor(Java::long).method(:new_instance)
 
       def OracleDecimal(r, i)
@@ -31,6 +32,19 @@ module Sequel
 
     # 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)
+
+      def self.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 
+
       # Instance methods for Oracle Database objects accessed via JDBC.
       module DatabaseMethods
         PRIMARY_KEY_INDEX_RE = /\Asys_/i.freeze
@@ -110,7 +124,7 @@ module Sequel
 
         def setup_type_convertor_map
           super
-          @type_convertor_map[:OracleDecimal] = TypeConvertor::INSTANCE.method(:OracleDecimal)
+          @type_convertor_map[:OracleDecimal] = Oracle.method(:OracleDecimal)
         end
       end
       

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

@@ -4,8 +4,6 @@ Sequel::JDBC.load_driver('org.postgresql.Driver', :Postgres)
 Sequel.require 'adapters/shared/postgres'
 
 module Sequel
-  Postgres::CONVERTED_EXCEPTIONS << NativeException
-  
   module JDBC
     Sequel.synchronize do
       DATABASE_SETUP[:postgresql] = proc do |db|
@@ -15,11 +13,27 @@ module Sequel
       end
     end
 
-    class TypeConvertor
+    # 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
       # database does not have a conversion proc for the type.
-      def RubyPGArray(r, i)
+      def self.RubyPGArray(r, i)
         if v = r.getArray(i)
           v.array.to_ary
         end
@@ -28,16 +42,12 @@ module Sequel
       # Return PostgreSQL hstore types as ruby Hashes instead of
       # Java HashMaps.  Only used if the database does not have a
       # conversion proc for the type.
-      def RubyPGHstore(r, i)
+      def self.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
       # Methods to add to Database instances that access PostgreSQL via
       # JDBC.
       module DatabaseMethods
@@ -50,6 +60,12 @@ module Sequel
           db.send(:initialize_postgres_adapter)
         end
 
+        # Remove any current entry for the oid in the oid_convertor_map.
+        def add_conversion_proc(oid, *)
+          super
+          Sequel.synchronize{@oid_convertor_map.delete(oid)}
+        end
+
         # See Sequel::Postgres::Adapter#copy_into
         def copy_into(table, opts=OPTS)
           data = opts[:data]
@@ -61,7 +77,7 @@ module Sequel
             raise Error, "Must provide either a :data option or a block to copy_into"
           end
 
-          synchronize(opts) do |conn|
+          synchronize(opts[:server]) do |conn|
             begin
               copy_manager = org.postgresql.copy.CopyManager.new(conn)
               copier = copy_manager.copy_in(copy_into_sql(table, opts))
@@ -73,7 +89,7 @@ module Sequel
                 data.each { |d| copier.writeToCopy(d.to_java_bytes, 0, d.length) }
               end
             rescue Exception => e
-              copier.cancelCopy
+              copier.cancelCopy if copier
               raise
             ensure
               unless e
@@ -105,8 +121,12 @@ module Sequel
                 end
                 b
               end
+            rescue => e
+              raise_error(e, :disconnect=>true)
             ensure
-              raise DatabaseDisconnectError, "disconnecting as a partial COPY may leave the connection in an unusable state" if buf
+              if buf && !e
+                raise DatabaseDisconnectError, "disconnecting as a partial COPY may leave the connection in an unusable state"
+              end
             end
           end
         end
@@ -122,19 +142,24 @@ module Sequel
             else
               false
             end
-             Sequel.synchronize{@oid_convertor_map[oid] = conv}
+            Sequel.synchronize{@oid_convertor_map[oid] = conv}
           end
           conv
         end
 
         private
         
-        # Clear oid convertor map cache when conversion procs are updated.
+        # 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
+        end
+
         def disconnect_error?(exception, opts)
           super || exception.message =~ /\A(This connection has been closed\.|FATAL: terminating connection due to administrator command|An I\/O error occurred while sending to the backend\.)\z/
         end
@@ -178,8 +203,6 @@ module Sequel
         def setup_type_convertor_map
           super
           @oid_convertor_map = {}
-          @type_convertor_map[:RubyPGArray] = TypeConvertor::INSTANCE.method(:RubyPGArray)
-          @type_convertor_map[:RubyPGHstore] = TypeConvertor::INSTANCE.method(:RubyPGHstore)
         end
       end
       
@@ -203,8 +226,10 @@ 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
         HSTORE_TYPE = 'hstore'.freeze
+        HSTORE_METHOD = Postgres.method(:RubyPGHstore)
 
         def type_convertor(map, meta, type, i)
           case type
@@ -213,11 +238,11 @@ module Sequel
             if pr = db.oid_convertor_proc(oid)
               pr
             elsif type == ARRAY_TYPE
-              map[:RubyPGArray]
+              ARRAY_METHOD
             elsif oid == 2950 # UUID
               map[STRING_TYPE]
             elsif meta.getPGType(i) == HSTORE_TYPE
-              map[:RubyPGHstore]
+              HSTORE_METHOD
             else
               super
             end