sequel 3.40.0 → 3.41.0

data/lib/sequel/adapters/amalgalite.rb

@@ -147,11 +147,6 @@ module Sequel
       def database_error_classes
         [::Amalgalite::Error, ::Amalgalite::SQLite3::Error]
       end
-
-      # Disconnect given connections from the database.
-      def disconnect_connection(c)
-        c.close
-      end
     end
     
     # Dataset class for SQLite datasets that use the amalgalite driver.

data/lib/sequel/adapters/cubrid.rb

@@ -97,8 +97,8 @@ module Sequel
         log_yield(TRANSACTION_COMMIT){conn.commit}
       end
 
-      def disconnect_connection(c)
-        c.close
+      def database_error_classes
+        [StandardError]
       end
 
       def remove_transaction(conn, committed)

data/lib/sequel/adapters/db2.rb

@@ -57,6 +57,11 @@ module Sequel
         dbc
       end
       
+      def disconnect_connection(conn)
+        DB2CLI.SQLDisconnect(conn)
+        DB2CLI.SQLFreeHandle(DB2CLI::SQL_HANDLE_DBC, conn)
+      end
+
       def execute(sql, opts={}, &block)
         synchronize(opts[:server]){|conn| log_connection_execute(conn, sql, &block)}
       end
@@ -111,6 +116,10 @@ module Sequel
 
       private
 
+      def database_error_classes
+        [DB2Error]
+      end
+
       def begin_transaction(conn, opts={})
         log_yield(TRANSACTION_BEGIN){DB2CLI.SQLSetConnectAttr(conn, DB2CLI::SQL_ATTR_AUTOCOMMIT, DB2CLI::SQL_AUTOCOMMIT_OFF)}
       end
@@ -153,11 +162,6 @@ module Sequel
           super
         end
       end
-
-      def disconnect_connection(conn)
-        checked_error("Could not disconnect from database"){DB2CLI.SQLDisconnect(conn)}
-        checked_error("Could not free Database handle"){DB2CLI.SQLFreeHandle(DB2CLI::SQL_HANDLE_DBC, conn)}
-      end
     end
     
     class Dataset < Sequel::Dataset

data/lib/sequel/adapters/dbi.rb

@@ -62,6 +62,10 @@ module Sequel
         end
         ::DBI.connect(dbname, opts[:user], opts[:password])
       end
+
+      def disconnect_connection(c)
+        c.disconnect
+      end
       
       def execute(sql, opts={})
         synchronize(opts[:server]) do |conn|
@@ -75,12 +79,6 @@ module Sequel
         synchronize(opts[:server]){|conn| log_yield(sql){conn.do(sql)}}
       end
       alias_method :execute_dui, :do
-
-      private
-
-      def disconnect_connection(c)
-        c.disconnect
-      end
     end
     
     class Dataset < Sequel::Dataset

data/lib/sequel/adapters/do.rb

@@ -60,6 +60,10 @@ module Sequel
       def connect(server)
         setup_connection(::DataObjects::Connection.new(uri(server_opts(server))))
       end
+
+      def disconnect_connection(conn)
+        conn.dispose
+      end
       
       # Execute the given SQL.  If a block is given, the DataObjects::Reader
       # created is yielded to it. A block should not be provided unless a
@@ -126,11 +130,6 @@ module Sequel
         [::DataObjects::Error]
       end
 
-      # Close the given database connection.
-      def disconnect_connection(c)
-        c.close
-      end
-
       # Recognize DataObjects::ConnectionError instances as disconnect errors.
       def disconnect_error?(e, opts)
         super || (e.is_a?(::DataObjects::Error) && (e.is_a?(::DataObjects::ConnectionError) || e.message =~ DISCONNECT_ERROR_RE))

data/lib/sequel/adapters/firebird.rb

@@ -28,6 +28,14 @@ module Sequel
           :password => opts[:password]).connect
       end
 
+      def disconnect_connection(conn)
+        begin
+          conn.close
+        rescue Fb::Error
+          nil
+        end
+      end
+
       def execute(sql, opts={})
         begin
           synchronize(opts[:server]) do |conn|
@@ -65,10 +73,6 @@ module Sequel
         [Fb::Error]
       end
 
-      def disconnect_connection(c)
-        c.close
-      end
-
       def rollback_transaction(conn, opts={})
         log_yield(TRANSACTION_ROLLBACK){conn.rollback}
       end

data/lib/sequel/adapters/ibmdb.rb

@@ -309,9 +309,8 @@ module Sequel
         log_yield(TRANSACTION_COMMIT){conn.commit}
       end
     
