Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Let tests pass with jruby using jdbcsqlite3 adapter

  • Loading branch information...
commit 25419da17de091f42cba3cde39d8dbf13e09db15 1 parent e4ec4ee
Peter Suschlik splattael authored

Showing 2 changed files with 15 additions and 1 deletion. Show diff stats Hide diff stats

  1. +8 1 Gemfile
  2. +7 0 Gemfile.lock
9 Gemfile
@@ -8,7 +8,14 @@ group :development do
8 8
9 9 gem 'activesupport'
10 10 gem 'activerecord'
11   - gem 'sqlite3-ruby'
  11 +
  12 + platforms :ruby do
  13 + gem 'sqlite3-ruby'
  14 + end
  15 +
  16 + platforms :jruby do
  17 + gem 'activerecord-jdbcsqlite3-adapter'
  18 + end
12 19 end
13 20
14 21 gemspec
7 Gemfile.lock
@@ -16,12 +16,17 @@ GEM
16 16 activesupport (= 3.0.1)
17 17 arel (~> 1.0.0)
18 18 tzinfo (~> 0.3.23)
  19 + activerecord-jdbc-adapter (1.0.2-java)
  20 + activerecord-jdbcsqlite3-adapter (1.0.2-java)
  21 + activerecord-jdbc-adapter (= 1.0.2)
  22 + jdbc-sqlite3 (~> 3.6.0)
19 23 activesupport (3.0.1)
20 24 arel (1.0.1)
21 25 activesupport (~> 3.0.0)
22 26 builder (2.1.2)
23 27 defined-by (0.0.6)
24 28 i18n (0.4.2)
  29 + jdbc-sqlite3 (3.6.14.2.056-java)
25 30 rake (0.8.7)
26 31 shoulda (2.11.3)
27 32 sqlite3-ruby (1.3.1)
@@ -29,10 +34,12 @@ GEM
29 34 tzinfo (0.3.23)
30 35
31 36 PLATFORMS
  37 + java
32 38 ruby
33 39
34 40 DEPENDENCIES
35 41 activerecord
  42 + activerecord-jdbcsqlite3-adapter
36 43 activesupport
37 44 cockpit!
38 45 defined-by

0 comments on commit 25419da

Please sign in to comment.
Something went wrong with that request. Please try again.