activerecord-jdbc-adapter 1.2.2.1 → 1.2.5

data/.gitignore

@@ -18,5 +18,4 @@ patches*
 /bin
 /jndi_test/jdbc/.bindings
 target
-/test/fscontext.jar
-/test/providerutil.jar
+test/jars

data/.travis.yml

@@ -1,8 +1,23 @@
+language: ruby
+script: bundle exec rake test_$DB
 rvm:
-  - jruby
+  - jruby-18mode
+  - jruby-19mode
 env:
-  - JRUBY_OPTS=
-  - JRUBY_OPTS=--1.9
+  - DB=mysql
+  - DB=postgresql
+  - DB=h2
+  - DB=hsqldb
+  - DB=sqlite3
+  - DB=jndi
+gemfile:
+  - gemfiles/rails23.gemfile
+  - gemfiles/rails30.gemfile
+  - gemfiles/rails31.gemfile
+  - gemfiles/rails32.gemfile
 branches:
   only:
     - master
+matrix:
+  allow_failures:
+    - gemfile: gemfiles/rails23.gemfile

data/Appraisals

@@ -0,0 +1,16 @@
+appraise "rails23" do
+  gem "activerecord", "~> 2.3.14"
+  gem "rails", "~> 2.3.14"
+end
+
+appraise "rails30" do
+  gem "activerecord", "~> 3.0.17"
+end
+
+appraise "rails31" do
+  gem "activerecord", "~> 3.1.8"
+end
+
+appraise "rails32" do
+  gem "activerecord", "~> 3.2.9"
+end

data/Gemfile

@@ -1,14 +1,14 @@
 source "http://rubygems.org"
 
-# This may wreak havoc on the lockfile, but we need a way to test
-# different AR versions
-gem 'activerecord', ENV['AR_VERSION']
+gem 'activerecord'
+gem 'jruby-openssl', :platform => :jruby
 
-gem 'rake'
-
-gem 'jruby-openssl', :group => :development
-
-group :test do
-  gem 'ruby-debug'
-  gem 'mocha'
+group :development do
+  gem 'ruby-debug', :require => nil
 end
+
+gem 'appraisal'
+gem 'rake', :require => nil
+# appraisal ignores group block declarations :
+gem 'test-unit', :group => :test
+gem 'mocha', :group => :test

data/Gemfile.lock

@@ -1,40 +1,50 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.1)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (3.0.2)
     bouncy-castle-java (1.5.0146.1)
-    builder (3.0.0)
-    columnize (0.3.1)
-    i18n (0.6.0)
-    jruby-openssl (0.7.5)
+    builder (3.0.4)
+    columnize (0.3.6)
+    i18n (0.6.1)
+    jruby-openssl (0.7.7)
       bouncy-castle-java (>= 1.5.0146.1)
-    mocha (0.9.8)
-      rake
-    multi_json (1.0.4)
-    rake (0.9.2.2)
+    linecache (0.46-java)
+    metaclass (0.0.1)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    multi_json (1.3.7)
+    rake (10.0.3)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
     ruby-debug-base (0.10.4-java)
-    tzinfo (0.3.31)
+    test-unit (2.5.3)
+    tzinfo (0.3.35)
 
 PLATFORMS
   java
 
 DEPENDENCIES
   activerecord
+  appraisal
   jruby-openssl
   mocha
   rake
   ruby-debug
+  test-unit

data/LICENSE.txt

@@ -1,21 +1,24 @@
-Copyright (c) 2006-2008 Nick Sieger <nick@nicksieger.com>
+Copyright (c) 2006-2012 Nick Sieger <nick@nicksieger.com>
 Copyright (c) 2006-2008 Ola Bini <ola.bini@gmail.com>
+All rights reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+- Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+- 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.
+
+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 HOLDER 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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -11,8 +11,8 @@ MySQL, PostgreSQL, SQLite3, Oracle, Microsoft SQL Server, DB2,
 FireBird, Derby, HSQLDB, H2, and Informix.
 
 Other databases will require testing and likely a custom configuration module.
