aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/app_base.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-04-25 09:20:40 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-04-25 09:20:40 -0700
commit17fec021d196ffbd745c340f98b9cfbcdb16b2a8 (patch)
treee20068efe78bc674323bc4aec22ce5b4c6de1c7e /railties/lib/rails/generators/app_base.rb
parent2fc8d7ea90c901600319d2ad4d3dbfece3ced410 (diff)
parent51854de52caa410862266a79b255132a0710aef0 (diff)
downloadrails-17fec021d196ffbd745c340f98b9cfbcdb16b2a8.tar.gz
rails-17fec021d196ffbd745c340f98b9cfbcdb16b2a8.tar.bz2
rails-17fec021d196ffbd745c340f98b9cfbcdb16b2a8.zip
Merged pull request #300 from arunagw/jdbc_test.
Start Adding jdbcmysql support to new rails template.
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
-rw-r--r--railties/lib/rails/generators/app_base.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 481fa95068..46a2a3f154 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -10,6 +10,8 @@ module Rails
module Generators
class AppBase < Base
DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+ JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 )
+ DATABASES.concat(JDBC_DATABASES)
JAVASCRIPTS = %w( jquery prototype )
attr_accessor :rails_template
@@ -156,12 +158,14 @@ module Rails
end
def gem_for_database
- # %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+ # %w( mysql oracle postgresql sqlite3 frontbase ibm_db jdbcmysql jdbcsqlite3)
case options[:database]
when "oracle" then "ruby-oci8"
when "postgresql" then "pg"
when "frontbase" then "ruby-frontbase"
when "mysql" then "mysql2"
+ when "jdbcmysql" then "activerecord-jdbcmysql-adapter"
+ when "jdbcsqlite3" then "activerecord-jdbcsqlite3-adapter"
else options[:database]
end
end