sequel 5.48.0 → 5.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b395c399cd3632c44311c05df70fd6cd0fa924331f665dc964e041ec87013c08
-  data.tar.gz: de423f5ece8a1f212f010d430d671e52cf89e00fa0e952fb69fe8cf9c7931e4c
+  metadata.gz: 06302dbd32fc7e13539c83a4cf86fa72d974ffb15d403f30ca13d08af83c0605
+  data.tar.gz: ad8cc158183399ac93c5a44e0e33d0693a92599ccb5092f542ff2993f4701d25
 SHA512:
-  metadata.gz: 475081e84ac0c0ef2b05e642d02cf3956cf263cebc280ecd469401a9c3ed591c8854fe42e687343e68effe47e6cc0f4f12f73734e5477a8749406a8ae94afe15
-  data.tar.gz: eb5a432efd4e788461422ee754ace25d14add6a6117d10064446f31b3d719943bd4a935b3e70db10613205cf1d7bb980aaaf850449299a8f1861466aa0dcb50f
+  metadata.gz: 9b0943434af7e097bf7589ec885b6509f40b9677d7e1be56cac17f5093bc2c9a6c1e79918b547a4d04a2623b5562e4e8897247551f1a89ecde5c53339e6c9a48
+  data.tar.gz: a82852fa8dd6b598b7463acafab29bd6d1b5e514b639e3d13ee33855c300d9daa662d4ea1af27525d7557644c2eb8bd1ccceec376aa6b1dc26286658db5b63e7

data/CHANGELOG

