jdbc-postgres 9.2.1002 → 9.2.1002.1

data/LICENSE.txt

@@ -1,12 +1,31 @@
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2005, The PostgreSQL Global Development Group
+BSD License
 
-Portions Copyright (c) 1994, The Regents of the University of California
+The PostgreSQL JDBC driver is distributed under the BSD license, same as the server. The simplest explanation of the licensing terms is that you can do whatever you want with the product and source code as long as you don't claim you wrote it or sue us. You should give it a read though, it's only half a page.
 
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
+Copyright (c) 1997-2011, PostgreSQL Global Development Group
+All rights reserved.
 
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
 
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+3. Neither the name of the PostgreSQL Global Development Group nor the names
+   of its contributors may be used to endorse or promote products derived
+   from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -0,0 +1,26 @@
+# jdbc-postgres
+
+PostgreSQL JDBC driver allows Java programs to connect to a PostgreSQL database 
+using standard, database independent Java code. 
+It is a pure Java (Type IV) implementation.
+
+For more information see http://jdbc.postgresql.org/
+
+## Usage
+
+To make the driver accessible to JDBC and ActiveRecord code running in JRuby :
+
+    require 'jdbc/postgres'
+    Jdbc::Postgres.load_driver
+
+For backwards compatibility with older (<= **9.1.903**) versions of the gem use :
+
+    require 'jdbc/postgres'
+    Jdbc::Postgres.load_driver(:require) if Jdbc::Postgres.respond_to?(:load_driver)
+
+## Copyright
+
+Copyright (c) 2012 [The JRuby Team](https://github.com/jruby).
+
+The PostgreSQL JDBC driver is distributed under the BSD license,
+see *LICENSE.txt* and http://jdbc.postgresql.org/license.html for details.

data/lib/jdbc/postgres.rb

@@ -1,9 +1,12 @@
+warn "Jdbc-Postgres is only for use with JRuby" if (JRUBY_VERSION.nil? rescue true)
+
 module Jdbc
   module Postgres
-    VERSION = "9.2.1002"
+    DRIVER_VERSION = '9.2.1002'
+    VERSION = DRIVER_VERSION + '.1'
 
     def self.driver_jar
-      version_jdbc_version = VERSION.split( '.' )
+      version_jdbc_version = DRIVER_VERSION.split( '.' )
       version_jdbc_version << jdbc_version
       'postgresql-%s.%s-%s.jdbc%d.jar' % version_jdbc_version
     end
@@ -20,13 +23,15 @@ module Jdbc
 
     # JDBC version 4 if Java >=1.6, else 3
     def self.jdbc_version
-      vers = Java::java.lang.System::get_property( "java.specification.version" )
-      vers = vers.split( '.' ).map { |v| v.to_i }
-      ( ( vers <=> [ 1, 6 ] ) >= 0 ) ? 4 : 3
+      vers = Java::JavaLang::System.get_property( "java.specification.version" )
+      ( ( vers.split( '.' ).map(&:to_i) <=> [ 1, 6 ] ) >= 0 ) ? 4 : 3
     end
-  end
-end
 
-if $VERBOSE && (JRUBY_VERSION.nil? rescue true)
-  warn "Jdbc-Postgres is only for use with JRuby"
+    if defined?(JRUBY_VERSION) && # enable backwards-compat behavior :
+      ( Java::JavaLang::Boolean.get_boolean("jdbc.driver.autoload") || 
+        Java::JavaLang::Boolean.get_boolean("jdbc.postgres.autoload") )
+      warn "autoloading JDBC driver on require 'jdbc/postgres'" if $VERBOSE
+      load_driver :require
+    end
+  end
 end

metadata

@@ -2,39 +2,38 @@
 name: jdbc-postgres
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 9.2.1002
+  version: 9.2.1002.1
 platform: ruby
 authors:
 - Nick Sieger, Ola Bini and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-12-15 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies: []
-description: Install this gem and require 'postgres' within JRuby to load the driver.
+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
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- History.txt
 - LICENSE.txt
-- README.txt
+- README.md
 - Rakefile
-- lib/postgresql-9.2-1002.jdbc3.jar
 - lib/postgresql-9.2-1002.jdbc4.jar
+- lib/postgresql-9.2-1002.jdbc3.jar
 - lib/jdbc/postgres.rb
 homepage: https://github.com/jruby/activerecord-jdbc-adapter
 licenses: []
 post_install_message:
 rdoc_options:
-- --main
-- README.txt
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       segments:
       - 0
@@ -44,7 +43,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: !binary |-
         MA==
@@ -54,5 +53,5 @@ rubyforge_project: jruby-extras
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
-summary: PostgreSQL JDBC driver for Java and PostgreSQL/ActiveRecord-JDBC.
+summary: PostgreSQL JDBC driver for JRuby and PostgreSQL/ActiveRecord-JDBC (activerecord-jdbcpostgresql-adapter).
 test_files: []

data/History.txt

@@ -1,42 +0,0 @@
-=== 9.2.1002
-* Upgraded to 9.2-1002 drivers (still compatible with PostgreSQL 7.2+).
-* 9.2 supports hstore among others
-
-  See PostgreSQL JDBC {Change Log}[http://jdbc.postgresql.org/changes.html#version_9.2-1002].
-  First 9.2 release: {9.2-1000}[http://jdbc.postgresql.org/changes.html#version_9.2-1000].
-
-=== 9.1.903
-* Upgraded to 9.1-903 drivers (still compatible with PostgreSQL 7.2+).
-
-  See PostgreSQL JDBC {Change Log}[http://jdbc.postgresql.org/changes.html#version_9.1-903].
-  Though change logging has been a bit spotty of late.
-
-=== 9.1.901
-* Upgraded to 9.1-901 drivers (still compatible with PostgreSQL 7.2+).
-
-  See PostgreSQL JDBC {Change Log}[http://jdbc.postgresql.org/changes.html#version_9.1-901].
-
-=== 9.0.801
-* Upgraded to 9.0-801 drivers (still compatible with PostgreSQL 7.2+).
-
-  See PostgreSQL JDBC {Change Log}[http://jdbc.postgresql.org/changes.html#version_9.0-801].
-
-=== 8.4.702
-* Upgraded to 8.4-702 drivers, see PostgreSQL JDBC
-  {Change Log}[http://jdbc.postgresql.org/changes.html#version_8.4-702].
-
-=== 8.4.701
-* Upgraded to 8.4-701 drivers, see PostgreSQL JDBC
-  {Change Log}[http://jdbc.postgresql.org/changes.html#version_8.4-701].
-
-=== 8.3.605
-* Upgraded to 8.3-605 drivers, see PostgreSQL JDBC
-  {Change Log}[http://jdbc.postgresql.org/changes.html#version_8.3-605].
-
-=== 8.3.604
-* Upgraded to 8.3-604 drivers
-* Added runtime selection of either JDBC 3 or JDBC 4 (j2se 1.6+)
-  driver.
-
-=== 8.2
-* Initial version

data/README.txt

@@ -1,13 +0,0 @@
-= jdbc-postgres
-
-* https://github.com/jruby/activerecord-jdbc-adapter/
-
-== DESCRIPTION:
-
-This is a Postgres JDBC driver gem for JRuby.
-
-Use
-
-   require 'jdbc/postgres'
-
-to make the driver accessible to JDBC and ActiveRecord code running in JRuby.