* allow to use this template with jruby with newer rails versions as …

…well * since 'bundle install' runs at the end of the rails template then it install the rails version with which the application got generated
datamapper · Apr 1, 2012 · 2bb098f · 2bb098f
1 parent 8c99f33
commit 2bb098f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/templates/rails/database.yml.rb b/templates/rails/database.yml.rb
@@ -1,7 +1,7 @@
 # TODO think about a better way
 db_name = app_path.split('/').last
 
-database = options[:database]
+database = options[:database].sub(/jdbc/, '')
 database = 'postgres' if database == 'postgresql'
 database = 'sqlite'   if database == 'sqlite3'
 

diff --git a/templates/rails/gemfile.rb b/templates/rails/gemfile.rb
@@ -3,7 +3,7 @@
 DATAMAPPER = '#{DATAMAPPER}'
 RSPEC      = '#{RSPEC}'
 
-database = options[:database]
+database = options[:database].sub(/jdbc/, '')
 database = 'postgres' if database == 'postgresql'
 database = 'sqlite'   if database == 'sqlite3'