jdbc-postgres 9.2.1004 → 9.3.1100

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e322a6022073195622a9b945c38c4de9ed995c
-  data.tar.gz: a2de53052a611239b8de22d391008eb5d40cc71d
+  metadata.gz: 9dcdbec5b3da166f9909111a4c372624348a1d04
+  data.tar.gz: ef3b99c841f6c713393af13025d444ed47cf49be
 SHA512:
-  metadata.gz: 29e60157ef5721c6ebe8cf40051307e2ecb425234e8fffa704be46637780c5b9c3b831604b08da7c74f2b3b9f067a15279aca8a720445c17d65c5bc0647ec16c
-  data.tar.gz: bba2ccca3f3f38a1784c603d7cb5c1d4dbcb400977b7dc2896a4a86621603307ca22b3978b63cc3c8b0b8eff25ef4410cfd24943fe12ee7db9a5bb26999baa88
+  metadata.gz: c9a8c3ef882364e49ff0a30d341c6a47fd0b47ffe4a9ecf8c4ea8734d233ce55450d3021f3677e8d94ad8951ee008a09638145c67b6d6b9ea1d0818805854f76
+  data.tar.gz: 34ee48a571200a148bfe9172c67c404a0964bf5651f4613109764249b82b447b9d06a30ac8bff26df50d767c3fe9090a43946d16634000aa5f07ee488d547f32

data/lib/jdbc/postgres.rb

@@ -6,12 +6,21 @@ module Jdbc
 
     def self.driver_jar
       version_jdbc_version = DRIVER_VERSION.split( '.' )
+      if ( jdbc_version = self.jdbc_version ).is_a? Float
+        jdbc_version = (jdbc_version * 10).to_i
+      end
       version_jdbc_version << jdbc_version
       'postgresql-%s.%s-%s.jdbc%d.jar' % version_jdbc_version
     end
 
     def self.load_driver(method = :load)
       send method, driver_jar
+    rescue LoadError => e
+      if jdbc_version < 4
+        warn "failed to load postgresql (driver) jar, please note that we no longer " <<
+        "include JDBC 3.x support, on Java < 6 please use gem 'jdbc-postgres', '~> 9.2'"
+      end
+      raise e
     end
 
     def self.driver_name
@@ -20,10 +29,16 @@ module Jdbc
 
     private
 
-    # JDBC version 4 if Java >=1.6, else 3
     def self.jdbc_version
-      vers = Java::JavaLang::System.get_property( "java.specification.version" )
-      ( ( vers.split( '.' ).map(&:to_i) <=> [ 1, 6 ] ) >= 0 ) ? 4 : 3
+      version = ENV_JAVA[ 'java.specification.version' ]
+      version = version.split('.').last.to_i # '1.7' => 7
+      if version < 6
+        3 # not supported
+      elsif version == 6
+        4
+      else # JDBC >= 4.1
+        4.1
+      end
     end
 
     if defined?(JRUBY_VERSION) && # enable backwards-compat behavior :

data/lib/jdbc/postgres/version.rb

@@ -1,6 +1,6 @@
 module Jdbc
   module Postgres
-    DRIVER_VERSION = '9.2.1004'
+    DRIVER_VERSION = '9.3.1100'
     VERSION = DRIVER_VERSION
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jdbc-postgres
 version: !ruby/object:Gem::Version
-  version: 9.2.1004
+  version: 9.3.1100
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies: []
 description: Install this gem `require 'jdbc/postgres'` and invoke `Jdbc::Postgres.load_driver` within JRuby to load the driver.
 email: nick@nicksieger.com, ola.bini@gmail.com
@@ -18,8 +18,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE.txt
-- lib/postgresql-9.2-1004.jdbc4.jar
-- lib/postgresql-9.2-1004.jdbc3.jar
+- lib/postgresql-9.3-1100.jdbc41.jar
+- lib/postgresql-9.3-1100.jdbc4.jar
 - lib/jdbc/postgres.rb
 - lib/jdbc/postgres/version.rb
 homepage: https://github.com/jruby/activerecord-jdbc-adapter