diff options
| author | Alban Peignier | 2012-06-22 09:05:39 +0200 |
|---|---|---|
| committer | Alban Peignier | 2012-06-22 09:05:39 +0200 |
| commit | e0c5300859ec08bc020880d268e275bb103785ac (patch) | |
| tree | a4ceaea92232a037048ff9b133c82333ed67a407 | |
| parent | 2779dcc3127886fb4a53fb06b75da342d60170d4 (diff) | |
| download | chouette-core-e0c5300859ec08bc020880d268e275bb103785ac.tar.bz2 | |
Manage both jdbcpostgresql and postgresql according to RUBY_PLATFORM
| -rw-r--r-- | Gemfile.lock | 1 | ||||
| -rw-r--r-- | config/database.yml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9da5dfef8..ea51bb146 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -196,6 +196,7 @@ GEM jruby-rack (1.1.6) jruby-rack-worker (0.3-java) jruby-rack (>= 1.0.1) + json (1.7.3) json (1.7.3-java) json_pure (1.7.3) launchy (2.1.0) diff --git a/config/database.yml b/config/database.yml index a3e357d3a..599c581da 100644 --- a/config/database.yml +++ b/config/database.yml @@ -5,7 +5,7 @@ # gem 'activerecord-jdbcsqlite3-adapter' # development: - adapter: jdbcpostgresql + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: chouette_dev encoding: utf8 username: chouette @@ -15,7 +15,7 @@ development: # re-generated from your development database when you run "rake". # Do not set this db to the same as development or production. test: - adapter: jdbcpostgresql + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: chouette_test encoding: utf8 username: chouette |