Permalink
Browse files

Fix jdbc adapter when DriverManager#getConnection fails, bump version…

… to 3.36.1 (Fixes #488)

This is completely my fault, as the most basic code review should
have caught this.  It wasn't caught by the test suite since
DriverManager.getConnection does not fail on any of the jdbc
adapter tests in my environment (and I test on 10 separate jdbc
adapters).

Thanks to Alex Portnov for the heads up.
  • Loading branch information...
1 parent ffb714c commit f6a8724262fca19924e7de57f73eaa48a0e662e4 @jeremyevans committed Jun 2, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −0 CHANGELOG
  2. +1 −1 lib/sequel/adapters/jdbc.rb
  3. +1 −1 lib/sequel/version.rb
View
@@ -1,3 +1,7 @@
+=== 3.36.1 (2012-06-01)
+
+* Fix jdbc adapter when DriverManager#getConnection fails (aportnov) (#488)
+
=== 3.36.0 (2012-06-01)
* Use Bignum generic type when dumping unsigned integer types that could potentially overflow 32-bit signed integer values (stu314)
@@ -222,7 +222,7 @@ def connect(server)
end
opts[:jdbc_properties].each{|k,v| props.setProperty(k.to_s, v)} if opts[:jdbc_properties]
begin
- driver.new.connect(args[0], props)
+ c = driver.new.connect(args[0], props)
raise(Sequel::DatabaseError, 'driver.new.connect returned nil: probably bad JDBC connection string') unless c
c
rescue JavaSQL::SQLException, NativeException, StandardError => e2
View
@@ -6,7 +6,7 @@ module Sequel
MINOR = 36
# The tiny version of Sequel. Usually 0, only bumped for bugfix
# releases that fix regressions from previous versions.
- TINY = 0
+ TINY = 1
# The version of Sequel you are using, as a string (e.g. "2.11.0")
VERSION = [MAJOR, MINOR, TINY].join('.')

0 comments on commit f6a8724

Please sign in to comment.