-      # Close the given connection.
-      def disconnect_connection(conn)
-        conn.close
+      def database_error_classes
+        [Connection::Error]
       end
 
       # Don't convert smallint to boolean for the metadata

data/lib/sequel/adapters/informix.rb

@@ -23,12 +23,6 @@ module Sequel
         synchronize(opts[:server]){|c| yield log_yield(sql){c.cursor(sql)}}
       end
       alias_method :query, :execute
-      
-      private
-
-      def disconnect_connection(c)
-        c.close
-      end
     end
     
     class Dataset < Sequel::Dataset

data/lib/sequel/adapters/jdbc.rb

@@ -108,7 +108,7 @@ module Sequel
       :db2=>proc do |db|
         Sequel.ts_require 'adapters/jdbc/db2'
         db.extend(Sequel::JDBC::DB2::DatabaseMethods)
-        db.extend_datasets Sequel::DB2::DatasetMethods
+        db.dataset_class = Sequel::JDBC::DB2::Dataset
         com.ibm.db2.jcc.DB2Driver
       end,
       :firebirdsql=>proc do |db|
@@ -239,6 +239,12 @@ module Sequel
         end
         setup_connection(conn)
       end
+
+      # Close given adapter connections, and delete any related prepared statements.
+      def disconnect_connection(c)
+        @connection_prepared_statements_mutex.synchronize{@connection_prepared_statements.delete(c)}
+        c.close
+      end
       
       # Execute the given SQL.  If a block is given, if should be a SELECT
       # statement or something else that returns rows.
@@ -328,12 +334,10 @@ module Sequel
         @connection_prepared_statements_mutex.synchronize{yield(@connection_prepared_statements[conn] ||= {})}
       end
 
-      # Close given adapter connections, and delete any related prepared statements.
-      def disconnect_connection(c)
-        @connection_prepared_statements_mutex.synchronize{@connection_prepared_statements.delete(c)}
-        c.close
+      def database_error_classes
+        [NativeException]
       end
-      
+
       # Raise a disconnect error if the SQL state of the cause of the exception indicates so.
       def disconnect_error?(exception, opts)
         cause = exception.respond_to?(:cause) ? exception.cause : exception
@@ -660,7 +664,7 @@ module Sequel
         def decimal(v) BigDecimal.new(v.to_string) end
         def byte_array(v) Sequel::SQL::Blob.new(String.from_java_bytes(v)) end
         def blob(v) Sequel::SQL::Blob.new(String.from_java_bytes(v.getBytes(1, v.length))) end
-        def clob(v) Sequel::SQL::Blob.new(v.getSubString(1, v.length)) end
+        def clob(v) v.getSubString(1, v.length) end
         def buffered_reader(v)
           lines = ""
           c = false

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

@@ -51,6 +51,28 @@ module Sequel
           PRIMARY_KEY_INDEX_RE
         end
       end
+
+      class Dataset < JDBC::Dataset
+        include Sequel::DB2::DatasetMethods
+
+        class ::Sequel::JDBC::Dataset::TYPE_TRANSLATOR
+          def db2_clob(v) Sequel::SQL::Blob.new(v.getSubString(1, v.length)) end
+        end
+
+        DB2_CLOB_METHOD = TYPE_TRANSLATOR_INSTANCE.method(:db2_clob)
+      
+        private
+
+        # Return clob as blob if use_clob_as_blob is true
+        def convert_type_proc(v)
+          case v
+          when JAVA_SQL_CLOB
+            ::Sequel::DB2::use_clob_as_blob ? DB2_CLOB_METHOD : super
+          else
+            super
+          end
+        end
+      end
     end
   end
 end

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

@@ -129,11 +129,6 @@ module Sequel
           PRIMARY_KEY_INDEX_RE
         end
 
-        # Treat clob as string instead of blob
-        def schema_column_type(db_type)
-          db_type.downcase == 'clob' ? :string : super
-        end
-        
         # If an :identity option is present in the column, add the necessary IDENTITY SQL.
         def type_literal(column)
           if column[:identity]
@@ -153,6 +148,11 @@ module Sequel
         def uses_clob_for_text?
           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.

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

@@ -110,11 +110,6 @@ module Sequel
           PRIMARY_KEY_INDEX_RE
         end
 
-        # Treat clob as string instead of blob
-        def schema_column_type(db_type)
-          db_type.downcase == 'clob' ? :string : super
-        end
-
         # Use BIGINT IDENTITY for identity columns that use bigint, fixes
         # the case where primary_key :column, :type=>Bignum is used.
         def type_literal_generic_bignum(column)

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

