diff options
| author | Nick Sieger <nick@nicksieger.com> | 2011-06-20 18:52:28 -0500 |
|---|---|---|
| committer | Nick Sieger <nick@nicksieger.com> | 2011-06-21 13:34:03 -0700 |
| commit | f12f756473671f38887754fe136fda51efa4a440 (patch) | |
| tree | 55f379e98397d306ceac40d53ed7b40874ac4fc4 /railties/lib/rails/generators/app_base.rb | |
| parent | 2b0b7260c75316c9d9c359d28a0399103f190a78 (diff) | |
| download | rails-f12f756473671f38887754fe136fda51efa4a440.tar.gz rails-f12f756473671f38887754fe136fda51efa4a440.tar.bz2 rails-f12f756473671f38887754fe136fda51efa4a440.zip | |
Add generic 'jdbc' database option
Diffstat (limited to 'railties/lib/rails/generators/app_base.rb')
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index bbf0447985..3346c5ec13 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -10,7 +10,7 @@ module Rails module Generators class AppBase < Base DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db ) - JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql ) + JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc ) DATABASES.concat(JDBC_DATABASES) attr_accessor :rails_template @@ -157,9 +157,10 @@ module Rails 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" - when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter" + when "jdbcmysql" then "activerecord-jdbcmysql-adapter" + when "jdbcsqlite3" then "activerecord-jdbcsqlite3-adapter" + when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter" + when "jdbc" then "activerecord-jdbc-adapter" else options[:database] end end |