Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Comment database.yml and include PostgreSQL and SQLite examples.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2823 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit ea44527afd55b568be3a07cb0d4991242474db03 1 parent 08acb95
@jeremy jeremy authored
Showing with 71 additions and 2 deletions.
  1. +2 −0  railties/CHANGELOG
  2. +69 −2 railties/configs/database.yml
View
2  railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Comment database.yml and include PostgreSQL and SQLite examples. [Jeremy Kemper]
+
* Improve script/plugin on Windows. #2646 [Chad Fowler]
* The *_plugindoc Rake tasks look deeper into the plugins' lib directories. #2652 [bellis@deepthought.org]
View
71 railties/configs/database.yml
@@ -1,9 +1,26 @@
+# Set up database connections for each environment.
+# By default, development, test, and production connect to local MySQL.
+# Example configurations for PostgreSQL and SQLite are at the end.
+
+# MySQL. Versions 4.1 and 5.0 are recommended.
+#
+# Get the fast C bindings:
+# gem install mysql
+# And be sure to use new-style password hashing:
+# http://dev.mysql.com/doc/refman/5.0/en/old-client.html
development:
adapter: mysql
database: <%= app_name %>_development
- <%= "socket: #{socket}" if socket %>
username: root
- password:
+ password: optional
+
+ # Connect on a domain socket.
+ <%= "socket: #{socket}" %>
+
+ # Connect on a TCP socket. If omitted, the adapter will connect on the
+ # domain socket given by the socket parameter instead.
+ #host: localhost
+ #port: 3306
# Warning: The database defined as 'test' will be erased and
# re-generated from your development database when you run 'rake'.
@@ -21,3 +38,53 @@ production:
<%= "socket: #{socket}" if socket %>
username: root
password:
+
+
+# PostgreSQL versions 7.4 - 8.1
+#
+# Get the C bindings:
+# gem install postgres
+# or use the pure-Ruby bindings on Windows:
+# gem install postgres-pr
+postgresql_example:
+ adapter: postgresql
+ database: <%= app_name %>_development
+ username: <%= app_name %>
+ password: optional
+
+ # Connect on a TCP socket. Omitted by default since the client uses a
+ # domain socket that doesn't need configuration.
+ #host: remote-database
+ #port: 5432
+
+ # Schema search path. The server defaults to $user,public
+ #schema_search_path: myapp,sharedapp,public
+
+ # Character set encoding. The server defaults to sql_ascii.
+ #encoding: UTF8
+
+ # Minimum log levels, in increasing order:
+ # debug5, debug4, debug3, debug2, debug1,
+ # info, notice, warning, error, log, fatal, or panic
+ # The server defaults to notice.
+ #min_messages: warning
+
+
+# SQLite version 2.x
+# gem install sqlite-ruby
+sqlite_example:
+ adapter: sqlite
+ dbfile: db/development.sqlite2
+
+
+# SQLite version 3.x
+# gem install sqlite3-ruby
+sqlite3_example:
+ adapter: sqlite3
+ dbfile: db/development.sqlite3
+
+
+# In-memory SQLite 3 database. Useful for tests.
+sqlite3_in_memory_example:
+ adapter: sqlite3
+ dbfile: ":memory:"
Please sign in to comment.
Something went wrong with that request. Please try again.