jruby needs a separate sqlite3 adapter

rosylilly · Dec 13, 2012 · 742f38d · 742f38d
1 parent e43f18d
commit 742f38d
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 4 deletions.
diff --git a/Appraisals b/Appraisals
@@ -1,13 +1,17 @@
 appraise "rails3.0" do
   gem "rails", "~> 3.0.17"
+  gem "sqlite3", ">= 1.3.4", platforms: :mri
+  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 end
 
 appraise "rails3.1" do
   gem "rails", "~> 3.1.8"
-  gem "sqlite3", ">= 1.3.4"
+  gem "sqlite3", ">= 1.3.4", platforms: :mri
+  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 end
 
 appraise "rails3.2" do
   gem "rails", "~> 3.2.9"
-  gem "sqlite3", ">= 1.3.4"
+  gem "sqlite3", ">= 1.3.4", platforms: :mri
+  gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
 end
diff --git a/features/fixture_replacement_config.feature b/features/fixture_replacement_config.feature
@@ -10,6 +10,7 @@ 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

diff --git a/features/generators.feature b/features/generators.feature
@@ -8,6 +8,7 @@ Feature:
     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
     When I successfully run `bundle install`
     And I successfully run `bundle exec rails generate model User name:string --fixture-replacement=factory_girl`
     And I successfully run `bundle exec rails generate model Namespaced::User name:string --fixture-replacement=factory_girl`
@@ -21,6 +22,7 @@ Feature:
     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
     When I successfully run `bundle install`
     And I set the FactoryGirl :suffix option to "factory"
     And I successfully run `bundle exec rails generate model User name:string --fixture-replacement=factory_girl`

diff --git a/features/load_definitions.feature b/features/load_definitions.feature
@@ -3,6 +3,7 @@ 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
     When I successfully run `bundle install`
     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
@@ -41,3 +41,15 @@ class Testapp::Application
 end
   END
 end
+
+When /^I configure the database connection for the application$/ do
+  if RUBY_PLATFORM =~ /java/
+  overwrite_file "config/database.yml", <<-END
+development: &development
+    adapter: jdbcsqlite3
+    database: db/test.sqlite3
+test:
+    <<: *development
+END
+  end
+end
diff --git a/gemfiles/rails3.0.gemfile b/gemfiles/rails3.0.gemfile
@@ -3,5 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.0.17"
+gem "sqlite3", ">= 1.3.4", :platforms=>:mri
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
 
 gemspec :path=>"../"
diff --git a/gemfiles/rails3.0.gemfile.lock b/gemfiles/rails3.0.gemfile.lock
@@ -31,6 +31,10 @@ GEM
       activesupport (= 3.0.17)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
+    activerecord-jdbc-adapter (1.2.2.1)
+    activerecord-jdbcsqlite3-adapter (1.2.2.1)
+      activerecord-jdbc-adapter (~> 1.2.2.1)
+      jdbc-sqlite3 (~> 3.7.2)
     activeresource (3.0.17)
       activemodel (= 3.0.17)
       activesupport (= 3.0.17)
@@ -57,10 +61,15 @@ GEM
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     ffi (1.2.0)
+    ffi (1.2.0-java)
     gherkin (2.11.5)
       json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
     i18n (0.5.0)
+    jdbc-sqlite3 (3.7.2)
     json (1.7.5)
+    json (1.7.5-java)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -98,20 +107,24 @@ GEM
     rspec-expectations (2.11.3)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.11.3)
+    sqlite3 (1.3.6)
     thor (0.14.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.35)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
   appraisal (~> 0.5.0)
   aruba (~> 0.5.1)
   cucumber (~> 1.2.1)
   factory_girl_rails!
   rails (~> 3.0.17)
   rake
   rspec (~> 2.11.0)
+  sqlite3 (>= 1.3.4)
diff --git a/gemfiles/rails3.1.gemfile b/gemfiles/rails3.1.gemfile
@@ -3,6 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.1.8"
-gem "sqlite3", ">= 1.3.4"
+gem "sqlite3", ">= 1.3.4", :platforms=>:mri
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
 
 gemspec :path=>"../"
diff --git a/gemfiles/rails3.1.gemfile.lock b/gemfiles/rails3.1.gemfile.lock
@@ -31,6 +31,10 @@ GEM
       activesupport (= 3.1.8)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2.1)
+    activerecord-jdbcsqlite3-adapter (1.2.2.1)
+      activerecord-jdbc-adapter (~> 1.2.2.1)
+      jdbc-sqlite3 (~> 3.7.2)
     activeresource (3.1.8)
       activemodel (= 3.1.8)
       activesupport (= 3.1.8)
@@ -57,11 +61,16 @@ GEM
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     ffi (1.2.0)
+    ffi (1.2.0-java)
     gherkin (2.11.5)
       json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.1)
+    jdbc-sqlite3 (3.7.2)
     json (1.7.5)
+    json (1.7.5-java)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -117,9 +126,11 @@ GEM
     tzinfo (0.3.35)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
   appraisal (~> 0.5.0)
   aruba (~> 0.5.1)
   cucumber (~> 1.2.1)

diff --git a/gemfiles/rails3.2.gemfile b/gemfiles/rails3.2.gemfile
@@ -3,6 +3,7 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.2.9"
-gem "sqlite3", ">= 1.3.4"
+gem "sqlite3", ">= 1.3.4", :platforms=>:mri
+gem "activerecord-jdbcsqlite3-adapter", :platforms=>:jruby
 
 gemspec :path=>"../"
diff --git a/gemfiles/rails3.2.gemfile.lock b/gemfiles/rails3.2.gemfile.lock
@@ -29,6 +29,10 @@ GEM
       activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
+    activerecord-jdbc-adapter (1.2.2.1)
+    activerecord-jdbcsqlite3-adapter (1.2.2.1)
+      activerecord-jdbc-adapter (~> 1.2.2.1)
+      jdbc-sqlite3 (~> 3.7.2)
     activeresource (3.2.9)
       activemodel (= 3.2.9)
       activesupport (= 3.2.9)
@@ -56,12 +60,17 @@ GEM
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     ffi (1.2.0)
+    ffi (1.2.0-java)
     gherkin (2.11.5)
       json (>= 1.4.6)
+    gherkin (2.11.5-java)
+      json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.1)
+    jdbc-sqlite3 (3.7.2)
     journey (1.0.4)
     json (1.7.5)
+    json (1.7.5-java)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -116,9 +125,11 @@ GEM
     tzinfo (0.3.35)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
+  activerecord-jdbcsqlite3-adapter
   appraisal (~> 0.5.0)
   aruba (~> 0.5.1)
   cucumber (~> 1.2.1)