From a85b9fafd1880da2ad547c5ef074f06fac8f6609 Mon Sep 17 00:00:00 2001
From: Nick Sieger <nick@nicksieger.com>
Date: Tue, 21 Jun 2011 13:04:47 -0700
Subject: Use non-'jdbc*' names so that db:create and db:drop work

---
 .../generators/rails/app/templates/config/databases/jdbcmysql.yml   | 6 +++---
 .../rails/app/templates/config/databases/jdbcpostgresql.yml         | 6 +++---
 .../generators/rails/app/templates/config/databases/jdbcsqlite3.yml | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'railties/lib')

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
index 6bf83e86a5..5a594ac1f3 100644
--- 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
index 91d80350fb..996ff4baa3 100644
--- 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
index 6d241d57ae..175f3eb3db 100644
--- 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
-- 
cgit v1.2.3