Use non-'jdbc*' names so that db:create and db:drop work

rails · Jun 21, 2011 · 4a5f1ce · 4a5f1ce
1 parent 1cbbe06
commit 4a5f1ce
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
@@ -9,7 +9,7 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: jdbcmysql
+  adapter: mysql
   database: <%= app_name %>_development
   username: root
   password:
@@ -19,14 +19,14 @@ 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: jdbcmysql
+  adapter: mysql
   database: <%= app_name %>_test
   username: root
   password:
   host: localhost
 
 production:
-  adapter: jdbcmysql
+  adapter: mysql
   database: <%= app_name %>_production
   username: root
   password:

diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
@@ -4,7 +4,7 @@
 # gem 'activerecord-jdbcpostgresql-adapter'
 
 development:
-  adapter: jdbcpostgresql
+  adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_development
   username: <%= app_name %>
@@ -29,14 +29,14 @@ 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: postgresql
   encoding: unicode
   database: <%= app_name %>_test
   username: <%= app_name %>
   password:
 
 production:
-  adapter: jdbcpostgresql
+  adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_production
   username: <%= app_name %>

diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
@@ -5,16 +5,16 @@
 # gem 'activerecord-jdbcsqlite3-adapter'
 #
 development:
-  adapter: jdbcsqlite3
+  adapter: sqlite3
   database: db/development.sqlite3
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: jdbcsqlite3
+  adapter: sqlite3
   database: db/test.sqlite3
 
 production:
-  adapter: jdbcsqlite3
+  adapter: sqlite3
   database: db/production.sqlite3