Newer versions of activerecord-jdbcsqlite3-adapter work without a spe…

…cially named db driver in database.yml
rosylilly · Jan 7, 2013 · a179d7f · a179d7f
1 parent f68f1c2
commit a179d7f
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 19 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,7 +1,7 @@
 appraise "rails3.0" do
   gem "rails", "3.0.18"
   gem "sqlite3", ">= 1.3.4", platforms: :mri
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
   gem "minitest-rails"
   gem "therubyrhino"
   gem "jquery-rails"
@@ -15,7 +15,7 @@ appraise "rails3.1" do
   gem "uglifier"
   gem "turn"
   gem "sqlite3", ">= 1.3.4", platforms: :mri
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
   gem "minitest-rails"
   gem "therubyrhino"
   gem "jquery-rails"
@@ -28,7 +28,7 @@ appraise "rails3.2" do
   gem "coffee-rails"
   gem "uglifier"
   gem "sqlite3", ">= 1.3.4", platforms: :mri
-  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", platforms: :jruby
   gem "minitest-rails"
   gem "therubyrhino"
   gem "jquery-rails"

diff --git a/features/fixture_replacement_config.feature b/features/fixture_replacement_config.feature
@@ -6,7 +6,6 @@ Feature:
     Given I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I add "factory_girl_rails" from this project as a dependency
-    And I configure the database connection for the application
 
   Scenario: Using Factory Girl and Factory Girl Rails with Test Unit generates a factory file and does not generate a fixture file
     And I run `bundle install` with a clean environment

diff --git a/features/generators.feature b/features/generators.feature
@@ -7,7 +7,6 @@ Feature:
     Given I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I add "factory_girl_rails" from this project as a dependency
-		And I configure the database connection for the application
 
   Scenario: The factory_girl_rails generators create a factory file for each model that I generate
     When I run `bundle install` with a clean environment

diff --git a/features/load_definitions.feature b/features/load_definitions.feature
@@ -4,7 +4,6 @@ Feature: automatically load step definitions
     When I successfully run `bundle exec rails new testapp`
     And I cd to "testapp"
     And I add "factory_girl_rails" from this project as a dependency
-    And I configure the database connection for the application
     And I comment out gem "turn" from my Gemfile
     And I run `bundle install` with a clean environment
     And I write to "db/migrate/1_create_users.rb" with:

diff --git a/features/step_definitions/rails_steps.rb b/features/step_definitions/rails_steps.rb
@@ -42,13 +42,6 @@ class Testapp::Application
   END
 end
 
-When /^I configure the database connection for the application$/ do
-  if RUBY_PLATFORM =~ /java/
-    contents = File.read File.join(File.dirname(__FILE__), '..', '..', 'tmp', 'aruba', 'testapp', 'config', 'database.yml')
-    overwrite_file 'config/database.yml', contents.gsub('adapter: sqlite3', 'adapter: jdbcsqlite3')
-  end
-end
-
 When /^I comment out gem "([^"]*)" from my Gemfile$/ do |gem_name|
   in_current_dir do
     content = File.read('Gemfile')

diff --git a/gemfiles/rails3.0.gemfile b/gemfiles/rails3.0.gemfile
@@ -4,7 +4,7 @@ source "http://rubygems.org"
 
 gem "rails", "3.0.18"
 gem "sqlite3", ">= 1.3.4", :platforms=>:mri
-gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
 gem "minitest-rails"
 gem "therubyrhino"
 gem "jquery-rails"

diff --git a/gemfiles/rails3.0.gemfile.lock b/gemfiles/rails3.0.gemfile.lock
@@ -124,7 +124,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
   appraisal (~> 0.5.0)
   aruba (~> 0.5.1)
   cucumber (~> 1.2.1)

diff --git a/gemfiles/rails3.1.gemfile b/gemfiles/rails3.1.gemfile
@@ -8,7 +8,7 @@ gem "coffee-rails"
 gem "uglifier"
 gem "turn"
 gem "sqlite3", ">= 1.3.4", :platforms=>:mri
-gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
 gem "minitest-rails"
 gem "therubyrhino"
 gem "jquery-rails"

diff --git a/gemfiles/rails3.1.gemfile.lock b/gemfiles/rails3.1.gemfile.lock
@@ -156,7 +156,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
   appraisal (~> 0.5.0)
   aruba (~> 0.5.1)
   coffee-rails

diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile
@@ -7,7 +7,7 @@ gem "sass-rails"
 gem "coffee-rails"
 gem "uglifier"
 gem "sqlite3", ">= 1.3.4", :platforms=>:mri
-gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.2.5", :platforms=>:jruby
 gem "minitest-rails"
 gem "therubyrhino"
 gem "jquery-rails"

diff --git a/gemfiles/rails3.2.gemfile.lock b/gemfiles/rails3.2.gemfile.lock
@@ -151,7 +151,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord-jdbcsqlite3-adapter
+  activerecord-jdbcsqlite3-adapter (~> 1.2.5)
   appraisal (~> 0.5.0)
   aruba (~> 0.5.1)
   coffee-rails