-Please join the JRuby mailing-list[http://jruby.org/community] to help us discover
-support for more databases.
+Please join the JRuby {mailing list}[http://jruby.org/community] to help us
+discover support for more databases.
 
 == Using ActiveRecord JDBC
 
@@ -23,14 +23,18 @@ To use activerecord-jdbc-adapter with JRuby on Rails:
 1. Choose the adapter you wish to gem install. The following pre-packaged
 adapters are available:
 
-  * base jdbc (<tt>activerecord-jdbc-adapter</tt>). Supports all available databases via JDBC, but requires you to download and manually install the database vendor's JDBC driver .jar file.
-  * mysql (<tt>activerecord-jdbcmysql-adapter</tt>)
-  * postgresql (<tt>activerecord-jdbcpostgresql-adapter</tt>)
-  * sqlite3 (<tt>activerecord-jdbcsqlite3-adapter</tt>)
-  * derby (<tt>activerecord-jdbcderby-adapter</tt>)
-  * hsqldb (<tt>activerecord-jdbchsqldb-adapter</tt>)
-  * h2 (<tt>activerecord-jdbch2-adapter</tt>)
-  * mssql (<tt>activerecord-jdbcmssql-adapter</tt>)
+- base jdbc (activerecord-jdbc-adapter). Supports all available databases via
+  JDBC, but requires you to download and manually install the database vendor's
+  JDBC driver .jar file.
+- mysql (activerecord-jdbcmysql-adapter)
+- postgresql (activerecord-jdbcpostgresql-adapter)
+- sqlite3 (activerecord-jdbcsqlite3-adapter)
+- derby (activerecord-jdbcderby-adapter)
+- hsqldb (activerecord-jdbchsqldb-adapter)
+- h2 (activerecord-jdbch2-adapter)
+- mssql (activerecord-jdbcmssql-adapter). Does not support SQL Azure by default,
+  see the {project's readme}[https://github.com/jruby/activerecord-jdbc-adapter/blob/master/activerecord-jdbcmssql-adapter/README.rdoc]
+  for more information.
 
 2a. For Rails 3, if you're generating a new application, use the
 following command to generate your application:
@@ -67,7 +71,7 @@ prefix in front of the database adapter name as below.
       adapter: jdbcmysql
       username: blog
       password:
-      hostname: localhost
+      host: localhost
       database: weblog_development
 
 For other databases, you'll need to know the database driver class and
@@ -167,13 +171,24 @@ alse need to grant "blog" create privileges on
 If you also have PostgreSQL available, those tests will be run if the
 `psql' executable can be found. Also ensure you have a database named
 <tt>weblog_development</tt> and a user named "blog" and an empty
-password.
+password.  You can control the host and port the tests will attempt to
+by setting the environment variables PGHOST and PGPORT.
 
 If you want rails logging enabled during these test runs you can edit 
 test/jdbc_common.rb and add the following line:
 
 require 'db/logger'
 
+To execute a single test case, you can run:
+
+  rake appraisal:{version} test_{db} TEST=test/{tests file}
+
+Substitute the version of ActiveRecord for version, which can be one of: 
+  rails23, rails30, rails31, or rails32
+The db can be one of these: 
+  mssql, mysql, oracle, postgres, sybase, sqlite3, db2, derby, h2 
+Finally, the tests file will be whichever test case you want to run.
+
 == Running AR Tests
 
 To run the current AR-JDBC sources with ActiveRecord, just use the
@@ -191,8 +206,8 @@ This project was written by Nick Sieger <nick@nicksieger.com> and Ola Bini
 
 == License
 
-activerecord-jdbc-adapter is released under a BSD license. See the LICENSE file
-included with the distribution for details.
+activerecord-jdbc-adapter is released under a BSD license. See the LICENSE.txt
+file included with the distribution for details.
 
 Open-source driver gems for activerecord-jdbc-adapter are licensed under the
 same license the database's drivers are licensed. See each driver gem's

data/Rakefile

@@ -2,11 +2,11 @@ require 'rake/testtask'
 require 'rake/clean'
 CLEAN.include 'derby*', 'test.db.*','test/reports', 'test.sqlite3','lib/**/*.jar','manifest.mf', '*.log'
 
-require 'bundler'
+require 'bundler/gem_helper'
 Bundler::GemHelper.install_tasks
-require 'bundler/setup'
 
-require File.expand_path('../test/helper', __FILE__)
+require 'bundler/setup'
+require 'appraisal'
 
 task :default => [:jar, :test]
 
@@ -17,7 +17,7 @@ task :install => :jar
 ADAPTERS = %w[derby h2 hsqldb mssql mysql postgresql sqlite3].map {|a| "activerecord-jdbc#{a}-adapter" }
 DRIVERS  = %w[derby h2 hsqldb jtds mysql postgres sqlite3].map {|a| "jdbc-#{a}" }
 
-def rake(args)
+def rake(*args)
   ruby "-S", "rake", *args
 end
 

data/activerecord-jdbc-adapter.gemspec

@@ -13,11 +13,12 @@ Gem::Specification.new do |s|
   s.description = %q{activerecord-jdbc-adapter is a database adapter for Rails\' ActiveRecord
 component that can be used with JRuby[http://www.jruby.org/]. It allows use of
 virtually any JDBC-compliant database with your JRuby on Rails application.}
+  s.license     = "BSD"
   s.files         = `git ls-files`.split("\n").reject {|v| v =~ /^(activerecord-jdbc[^-]|jdbc-)/}
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rdoc_options = ["--main", "README.txt", "-SHN", "-f", "darkfish"]
+  s.rdoc_options = ["--main", "README.rdoc", "-SHN", "-f", "darkfish"]
   s.rubyforge_project = %q{jruby-extras}
 end
 

data/gemfiles/rails23.gemfile

@@ -0,0 +1,12 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "appraisal"
+gem "rake", :require=>nil
+gem "test-unit", :group=>:test
+gem "mocha", :group=>:test
+gem "activerecord", "~> 2.3.14"
+gem "rails", "~> 2.3.14"
+

data/gemfiles/rails23.gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (2.3.14)
+      actionpack (= 2.3.14)
+    actionpack (2.3.14)
+      activesupport (= 2.3.14)
+      rack (~> 1.1.0)
+    activerecord (2.3.14)
+      activesupport (= 2.3.14)
+    activeresource (2.3.14)
+      activesupport (= 2.3.14)
+    activesupport (2.3.14)
+    appraisal (0.5.1)
+      bundler
+      rake
+    bouncy-castle-java (1.5.0146.1)
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
+    metaclass (0.0.1)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    rack (1.1.3)
+    rails (2.3.14)
+      actionmailer (= 2.3.14)
+      actionpack (= 2.3.14)
+      activerecord (= 2.3.14)
+      activeresource (= 2.3.14)
+      activesupport (= 2.3.14)
+      rake (>= 0.8.3)
+    rake (0.9.2.2)
+    test-unit (2.5.3)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord (~> 2.3.14)
+  appraisal
+  jruby-openssl
+  mocha
+  rails (~> 2.3.14)
+  rake
+  test-unit

data/gemfiles/rails30.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "appraisal"
+gem "rake", :require=>nil
+gem "test-unit", :group=>:test
+gem "mocha", :group=>:test
+gem "activerecord", "~> 3.0.17"
+

data/gemfiles/rails30.gemfile.lock

@@ -0,0 +1,39 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.17)
+      activesupport (= 3.0.17)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.17)
+      activemodel (= 3.0.17)
+      activesupport (= 3.0.17)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.17)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.0.10)
+    bouncy-castle-java (1.5.0146.1)
+    builder (2.1.2)
+    i18n (0.5.0)
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
+    metaclass (0.0.1)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    rake (10.0.3)
+    test-unit (2.5.3)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord (~> 3.0.17)
+  appraisal
+  jruby-openssl
+  mocha
+  rake
+  test-unit

data/gemfiles/rails31.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "jruby-openssl", :platform=>:jruby
+gem "appraisal"
+gem "rake", :require=>nil
+gem "test-unit", :group=>:test
+gem "mocha", :group=>:test
+gem "activerecord", "~> 3.1.8"
+

data/gemfiles/rails31.gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.1.8)
+      activesupport (= 3.1.8)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.8)
+      activemodel (= 3.1.8)
+      activesupport (= 3.1.8)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activesupport (3.1.8)
+      multi_json (>= 1.0, < 1.3)
+    appraisal (0.5.1)
+      bundler
+      rake
+    arel (2.2.3)
+    bouncy-castle-java (1.5.0146.1)
+    builder (3.0.0)
+    i18n (0.6.1)
+    jruby-openssl (0.7.7)
+      bouncy-castle-java (>= 1.5.0146.1)
+    metaclass (0.0.1)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
+    multi_json (1.2.0)
+    rake (10.0.3)
+    test-unit (2.5.3)
+    tzinfo (0.3.33)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord (~> 3.1.8)
+  appraisal
+  jruby-openssl
+  mocha
+  rake
+  test-unit