Remove workaround for jdbc bug that has been fixed

Casecommons · Sep 17, 2013 · a066c84 · a066c84
1 parent efbb2db
commit a066c84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gemspec
 
 gem 'pg', :platform => :ruby
-gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
+gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.1", :platform => :jruby
 
 gem "activerecord", ENV["ACTIVE_RECORD_VERSION"] if ENV["ACTIVE_RECORD_VERSION"]
 gem "activerecord", :github => "rails", :branch => ENV["ACTIVE_RECORD_BRANCH"] if ENV["ACTIVE_RECORD_BRANCH"]

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -11,12 +11,7 @@
 
 begin
   if defined? JRUBY_VERSION
-    # Can't require 'activerecord-jdbcpostgresql-adapter' until
-    # https://github.com/jruby/activerecord-jdbc-adapter/pull/463
-    # is resolved
-    require 'arjdbc'
-    require 'arjdbc/postgresql'
-
+    require 'activerecord-jdbcpostgresql-adapter'
     error_class = ActiveRecord::JDBCError
   else
     require "pg"