@@ -1,3 +1,83 @@
+=== 5.52.0 (2022-01-01)
+
+* Use Class#subclasses if available in the subclasses plugin, instead of a custom Model.subclasses accessor (jeremyevans)
+
+* Add Model.descendants and .freeze_descendants to subclasses plugin (jeremyevans)
+
+* Avoid use of deprecated Refinement#include on Ruby 3.1+ (jeremyevans)
+
+* Add date_parse_input_handler extension for custom handling of input to date parsing methods (jeremyevans)
+
+* Make postgres adapter respect Database#default_string_column_size (jeremyevans)
+
+* Make pg_interval extension work with ActiveSupport 7.0 (jeremyevans)
+
+* Make :ruby_default schema entry for type: :datetime respect Sequel.datetime_class (jeremyevans)
+
+* Make alter_table drop_constraint have an effect on MySQL 8.0.19+ (jeremyevans)
+
+* Make mysql adapter support ruby-mysql 3 API (jeremyevans) (#1795)
+
+* Make mysql adapter no longer use connection's server_version, since it isn't accurate when using the ruby-mysql driver (jeremyevans)
+
+* Add sql_comments plugin for automatically including comments on queries generated by model class, instance, and dataset methods (jeremyevans)
+
+* Make sql_comments Database extension support Database#with_comments, for automatically including comments for queries executed inside the block (jeremyevans)
+
+* Fix sql_comments extension to not modify cached SQL for a dataset (jeremyevans)
+
+=== 5.51.0 (2021-12-01)
+
+* Make eager loading via tactical_eager_loading no longer modify objects who already have a cached value for the association (jeremyevans)
+
+* Make association cloning handle cases where clone association sets different :class option than cloned association (jeremyevans)
+
+* Make column schema entries on MySQL include an :extra entry for the Extra column in DESCRIBE output (bschmeck) (#1791)
+
+* Update mock PostgreSQL adapter to default to PostgreSQL 14 instead of PostgreSQL 9.5 (jeremyevans)
+
+* Support Dataset#with_recursive :search and :cycle options on PostgreSQL 14+ for result ordering and cycle detection (jeremyevans)
+
+* Avoid method redefined verbose mode warnings in lazy_attributes plugin (jeremyevans)
+
+=== 5.50.0 (2021-11-01)
+
+* Make Migrator :allow_missing_migration_files also allow down migrations where the current database version is greater than the last migration file version (francisconeves97) (#1789)
+
+* Fix Model#freeze in composition, serialization, and serialization_modification_detection plugins to return self (jeremyevans) (#1788)
+
+* Fix typecasting of lazy columns when using lazy_attributes plugin in model where dataset selects from subquery (jeremyevans)
+
+* Add :before_preconnect Database option, for configuring extensions loaded via :preconnect_extensions (MarcPer, jeremyevans) (#1786)
+
+* Change Dataset#columns! to use a LIMIT 0 query instead of a LIMIT 1 query (jeremyevans)
+
+* Add sql_log_normalizer extension for normalizing logged SQL, helpful for analytics and sensitive data (jeremyevans)
+
+* Add support for range_merge, multirange, and unnest, and PGMultiRange#op to pg_range_ops extension (jeremyevans)
+
+* Add pg_multirange extension with support for PostgreSQL 14+ multirange types (jeremyevans)
+
+=== 5.49.0 (2021-10-01)
+
+* Switch block_given? usage to defined?(yield) (jeremyevans)
+
+* Support table aliases for JOIN USING columns on PostgreSQL 14+ (jeremyevans)
+
+* Support calling PostgreSQL procedures without arguments (jeremyevans)
+
+* Support hstore subscripts in pg_hstore_ops on PostgreSQL 14+, for updating only part of an hstore value (jeremyevans)
+
+* Support JSONB subscripts in pg_json_ops on PostgreSQL 14+, for updating only part of a JSONB value (jeremyevans)
+
+* Support SQL::Expression#sequel_ast_transform for custom AST transforms on arbitrary expressions (jeremyevans)
+
+* Add Database#create_trigger :replace option on PostgreSQL 14+ for CREATE OR REPLACE TRIGGER (jeremyevans)
+
+* Make auto_validations plugin automatically setup no_null_byte validations (jeremyevans)
+
+* Add Model#validates_no_null_byte to validation_helpers plugin (jeremyevans)
+
 === 5.48.0 (2021-09-01)
 
 * Make the unused_associations plugin association reflection tracking work correctly when combining coverage runs (jeremyevans)

data/README.rdoc

@@ -17,11 +17,12 @@ toolkit for Ruby.
 
 == Resources
 
-Website :: http://sequel.jeremyevans.net
-RDoc Documentation :: http://sequel.jeremyevans.net/rdoc
+Website :: https://sequel.jeremyevans.net
+RDoc Documentation :: https://sequel.jeremyevans.net/rdoc
 Source Code :: https://github.com/jeremyevans/sequel
-Bug tracking (GitHub Issues) :: http://github.com/jeremyevans/sequel/issues
-Discussion Forum (sequel-talk Google Group) :: http://groups.google.com/group/sequel-talk
+Bug tracking (GitHub Issues) :: https://github.com/jeremyevans/sequel/issues
+Discussion Forum (GitHub Discussions) :: https://github.com/jeremyevans/sequel/discussions
+Alternate Discussion Forum (sequel-talk Google Group) :: http://groups.google.com/group/sequel-talk
 
 If you have questions about how to use Sequel, please ask on the
 sequel-talk Google Group.  Only use the the bug tracker to report
@@ -879,6 +880,11 @@ raise an error by default:
     end
   end
 
+== Testing Sequel
+
+Please see the {testing guide}[rdoc-ref:doc/testing.rdoc] for recommendations on testing
+applications that use Sequel, as well as the how to run the tests for Sequel itself.
+
 == Sequel Release Policy
 
 New major versions of Sequel do not have a defined release policy, but historically have
@@ -894,7 +900,8 @@ in the most current release.
 Sequel fully supports the currently supported versions of Ruby (MRI) and JRuby.  It may
 support unsupported versions of Ruby or JRuby, but such support may be dropped in any
 minor version if keeping it becomes a support issue.  The minimum Ruby version
-required to run the current version of Sequel is 1.9.2.
+required to run the current version of Sequel is 1.9.2, and the minimum JRuby version is
+9.0.0.0.
 
 == Maintainer
 

data/doc/migration.rdoc

@@ -352,7 +352,7 @@ you should give it some thought before using it.
 
 == Ignoring missing migrations
 
-In some cases, you may want to allow a migration in the database that does not exist in the filesystem (deploying to an older version of code without running a down migration when deploy auto-migrates, for example). If required, you can pass <tt>allow_missing_migration_files: true</tt> as an option. This will stop errors from being raised if there are migrations in the database that do not exist in the filesystem.
+In some cases, you may want to allow a migration in the database that does not exist in the filesystem (deploying to an older version of code without running a down migration when deploy auto-migrates, for example). If required, you can pass <tt>allow_missing_migration_files: true</tt> as an option. This will stop errors from being raised if there are migrations in the database that do not exist in the filesystem. Note that the migrations themselves can still raise an error when using this option, if the database schema isn't in the state the migrations expect it to be in.  In general, the <tt>allow_missing_migration_files: true</tt> option is very risky to use, and should only be used if it is absolutely necessary.
 
 == Modifying existing migrations
 

data/doc/opening_databases.rdoc

@@ -249,7 +249,7 @@ jdbc-mysql :: Depending on the configuration of the MySQL server, jdbc-mysql ver
 
 Requires: mysql
 
-The MySQL adapter does not support the pure-ruby mysql.rb driver, it requires the C-extension driver.
+This should work with the mysql gem (C extension) and the ruby-mysql gem (pure ruby).
 
 The following additional options are supported:
 

data/doc/postgresql.rdoc

@@ -428,6 +428,14 @@ rows that are distinct on just those columns:
   DB[:table].distinct(:id).all
   # SELECT DISTINCT ON ("id") * FROM "table"
 
+=== JOIN USING table alias
+
+Sequel allows passing an SQL::AliasedExpression to join table methods to use a USING
+join with a table alias for the USING columns:
+
+  DB[:t1].join(:t2, Sequel.as([:c1, :c2], :alias))
+  # SELECT * FROM "t1" INNER JOIN "t2" USING ("c1", "c2") AS "alias"
+
 === Calling PostgreSQL 11+ Procedures <tt>postgres only</tt>
 
 PostgreSQL 11+ added support for procedures, which are different from the user defined

data/doc/release_notes/5.49.0.txt

@@ -0,0 +1,59 @@
+= New Features
+
+* Model#validates_no_null_byte has been added to the
+  validation_helpers.  It checks that the value being validated does
+  not contain an ASCII NUL ('\0') byte.  Some databases will return an
+  error if a string contains a NUL byte.
+
+  The auto_validations plugin will now automatically add no_null_byte
+  validations for all string columns in the model's table.  This will
+  change exceptions raised by NUL bytes from database errors to
+  validation failures.
+  
+  If you are using auto_validations and would like to have a table
+  accept NUL bytes in string columns, use the following code inside
+  the model:
+
+    skip_auto_validations(:no_null_byte)
+
+* JSONB subscripts are now supported on PostgreSQL 14+ when using the
+  pg_json_ops extension.  You can use JSONB subscripts to more easily
+  update part of a JSONB column:
+
+    DB[:table].update(Sequel.pg_jsonb_op(:column)['key'] => 'value')
+    UPDATE "table" SET "column"['key'] = 'value'
+
+* hstore subscripts are now supported on PostgreSQL 14+ when using the
+  pg_hstore_ops extension.  You can use hstore subscripts to more
+  easily update part of an hstore column:
+
+    DB[:table].update(Sequel.hstore_op(:column)['key'] => 'value')
+    UPDATE "table" SET "column"['key'] = 'value'
+
+* Sequel now supports table aliases for JOIN USING columns on
+  PostgreSQL 14+.  These allow you to reference the USING columns in
+  the query using a qualified identifier. To use this support, pass an
+  SQL::AliasedExpression as the expression to join on:
+
+    DB[:t1].join(:t2, Sequel.as([:c1, :c2], :alias))
+    # SELECT * FROM "t1" INNER JOIN "t2" USING ("c1", "c2") AS "alias"
+
+* Database#create_trigger on PostgreSQL now supports a :replace option
+  for CREATE OR REPLACE TRIGGER (supported in PostgreSQL 14+).
+
+* SQL::Expression#sequel_ast_transform has been added to support
+  AST transforms of custom expression classes.
+
+= Other Improvements
+
+* Sequel now supports calling PostgreSQL procedures without arguments
+  when using Database#call_procedure.  Previously, attempts to call
+  procuredures without arguments would call the procedure with a
+  single NULL argument.
+
+* Sequel now uses defined?(yield) instead of block_given? internally
+  for better performance on CRuby.  defined?(yield) is faster as it is
+  built into the VM, while block_given? is a regular method and has
+  the overhead of calling a regular method.  Note that defined?(yield)
+  is not implemented correctly on JRuby before 9.0.0.0, so this
+  release of Sequel drops support for JRuby versions before 9.0.0.0.

data/doc/release_notes/5.50.0.txt

@@ -0,0 +1,78 @@
+= New Features
+
+* A pg_multirange extension has been added with support for PostgreSQL
+  14+ multirange types.  Multirange types are similar to an array of
+  ranges, where a value is in the multirange if it is in any of the
+  ranges contained in the multirange. Multiranges are useful when you
+  need to check against multiple ranges that do not overlap.
+
+  You can create multiranges using Sequel.pg_multirange, passing
+  an array of ranges and a multirange type:
+
+    DB.extension :pg_multirange
+    multirange = Sequel.pg_multirange(array_of_date_ranges, :datemultirange)
+
+  Sequel.pg_multirange returns a PGMultiRange, which operates as a
+  delegate to an array of PGRange objects.  Behavior of the object
+  is similar to an array, except that cover? is supported, which will
+  test if any of the included ranges covers the argument:
+
+    multirange.cover?(Date.today)
+
+  Like the pg_range extension, this also supports registering custom
+  multirange types, and using multirange types as bound variables.
+
+  The pg_range_ops extension now supports both ranges and multiranges,
+  with a few new methods added to Postgres::RangeOp for converting
+  between them:
+
+  * range_merge
+  * multirange
+  * and unnest
+
+* An sql_log_normalizer extension has been added for normalizing
+  logged SQL, replacing numbers and strings inside the SQL string
+  with question marks.  This is useful for analytics and sensitive
+  data.
+
+    DB[:table].first(a: 1, b: 'something')
+    # Without sql_log_normalizer extension, logged SQL is:
+    # SELECT * FROM "table" WHERE (("a" = 1) AND ("b" = 'something')) LIMIT 1
+
+    DB.extension :sql_log_normalizer
+    DB[:table].first(a: 1, b: 'something')
+    # With sql_log_normalizer_extension, logged SQL is:
+    # SELECT * FROM "table" WHERE (("a" = ?) AND ("b" = ?)) LIMIT ?
+
+  This extension scans the logged SQL for numbers and strings,
+  attempting to support the database's rules for string quoting.  This
+  means it should work with SQL that Sequel didn't itself create.
+  However, there are corner cases that the extension doesn't handle,
+  such as the use of apostrophes inside quoted identifiers, and
+  potentially other cases of database specific SQL where the normal
+  string quoting rules are changed, such as the use of escape strings
+  on PostgreSQL (E'escape string').
+
+* A :before_preconnect Database option has been added.  This is useful
+  for configuring extensions added via :preconnect_extensions before
+  the connection takes place.
+
+= Other Improvements
+
+* Dataset#columns! now uses a LIMIT 0 query instead of a LIMIT 1 query
+  by default. This can improve performance in cases where the row
+  returned would be large.  Some databases do not support a LIMIT 0
+  query, and some adapters that ship with Sequel have been updated to
+  continue using LIMIT 1.  Custom adapters should be updated to use
+  LIMIT 1 if the database does not support LIMIT 0.
+
+* The lazy_attributes plugin no longer modifies the database schema.
+  Previously, it could modify the database schema indirectly,
+  resulting in the loss of typecasting for models that were not
+  based on a single table or view, such as usage with the
+  class_table_inheritance plugin.
+
+* Model#freeze in the composition, serialization, and
+  serialization_modification_detection plugins now returns self. In
+  addition to being more correct, this fixes usage of these plugins
+  with the static_cache plugin.

data/doc/release_notes/5.51.0.txt

@@ -0,0 +1,47 @@
+= New Features
+
+* On PostgreSQL 14+, Dataset#with_recursive now supports :search and
+  :cycle options for result ordering and cycle detection.  These use
+  the SEARCH and CYCLE clauses added in PostgreSQL 14:
+
+    DB[:t].with_recursive(:t,
+      DB[:i1].where(parent_id: nil),
+      DB[:i1].join(:t, id: :parent_id).select_all(:i1),
+      search: {by: :id, type: :breadth},
+      cycle: {columns: :id, cycle_value: 1, noncycle_value: 2})
+
+    # WITH RECURSIVE t AS (
+    #     SELECT * FROM i1 WHERE (parent_id IS NULL)
+    #     UNION ALL
+    #     (SELECT i1.* FROM i1 INNER JOIN t ON (t.id = i1.parent_id))
+    #   )
+    #   SEARCH BREADTH FIRST BY id SET ordercol
+    #   CYCLE id SET is_cycle TO 1 DEFAULT 2 USING path
+
+* On MySQL, column schema hashes now contain an :extra entry, which
+  contains the Extra string returned in MySQL's DESCRIBE results
+  for the column.
+
+= Other Improvements
+
+* When eager loading via the tactical_eager_loading plugin, objects
+  that already have an association loaded will not have it reloaded
+  unless the :eager_reload option is given.
+
+* When cloning an association and using a different :class option
+  than the cloned association, the :class option given when cloning
+  will now take precedence over the :class option for the cloned
+  association.
+
+* When using the mock postgres adapter, the adapter defaults to
+  supporting PostgreSQL 14 (previously, it defaulted to supporting
+  PostgreSQL 9.5).
+
+* Sequel now avoids a method redefined warning in the lazy attributes
+  plugin in verbose warnings mode.
+
+= Other
+
+* Sequel's primary discussion forum is now GitHub Discussions. The
+  sequel-talk Google Group is still available for users who would
+  prefer to use that instead.

data/doc/release_notes/5.52.0.txt

@@ -0,0 +1,87 @@
+= New Features
+
+* When the sql_comments Database extension is used,
+  Database#with_comments is now added, which can be used for including
+  comments for all queries executed inside a given block.  This can
+  be useful if you want to analyze database query logs, and want to
+  group all related queries:
+
+     DB.with_comments(model: Album, action: :all) do
+       DB[:albums].all
+       # SELECT * FROM albums -- model:Album,action:all
+    end
+
+* An sql_comments plugin has been added, which will automatically
+  add SQL comments for all queries generated by model class, instance
+  and dataset methods:
+
+    Album.plugin :sql_comments
+
+    album = Album[1]
+    # SELECT * FROM albums WHERE (id = 1) LIMIT 1
+    # -- model:Album,method_type:class,method:[]
+
+    album.update(:name=>'A')
+    # UPDATE albums SET name = 'baz' WHERE (id = 1)
+    # -- model:Album,method_type:instance,method:update
+
+    Album.where(id: 1).delete
+    # DELETE FROM albums WHERE (id = 1)
+    # -- model:Album,method_type:dataset,method:delete
+
+  This plugin requires you have loaded the sql_comments Database
+  extension into the related Database before use.
+
+* A date_parse_input_handler extension has been added to support
+  custom handling of input to date parsing methods.  Among other
+  things, you can use this to limit the length of strings that
+  will be parsed, which can prevent ArgumentErrors in newer Ruby
+  versions:
+
+    Sequel.extension :date_parse_input_handler
+    Sequel.date_parse_input_handler do |string|
+      string.b[0, 128]
+    end
+
+= Other Improvements
+
+* On Ruby 3.1, the core_refinements extension now avoids the
+  deprecated Refinement#include, switching to
+  Refinement#import_methods.
+
+* On Ruby 3.1, the subclasses plugin will use Ruby's native support
+  for Class#subclasses.
+
+* The subclasses plugin has renamed descendents to descendants and
+  freeze_descendents to freeze_descendants.  The previous method
+  names are still available as aliases.
+
+* The :ruby_default schema entry for datetime/timestamp columns now
+  respects Sequel.datetime_class.  Previously, the value for the
+  :ruby_default schema entry would always be a DateTime value for
+  such columns.
+
+* The pg_interval extension now works with ActiveSupport 7.0.
+
+* The shared postgres adapter now respects
+  Database#default_string_column_size for setting the size of string
+  columns that don't use text as the database type.
+
+* Database#supports_check_constraints? now returns true on MySQL
+  8.0.19+. This fixes drop_constraint in certain cases when combining
+  the constraint dropping with other changes in the same alter_table
+  block.
+
+* The mysql adapter now supports the ruby-mysql 3 API (ruby-mysql
+  is a pure-ruby MySQL driver).
+
+* The mysql adapter no longer uses the connection's server_version
+  method if it is defined, as the method does not return the
+  correct value when using the ruby-mysql driver with MariaDB.
+
+* Comments added by the sql_comments extension no longer modify
+  cached SQL for a dataset.
+
+= Other
+
+* This is Sequel's 250th release!

data/doc/testing.rdoc

@@ -113,7 +113,7 @@ The order in which you delete/truncate the tables is important if you are using
 
 = Testing Sequel Itself
 
-Sequel has multiple separate test suites.  All test suites use minitest/spec, with the minitest-hooks and minitest-shared_description extensions.
+Sequel has multiple separate test suites.  All test suites use minitest/spec, with the minitest-hooks, minitest-global_expectations, and minitest-shared_description extensions.  To install the dependencies necessary to test Sequel, run <tt>gem install --development sequel</tt>.
 
 == rake
 
@@ -145,6 +145,8 @@ The <tt>spec_<i>adapter</i></tt> specs run against a real database connection wi
 
 These specs are broken down into two parts.  For each database, there are specific specs that only apply to that database, and these are called the adapter specs.  There are also shared specs that apply to all (or almost all) databases, these are called the integration specs. For database types that don't have specific adapter tests, you can use <tt>rake spec_integration</tt> to just run the shared integration tests.
 
+Each adapter needs a specific gem installed in order to run.  Please see the {connecting to a database guide}[rdoc-ref:doc/opening_databases.rdoc] for which gem you need to install for the adapter you are testing.
+
 == Environment variables
 
 Sequel uses environment variables when testing to specify either the database to be tested or specify how testing should be done.  You can also specify the databases to test by copying <tt>spec/spec_config.rb.example</tt> to <tt>spec/spec_config.rb</tt> and modifying it.  See that file for details.  It may be necessary to use +spec_config.rb+ as opposed to an environment variable if your database connection cannot be specified by a connection string.

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

@@ -318,7 +318,7 @@ module Sequel
                   conn.OpenSchema(ado_schema.type, ado_schema.criteria) 
                 end
               }
-              yield(r) if block_given?
+              yield(r) if defined?(yield)
             rescue ::WIN32OLERuntimeError => e
               raise_error(e)
             end

data/lib/sequel/adapters/ado.rb

@@ -161,7 +161,7 @@ module Sequel
           begin
             r = log_connection_yield(sql, conn){conn.Execute(sql)}
             begin
-              yield r if block_given?
+              yield r if defined?(yield)
             ensure
               begin
                 r.close

data/lib/sequel/adapters/amalgalite.rb

@@ -118,11 +118,9 @@ module Sequel
       # Yield an available connection.  Rescue
       # any Amalgalite::Errors and turn them into DatabaseErrors.
       def _execute(sql, opts)
-        begin
-          synchronize(opts[:server]){|conn| yield conn}
-        rescue ::Amalgalite::Error, ::Amalgalite::SQLite3::Error => e
-          raise_error(e)
-        end
+        synchronize(opts[:server]){|conn| yield conn}
+      rescue ::Amalgalite::Error, ::Amalgalite::SQLite3::Error => e
+        raise_error(e)
       end
       
       # The Amagalite adapter does not need the pool to convert exceptions.

data/lib/sequel/adapters/ibmdb.rb

@@ -246,7 +246,7 @@ module Sequel
           end
           begin
             stmt = log_connection_yield(log_sql, conn, args){conn.execute_prepared(ps_name, *args)}
-            if block_given?
+            if defined?(yield)
               yield(stmt)
             else  
               stmt.affected
@@ -268,7 +268,7 @@ module Sequel
       # 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?
+        if defined?(yield)
           yield(stmt)
         else  
           stmt.affected

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

@@ -2,6 +2,7 @@
 
 Sequel::JDBC.load_driver('org.apache.derby.jdbc.EmbeddedDriver', :Derby)
 require_relative 'transactions'
+require_relative '../utils/columns_limit_1'
 
 module Sequel
   module JDBC
@@ -182,6 +183,8 @@ module Sequel
       end
       
       class Dataset < JDBC::Dataset
+        include ::Sequel::Dataset::ColumnsLimit1
+
         # Derby doesn't support an expression between CASE and WHEN,
         # so remove conditions.
         def case_expression_sql_append(sql, ce)

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

@@ -35,9 +35,9 @@ module Sequel
           data = opts[:data]
           data = Array(data) if data.is_a?(String)
 
-          if block_given? && data
+          if defined?(yield) && data
             raise Error, "Cannot provide both a :data option and a block to copy_into"
-          elsif !block_given? && !data
+          elsif !defined?(yield) && !data
             raise Error, "Must provide either a :data option or a block to copy_into"
           end
 
@@ -45,7 +45,7 @@ module Sequel
             begin
               copy_manager = org.postgresql.copy.CopyManager.new(conn)
               copier = copy_manager.copy_in(copy_into_sql(table, opts))
-              if block_given?
+              if defined?(yield)
                 while buf = yield
                   java_bytes = buf.to_java_bytes
                   copier.writeToCopy(java_bytes, 0, java_bytes.length)
@@ -77,7 +77,7 @@ module Sequel
             copy_manager = org.postgresql.copy.CopyManager.new(conn)
             copier = copy_manager.copy_out(copy_table_sql(table, opts))
             begin
-              if block_given?
+              if defined?(yield)
                 while buf = copier.readFromCopy
                   yield(String.from_java_bytes(buf))
                 end

data/lib/sequel/adapters/jdbc.rb

@@ -32,15 +32,13 @@ module Sequel
 
     # Allow loading the necessary JDBC support via a gem.
     def self.load_gem(name)
-      begin
-        require "jdbc/#{name.to_s.downcase}"
-      rescue LoadError
-        # jdbc gem not used, hopefully the user has the .jar in their CLASSPATH
-      else
-        if defined?(::Jdbc) && ( ::Jdbc.const_defined?(name) rescue nil )
-          jdbc_module = ::Jdbc.const_get(name) # e.g. Jdbc::SQLite3
-          jdbc_module.load_driver if jdbc_module.respond_to?(:load_driver)
-        end
+      require "jdbc/#{name.to_s.downcase}"
+    rescue LoadError
+      # jdbc gem not used, hopefully the user has the .jar in their CLASSPATH
+    else
+      if defined?(::Jdbc) && ( ::Jdbc.const_defined?(name) rescue nil )
+        jdbc_module = ::Jdbc.const_get(name) # e.g. Jdbc::SQLite3
+        jdbc_module.load_driver if jdbc_module.respond_to?(:load_driver)
       end
     end
 
@@ -196,7 +194,7 @@ module Sequel
           args.each{|arg| set_ps_arg(cps, arg, i+=1)}
 
           begin
-            if block_given?
+            if defined?(yield)
               yield log_connection_yield(sql, conn){cps.executeQuery}
             else
               log_connection_yield(sql, conn){cps.executeUpdate}
@@ -461,7 +459,7 @@ module Sequel
             msg << ")"
           end
           begin
-            if block_given?
+            if defined?(yield)
               yield log_connection_yield(msg, conn, args){cps.executeQuery}
             else
               case opts[:type]