@@ -21,7 +21,7 @@ module Sequel
         include Sequel::MSSQL::DatasetMethods
 
         class ::Sequel::JDBC::Dataset::TYPE_TRANSLATOR
-          def jtds_clob(v) Sequel::SQL::Blob.new(v.getSubString(1, v.length)) end
+          def jtds_clob(v) v.getSubString(1, v.length) end
         end
 
         JTDS_CLOB_METHOD = TYPE_TRANSLATOR_INSTANCE.method(:jtds_clob)

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

@@ -60,6 +60,12 @@ module Sequel
         def metadata_dataset
           super.extend(MetadataDatasetMethods)
         end
+
+        private
+
+        def disconnect_error?(exception, opts)
+          super || (exception.message =~ /connection is closed/)
+        end
       end
     end
   end

data/lib/sequel/adapters/mock.rb

@@ -160,6 +160,9 @@ module Sequel
         Connection.new(self, server, server_opts(server))
       end
 
+      def disconnect_connection(c)
+      end
+
       # Store the sql used for later retrieval with #sqls, and return
       # the appropriate value using either the #autoid, #fetch, or
       # #numrows methods.
@@ -306,9 +309,6 @@ module Sequel
         end
       end
 
-      def disconnect_connection(c)
-      end
-
       def quote_identifiers_default
         shared_adapter? ? super : false
       end

data/lib/sequel/adapters/mysql.rb

@@ -129,6 +129,13 @@ module Sequel
         conn
       end
       
+      # Closes given database connection.
+      def disconnect_connection(c)
+        c.close
+      rescue Mysql::Error
+        nil
+      end
+      
       # Modify the type translators for the date, time, and timestamp types
       # depending on the value given.
       def convert_invalid_date_time=(v)
@@ -266,13 +273,6 @@ module Sequel
         @opts[:database]
       end
       
-      # Closes given database connection.
-      def disconnect_connection(c)
-        c.close
-      rescue Mysql::Error
-        nil
-      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 == 'tinyint(1)' ? :boolean : super

data/lib/sequel/adapters/mysql2.rb

@@ -122,11 +122,6 @@ module Sequel
         @opts[:database]
       end
 
-      # Closes given database connection.
-      def disconnect_connection(c)
-        c.close
-      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 == 'tinyint(1)' ? :boolean : super

data/lib/sequel/adapters/odbc.rb

@@ -48,6 +48,10 @@ module Sequel
         conn
       end      
 
+      def disconnect_connection(c)
+        c.disconnect
+      end
+
       def execute(sql, opts={})
         synchronize(opts[:server]) do |conn|
           begin
@@ -83,10 +87,6 @@ module Sequel
         [::ODBC::Error]
       end
 
-      def disconnect_connection(c)
-        c.disconnect
-      end
-
       def disconnect_error?(e, opts)
         super || (e.is_a?(::ODBC::Error) && DISCONNECT_ERRORS.match(e.message))
       end

data/lib/sequel/adapters/openbase.rb

@@ -14,6 +14,10 @@ module Sequel
           opts[:password]
         )
       end
+
+      def disconnect_connection(c)
+        c.disconnect
+      end
       
       def execute(sql, opts={})
         synchronize(opts[:server]) do |conn|
@@ -23,12 +27,6 @@ module Sequel
         end
       end
       alias_method :do, :execute
-
-      private
-
-      def disconnect_connection(c)
-        c.disconnect
-      end
     end
     
     class Dataset < Sequel::Dataset

data/lib/sequel/adapters/oracle.rb

@@ -60,6 +60,12 @@ module Sequel
         conn
       end
 
+      def disconnect_connection(c)
+        c.logoff
+      rescue OCIInvalidHandle
+        nil
+      end
+
       def execute(sql, opts={}, &block)
         _execute(nil, sql, opts, &block)
       end
@@ -128,6 +134,14 @@ module Sequel
         end
       end
 
+      def connection_execute_method
+        :exec
+      end
+
+      def database_error_classes
+        [OCIException, RuntimeError]
+      end
+
       def execute_prepared_statement(conn, type, name, opts)
         ps = prepared_statement(name)
         sql = ps.prepared_sql
@@ -187,12 +201,6 @@ module Sequel
         log_yield(TRANSACTION_COMMIT){conn.commit}
       end
 
-      def disconnect_connection(c)
-        c.logoff
-      rescue OCIInvalidHandle
-        nil
-      end
-
       def disconnect_error?(e, opts)
         super || (e.is_a?(::OCIError) && CONNECTION_ERROR_CODES.include?(e.code))
       end